Commit 5ef06ac7 authored by Ash McKenzie's avatar Ash McKenzie

Move GL_PROTOCOL into GitlabNet

parent 724d7c2f
...@@ -16,6 +16,7 @@ class GitlabNet # rubocop:disable Metrics/ClassLength ...@@ -16,6 +16,7 @@ class GitlabNet # rubocop:disable Metrics/ClassLength
class NotFound < StandardError; end class NotFound < StandardError; end
CHECK_TIMEOUT = 5 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, env: {})
changes = changes.join("\n") unless changes.is_a?(String) changes = changes.join("\n") unless changes.is_a?(String)
......
...@@ -16,7 +16,6 @@ class GitlabShell # rubocop:disable Metrics/ClassLength ...@@ -16,7 +16,6 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
'git-receive-pack' => File.join(ROOT_PATH, 'bin', 'gitaly-receive-pack') 'git-receive-pack' => File.join(ROOT_PATH, 'bin', 'gitaly-receive-pack')
}.freeze }.freeze
API_COMMANDS = %w(2fa_recovery_codes).freeze API_COMMANDS = %w(2fa_recovery_codes).freeze
GL_PROTOCOL = 'ssh'.freeze
attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access
attr_reader :repo_path attr_reader :repo_path
...@@ -101,7 +100,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength ...@@ -101,7 +100,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
end end
def verify_access 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? raise AccessDeniedError, status.message unless status.allowed?
...@@ -162,7 +161,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength ...@@ -162,7 +161,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'],
'LANG' => ENV['LANG'], 'LANG' => ENV['LANG'],
'GL_ID' => @key_id, 'GL_ID' => @key_id,
'GL_PROTOCOL' => GL_PROTOCOL, 'GL_PROTOCOL' => GitlabNet::GL_PROTOCOL,
'GL_REPOSITORY' => @gl_repository, 'GL_REPOSITORY' => @gl_repository,
'GL_USERNAME' => @username 'GL_USERNAME' => @username
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment