diff options
| -rw-r--r-- | lib/gitlab_net.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab_shell.rb | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 6474781..f0987dd 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -9,8 +9,9 @@ class GitlabNet # rubocop:disable Metrics/ClassLength include HTTPHelper CHECK_TIMEOUT = 5 + GL_PROTOCOL = 'ssh'.freeze - def check_access(cmd, gl_repository, repo, actor, changes, protocol, env: {}) + def check_access(cmd, gl_repository, repo, actor, changes, protocol = GL_PROTOCOL, env: {}) changes = changes.join("\n") unless changes.is_a?(String) params = { diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index cd6fcb9..f6426b3 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -23,7 +23,6 @@ class GitlabShell # rubocop:disable Metrics/ClassLength 'git-receive-pack' => File.join(ROOT_PATH, 'bin', 'gitaly-receive-pack') }.freeze API_COMMANDS = %w(2fa_recovery_codes).freeze - GL_PROTOCOL = 'ssh'.freeze def initialize(key_id) @key_id = key_id @@ -106,7 +105,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength end def verify_access - status = api.check_access(git_access, nil, repo_name, key_id, '_any', GL_PROTOCOL) + status = api.check_access(git_access, nil, repo_name, key_id, '_any', GitlabNet::GL_PROTOCOL) raise AccessDeniedError, status.message unless status.allowed? @@ -167,7 +166,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'LANG' => ENV['LANG'], 'GL_ID' => key_id, - 'GL_PROTOCOL' => GL_PROTOCOL, + 'GL_PROTOCOL' => GitlabNet::GL_PROTOCOL, 'GL_REPOSITORY' => @gl_repository, 'GL_USERNAME' => username } |