diff options
| author | Jakub Zienkiewicz <jakub.zienkiewicz@edpauto.com> | 2013-07-29 16:05:08 +0200 |
|---|---|---|
| committer | Jakub Zienkiewicz <jakub.zienkiewicz@edpauto.com> | 2013-07-30 10:15:36 +0200 |
| commit | e03d01d036bf5f5257d767a1b6ab23f06787a421 (patch) | |
| tree | b0ad031409890397297a432bc27615f6d043ea35 /lib/api | |
| parent | 5e35f21605a15414258c5a857f75679f9df2c102 (diff) | |
| download | gitlab-ce-e03d01d036bf5f5257d767a1b6ab23f06787a421.tar.gz | |
extract server-side git commands to constants
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/internal.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index bd28bef2ab2..79f8eb3a543 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -1,6 +1,10 @@ module API # Internal access API class Internal < Grape::API + + DOWNLOAD_COMMANDS = %w{ git-upload-pack git-upload-archive } + PUSH_COMMANDS = %w{ git-receive-pack } + namespace 'internal' do # # Check if ssh key has access to project code @@ -26,16 +30,16 @@ module API if key.is_a? DeployKey - key.projects.include?(project) && git_cmd.starts_with?('git-upload-') + key.projects.include?(project) && DOWNLOAD_COMMANDS.include?(git_cmd) else user = key.user return false if user.blocked? action = case git_cmd - when 'git-upload-pack', 'git-upload-archive' + when *DOWNLOAD_COMMANDS then :download_code - when 'git-receive-pack' + when *PUSH_COMMANDS then if project.protected_branch?(params[:ref]) :push_code_to_protected_branches |