Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 0 deletions

diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index 99e1b9027fa..965493955ac 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Profiles::KeysController < Profiles::ApplicationController
+  skip_before_action :authenticate_user!, only: [:get_keys]
+
   def index
     @keys = current_user.keys.order_id_desc
     @key = Key.new
@@ -31,6 +33,25 @@ class Profiles::KeysController < Profiles::ApplicationController
     end
   end
 
+  # Get all keys of a user(params[:username]) in a text format
+  # Helpful for sysadmins to put in respective servers
+  def get_keys
+    if params[:username].present?
+      begin
+        user = UserFinder.new(params[:username]).find_by_username
+        if user.present?
+          render plain: user.all_ssh_keys.join("\n")
+        else
+          render_404
+        end
+      rescue => e
+        render html: e.message
+      end
+    else
+      render_404
+    end
+  end
+
   private
 
   def key_params