Merge branch 'remote_user' into 'master'

Add GL_USERNAME environment variable for hooks

See merge request gitlab-org/gitlab-ce!13264

5 files changed, 32 insertions, 22 deletions

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index a0557a609ca..6e78ac2c903 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -31,6 +31,12 @@ module API
         protocol = params[:protocol]
 
         actor.update_last_used_at if actor.is_a?(Key)
+        user =
+          if actor.is_a?(Key)
+            actor.user
+          else
+            actor
+          end
 
         access_checker_klass = wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess
         access_checker = access_checker_klass
@@ -47,6 +53,7 @@ module API
         {
           status: true,
           gl_repository: gl_repository,
+          gl_username: user&.username,
           repository_path: repository_path,
           gitaly: gitaly_payload(params[:action])
         }
diff --git a/lib/gitlab/git/hook.rb b/lib/gitlab/git/hook.rb
index 208e4bbaf60..e29a1f7afa1 100644
--- a/lib/gitlab/git/hook.rb
+++ b/lib/gitlab/git/hook.rb
@@ -22,22 +22,22 @@ module Gitlab
         File.exist?(path)
       end
 
-      def trigger(gl_id, oldrev, newrev, ref)
+      def trigger(gl_id, gl_username, oldrev, newrev, ref)
         return [true, nil] unless exists?
 
         Bundler.with_clean_env do
           case name
           when "pre-receive", "post-receive"
-            call_receive_hook(gl_id, oldrev, newrev, ref)
+            call_receive_hook(gl_id, gl_username, oldrev, newrev, ref)
           when "update"
-            call_update_hook(gl_id, oldrev, newrev, ref)
+            call_update_hook(gl_id, gl_username, oldrev, newrev, ref)
           end
         end
       end
 
       private
 
-      def call_receive_hook(gl_id, oldrev, newrev, ref)
+      def call_receive_hook(gl_id, gl_username, oldrev, newrev, ref)
         changes = [oldrev, newrev, ref].join(" ")
 
         exit_status = false
@@ -45,6 +45,7 @@ module Gitlab
 
         vars = {
           'GL_ID' => gl_id,
+          'GL_USERNAME' => gl_username,
           'PWD' => repo_path,
           'GL_PROTOCOL' => GL_PROTOCOL,
           'GL_REPOSITORY' => repository.gl_repository
@@ -80,9 +81,13 @@ module Gitlab
         [exit_status, exit_message]
       end
 
-      def call_update_hook(gl_id, oldrev, newrev, ref)
+      def call_update_hook(gl_id, gl_username, oldrev, newrev, ref)
         Dir.chdir(repo_path) do
-          stdout, stderr, status = Open3.capture3({ 'GL_ID' => gl_id }, path, ref, oldrev, newrev)
+          env = {
+            'GL_ID' => gl_id,
+            'GL_USERNAME' => gl_username
+          }
+          stdout, stderr, status = Open3.capture3(env, path, ref, oldrev, newrev)
           [status.success?, (stderr.presence || stdout).gsub(/\R/, "<br>").html_safe]
         end
       end
diff --git a/lib/gitlab/git/hooks_service.rb b/lib/gitlab/git/hooks_service.rb
index ea8a87a1290..c327e9b1616 100644
--- a/lib/gitlab/git/hooks_service.rb
+++ b/lib/gitlab/git/hooks_service.rb
@@ -5,12 +5,13 @@ module Gitlab
 
       attr_accessor :oldrev, :newrev, :ref
 
-      def execute(committer, repository, oldrev, newrev, ref)
-        @repository = repository
-        @gl_id      = committer.gl_id
-        @oldrev     = oldrev
-        @newrev     = newrev
-        @ref        = ref
+      def execute(pusher, repository, oldrev, newrev, ref)
+        @repository  = repository
+        @gl_id       = pusher.gl_id
+        @gl_username = pusher.name
+        @oldrev      = oldrev
+        @newrev      = newrev
+        @ref         = ref
 
         %w(pre-receive update).each do |hook_name|
           status, message = run_hook(hook_name)
@@ -29,7 +30,7 @@ module Gitlab
 
       def run_hook(name)
         hook = Gitlab::Git::Hook.new(name, @repository)
-        hook.trigger(@gl_id, oldrev, newrev, ref)
+        hook.trigger(@gl_id, @gl_username, oldrev, newrev, ref)
       end
     end
   end
diff --git a/lib/gitlab/git/user.rb b/lib/gitlab/git/user.rb
index ea634d39668..cb1af5f3b7c 100644
--- a/lib/gitlab/git/user.rb
+++ b/lib/gitlab/git/user.rb
@@ -1,24 +1,21 @@
 module Gitlab
   module Git
     class User
-      attr_reader :name, :email, :gl_id
+      attr_reader :username, :name, :email, :gl_id
 
       def self.from_gitlab(gitlab_user)
-        new(gitlab_user.name, gitlab_user.email, Gitlab::GlId.gl_id(gitlab_user))
+        new(gitlab_user.username, gitlab_user.name, gitlab_user.email, Gitlab::GlId.gl_id(gitlab_user))
       end
 
-      def self.from_gitaly(gitaly_user)
-        new(gitaly_user.name, gitaly_user.email, gitaly_user.gl_id)
-      end
-
-      def initialize(name, email, gl_id)
+      def initialize(username, name, email, gl_id)
+        @username = username
         @name = name
         @email = email
         @gl_id = gl_id
       end
 
       def ==(other)
-        [name, email, gl_id] == [other.name, other.email, other.gl_id]
+        [username, name, email, gl_id] == [other.username, other.name, other.email, other.gl_id]
       end
     end
   end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 17550cf9074..45f246242f1 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -22,9 +22,9 @@ module Gitlab
         params = {
           GL_ID: Gitlab::GlId.gl_id(user),
           GL_REPOSITORY: Gitlab::GlRepository.gl_repository(project, is_wiki),
+          GL_USERNAME: user&.username,
           RepoPath: repo_path
         }
-
         server = {
           address: Gitlab::GitalyClient.address(project.repository_storage),
           token: Gitlab::GitalyClient.token(project.repository_storage)