Run git-lfs-authenticate script with original command line arguments

8449979f · Artem V. Navrotskiy · Artem V. Navrotskiy · c31e6165 · 8449979f · 8449979f
Commit 8449979f authored Sep 01, 2015 by Artem V. Navrotskiy Committed by Artem V. Navrotskiy Sep 09, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CHANGELOG CHANGELOG +3 -0

lib/gitlab_shell.rb lib/gitlab_shell.rb +2 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+v2.6.5 (unreleased)
+  - Add git-lfs-authenticate command to white list (this command is used by git-lfs for SSO authentication through SSH-protocol)
 v2.6.4
  - Remove keys from authorized_keys in-place
  - Increase batch_add_keys lock timeout to 300 seconds

--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -111,6 +111,8 @@ class GitlabShell
      $logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}."
      exec_cmd(*parsed_args)
+    elsif @git_cmd == 'git-lfs-authenticate'
+      exec_cmd(@origin_cmd)
    else
      $logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}."
      exec_cmd(@git_cmd, repo_full_path)