summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2018-12-21 15:26:25 +0000
committerDouwe Maan <douwe@gitlab.com>2018-12-21 15:26:25 +0000
commita613dbc7fa158a6e4c1799e951f795d7b2f9c0d0 (patch)
treef5bf8947211a97a91884fdc1cb9c17283a66271a
parent03e66710b8b6c8483a384e0784cec4689c48176f (diff)
downloadgitlab-shell-a613dbc7fa158a6e4c1799e951f795d7b2f9c0d0.tar.gz
Make better use of constants in lib/gitlab_shell.rb
-rw-r--r--lib/gitlab_shell.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 6ad67c1..c1bb976 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -23,8 +23,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
GIT_RECEIVE_PACK_COMMAND => File.join(ROOT_PATH, 'bin', 'gitaly-receive-pack')
}.freeze
- GIT_COMMANDS = (GITALY_COMMANDS.keys + ['git-lfs-authenticate']).freeze
- API_COMMANDS = %w(2fa_recovery_codes).freeze
+ GIT_COMMANDS = (GITALY_COMMANDS.keys + [GIT_LFS_AUTHENTICATE_COMMAND]).freeze
+ TWO_FACTOR_RECOVERY_COMMAND = '2fa_recovery_codes'
GL_PROTOCOL = 'ssh'
attr_accessor :gl_id, :gl_repository, :repo_name, :command, :git_access, :git_protocol
@@ -114,7 +114,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
@git_access = @command
- return args if API_COMMANDS.include?(@command)
+ return args if TWO_FACTOR_RECOVERY_COMMAND == @command
raise DisallowedCommandError unless GIT_COMMANDS.include?(@command)
@@ -151,9 +151,9 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
end
def process_cmd(args)
- return send("api_#{@command}") if API_COMMANDS.include?(@command)
+ return api_2fa_recovery_codes if TWO_FACTOR_RECOVERY_COMMAND == @command
- if @command == 'git-lfs-authenticate'
+ if @command == GIT_LFS_AUTHENTICATE_COMMAND
GitlabMetrics.measure('lfs-authenticate') do
operation = args[2]
$logger.info('Processing LFS authentication', operation: operation, user: log_username)