diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2018-07-26 19:03:31 +1000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2018-08-01 00:24:16 +1000 |
| commit | 252a96d61f52d91486f92f980c2f0e4c7a1b9408 (patch) | |
| tree | ab24796b8b3887bb801a701c7276c2cb7f84553c /lib/gitlab_shell.rb | |
| parent | c4d63ab07f83c93b5e80a81db5a6bb926b6930c7 (diff) | |
| download | gitlab-shell-252a96d61f52d91486f92f980c2f0e4c7a1b9408.tar.gz | |
Tidy up GitlabShell
* Use constants for git commands
* private instead of protected
Diffstat (limited to 'lib/gitlab_shell.rb')
| -rw-r--r-- | lib/gitlab_shell.rb | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 6077c02..aaa0570 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -6,7 +6,6 @@ require_relative 'gitlab_metrics' class GitlabShell # rubocop:disable Metrics/ClassLength - GIT_COMMANDS = %w(git-upload-pack git-receive-pack git-upload-archive git-lfs-authenticate).freeze GITALY_MIGRATED_COMMANDS = { 'git-upload-pack' => File.join(ROOT_PATH, 'bin', 'gitaly-upload-pack'), 'git-upload-archive' => File.join(ROOT_PATH, 'bin', 'gitaly-upload-archive'), @@ -16,6 +15,13 @@ class GitlabShell # rubocop:disable Metrics/ClassLength attr_accessor :key_id, :gl_repository, :repo_name, :command, :git_access attr_reader :repo_path + GIT_UPLOAD_PACK_COMMAND = 'git-upload-pack'.freeze + GIT_RECEIVE_PACK_COMMAND = 'git-receive-pack'.freeze + GIT_UPLOAD_ARCHIVE_COMMAND = 'git-upload-archive'.freeze + GIT_LFS_AUTHENTICATE_COMMAND = 'git-lfs-authenticate'.freeze + + GIT_COMMANDS = [GIT_UPLOAD_PACK_COMMAND, GIT_RECEIVE_PACK_COMMAND, + GIT_UPLOAD_ARCHIVE_COMMAND, GIT_LFS_AUTHENTICATE_COMMAND].freeze def initialize(key_id) @key_id = key_id @@ -26,7 +32,7 @@ class GitlabShell # rubocop:disable Metrics/ClassLength # ssh git@gitlab.example.com 'evil command', then origin_cmd contains # 'evil command'. def exec(origin_cmd) - unless origin_cmd + if !origin_cmd || origin_cmd.empty? puts "Welcome to GitLab, #{username}!" return true end @@ -46,20 +52,19 @@ class GitlabShell # rubocop:disable Metrics/ClassLength false rescue AccessDeniedError => ex $logger.warn('Access denied', command: origin_cmd, user: log_username) - $stderr.puts "GitLab: #{ex.message}" false rescue DisallowedCommandError $logger.warn('Denied disallowed command', command: origin_cmd, user: log_username) - - $stderr.puts "GitLab: Disallowed command" + $stderr.puts 'GitLab: Disallowed command' false rescue InvalidRepositoryPathError - $stderr.puts "GitLab: Invalid repository path" + $stderr.puts 'GitLab: Invalid repository path' false end - protected + private + def parse_cmd(args) # Handle Git for Windows 2.14 using "git upload-pack" instead of git-upload-pack |