Add checkbox to regenerate all SSH keys in Gitolite (delete + create)

Author: root

Diff for: app/use_cases/apply_settings.rb

@@ -6,6 +6,7 @@ class ApplySettings
 
   attr_reader :resync_projects
   attr_reader :resync_ssh_keys
+  attr_reader :regenerate_ssh_keys
   attr_reader :flush_cache
   attr_reader :delete_trash_repo
 
@@ -14,10 +15,11 @@ def initialize(old_valuehash, valuehash, opts = {})
     @old_valuehash     = old_valuehash
     @valuehash         = valuehash
 
-    @resync_projects   = opts.delete(:resync_projects){ false }
-    @resync_ssh_keys   = opts.delete(:resync_ssh_keys){ false }
-    @flush_cache       = opts.delete(:flush_cache){ false }
-    @delete_trash_repo = opts.delete(:delete_trash_repo){ [] }
+    @resync_projects     = opts.delete(:resync_projects){ false }
+    @resync_ssh_keys     = opts.delete(:resync_ssh_keys){ false }
+    @regenerate_ssh_keys = opts.delete(:regenerate_ssh_keys){ false }
+    @flush_cache         = opts.delete(:flush_cache){ false }
+    @delete_trash_repo   = opts.delete(:delete_trash_repo){ [] }
   end
 
 
@@ -39,6 +41,7 @@ def apply_settings
 
       do_resync_projects
       do_resync_ssh_keys
+      do_regenerate_ssh_keys
       do_flush_cache
       do_delete_trash_repo
       do_enable_readme_creation
@@ -130,6 +133,11 @@ def do_resync_ssh_keys
     end
 
 
+    def do_regenerate_ssh_keys
+      RegenerateSshKeys.new.call if regenerate_ssh_keys
+    end
+
+
     def do_flush_cache
       ## A cache flush has been asked within the interface
       GitoliteAccessor.flush_git_cache if flush_cache

Diff for: app/use_cases/regenerate_ssh_keys.rb

@@ -0,0 +1,20 @@
+class RegenerateSshKeys
+  unloadable
+
+  attr_reader :bypass_sidekiq
+
+
+  def initialize(opts = {})
+    @bypass_sidekiq = opts.delete(:bypass_sidekiq){ false }
+  end
+
+
+  def call
+    GitolitePublicKey.all.each do |ssh_key|
+      GitoliteAccessor.destroy_ssh_key(ssh_key, bypass_sidekiq: bypass_sidekiq)
+      ssh_key.reset_identifiers
+      GitoliteAccessor.create_ssh_key(ssh_key, bypass_sidekiq: bypass_sidekiq)
+    end
+  end
+
+end

Diff for: app/views/settings/redmine_git_hosting/_gitolite_rescue.html.haml

@@ -6,6 +6,10 @@
   = label_tag 'settings[gitolite_resync_all_ssh_keys]', l(:label_resync_all_ssh_keys)
   = check_box_tag 'settings[gitolite_resync_all_ssh_keys]', 'true', false
 
+%p
+  = label_tag 'settings[gitolite_regenerate_all_ssh_keys]', l(:label_regenerate_all_ssh_keys)
+  = check_box_tag 'settings[gitolite_regenerate_all_ssh_keys]', 'true', false
+
 %p
   = label_tag 'settings[gitolite_flush_cache]', l(:label_flush_cache)
   = check_box_tag 'settings[gitolite_flush_cache]', 'true', false

Diff for: lib/redmine_git_hosting/config/gitolite_base.rb

@@ -82,6 +82,11 @@ def gitolite_identifier_prefix
       end
 
 
+      def gitolite_identifier_strip_user_id?
+        RedmineGitHosting::Config.get_setting(:gitolite_identifier_strip_user_id, true)
+      end
+
+
       def gitolite_key_subdir
         'redmine_git_hosting'
       end

Diff for: lib/redmine_git_hosting/patches/setting_patch.rb

@@ -37,11 +37,12 @@ module InstanceMethods
 
         private
 
-        @@old_valuehash     = ((Setting.plugin_redmine_git_hosting).clone rescue {})
-        @@resync_projects   = false
-        @@resync_ssh_keys   = false
-        @@flush_cache       = false
-        @@delete_trash_repo = []
+        @@old_valuehash       = ((Setting.plugin_redmine_git_hosting).clone rescue {})
+        @@resync_projects     = false
+        @@resync_ssh_keys     = false
+        @@regenerate_ssh_keys = false
+        @@flush_cache         = false
+        @@delete_trash_repo   = []
 
 
         def save_git_hosting_values
@@ -52,6 +53,7 @@ def save_git_hosting_values
             ## This a force update
             @@resync_projects = true if valuehash[:gitolite_resync_all_projects] == 'true'
             @@resync_ssh_keys = true if valuehash[:gitolite_resync_all_ssh_keys] == 'true'
+            @@regenerate_ssh_keys = true if valuehash[:gitolite_regenerate_all_ssh_keys] == 'true'
 
             ## Flush Gitolite Cache
             @@flush_cache = true if valuehash[:gitolite_flush_cache] == 'true'
@@ -80,20 +82,22 @@ def restore_git_hosting_values
 
             # Build options to pass to RestoreSettings object
             opts = {
-              resync_projects:   @@resync_projects,
-              resync_ssh_keys:   @@resync_ssh_keys,
-              delete_trash_repo: @@delete_trash_repo,
-              flush_cache:       @@flush_cache
+              resync_projects:     @@resync_projects,
+              resync_ssh_keys:     @@resync_ssh_keys,
+              regenerate_ssh_keys: @@regenerate_ssh_keys,
+              delete_trash_repo:   @@delete_trash_repo,
+              flush_cache:         @@flush_cache
             }
 
             # Call RestoreSettings
             ApplySettings.new(@@old_valuehash, valuehash, opts).call
 
             # Restore default class settings
-            @@resync_projects   = false
-            @@resync_ssh_keys   = false
-            @@flush_cache       = false
-            @@delete_trash_repo = []
+            @@resync_projects     = false
+            @@resync_ssh_keys     = false
+            @@regenerate_ssh_keys = false
+            @@flush_cache         = false
+            @@delete_trash_repo   = []
 
             @@old_valuehash = valuehash.clone
           end

Diff for: lib/redmine_git_hosting/patches/user_patch.rb

@@ -27,7 +27,9 @@ module InstanceMethods
         # As login names may change (i.e., user renamed), we use the user id
         # with its login name as a prefix for readibility.
         def gitolite_identifier
-          [RedmineGitHosting::Config.gitolite_identifier_prefix, stripped_login, '_', id].join
+          identifier = [RedmineGitHosting::Config.gitolite_identifier_prefix, stripped_login]
+          identifier.concat(['_', id]) if !RedmineGitHosting::Config.gitolite_identifier_strip_user_id?
+          identifier.join
         end