diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-06-21 04:40:56 +0300 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-06 00:54:22 +0300 |
commit | 7735ef86f0714a5b2a4cb4db8ec0471654563885 (patch) | |
tree | 5f56b0348da8870736339150b669069f84e43fd1 /lib | |
parent | ea9d910c8bd2774cf48a5b6092704143a7505011 (diff) |
Only allow Git Access on the allowed protocol
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/internal.rb | 7 | ||||
-rw-r--r-- | lib/gitlab/git/hook.rb | 3 | ||||
-rw-r--r-- | lib/gitlab/git_access.rb | 19 | ||||
-rw-r--r-- | lib/gitlab/protocol_access.rb | 13 |
4 files changed, 37 insertions, 5 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index b32503e8516..d5dfba5e0cc 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -13,6 +13,7 @@ module API # action - git action (git-upload-pack or git-receive-pack) # ref - branch name # forced_push - forced_push + # protocol - Git access protocol being used, e.g. HTTP or SSH # helpers do @@ -46,11 +47,13 @@ module API User.find_by(id: params[:user_id]) end + protocol = params[:protocol] + access = if wiki? - Gitlab::GitAccessWiki.new(actor, project) + Gitlab::GitAccessWiki.new(actor, project, protocol) else - Gitlab::GitAccess.new(actor, project) + Gitlab::GitAccess.new(actor, project, protocol) end access_status = access.check(params[:action], params[:changes]) diff --git a/lib/gitlab/git/hook.rb b/lib/gitlab/git/hook.rb index 420c6883c45..0b61c8bf332 100644 --- a/lib/gitlab/git/hook.rb +++ b/lib/gitlab/git/hook.rb @@ -34,7 +34,8 @@ module Gitlab vars = { 'GL_ID' => gl_id, - 'PWD' => repo_path + 'PWD' => repo_path, + 'PROTOCOL' => 'web' } options = { diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index d2a0e316cbe..7aec650d1a1 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -3,11 +3,12 @@ module Gitlab DOWNLOAD_COMMANDS = %w{ git-upload-pack git-upload-archive } PUSH_COMMANDS = %w{ git-receive-pack } - attr_reader :actor, :project + attr_reader :actor, :project, :protocol - def initialize(actor, project) + def initialize(actor, project, protocol = nil) @actor = actor @project = project + @protocol = protocol end def user @@ -49,6 +50,8 @@ module Gitlab end def check(cmd, changes = nil) + return build_status_object(false, "Git access over #{protocol.upcase} is not allowed") unless protocol_allowed? + unless actor return build_status_object(false, "No user or key was provided.") end @@ -72,6 +75,8 @@ module Gitlab end def download_access_check + return build_status_object(false, "Git access over #{protocol.upcase} is not allowed") unless protocol_allowed? + if user user_download_access_check elsif deploy_key @@ -82,6 +87,8 @@ module Gitlab end def push_access_check(changes) + return build_status_object(false, "Git access over #{protocol.upcase} is not allowed") unless protocol_allowed? + if user user_push_access_check(changes) elsif deploy_key @@ -92,6 +99,8 @@ module Gitlab end def user_download_access_check + return build_status_object(false, "Git access over #{protocol.upcase} is not allowed") unless protocol_allowed? + unless user.can?(:download_code, project) return build_status_object(false, "You are not allowed to download code from this project.") end @@ -100,6 +109,8 @@ module Gitlab end def user_push_access_check(changes) + return build_status_object(false, "Git access over #{protocol.upcase} is not allowed") unless protocol_allowed? + if changes.blank? return build_status_object(true) end @@ -188,6 +199,10 @@ module Gitlab Gitlab::UserAccess.allowed?(user) end + def protocol_allowed? + protocol ? Gitlab::ProtocolAccess.allowed?(protocol) : true + end + def branch_name(ref) ref = ref.to_s if Gitlab::Git.branch_ref?(ref) diff --git a/lib/gitlab/protocol_access.rb b/lib/gitlab/protocol_access.rb new file mode 100644 index 00000000000..0498a72d4cf --- /dev/null +++ b/lib/gitlab/protocol_access.rb @@ -0,0 +1,13 @@ +module Gitlab + module ProtocolAccess + def self.allowed?(protocol) + if protocol.to_s == 'web' + true + elsif !current_application_settings.enabled_git_access_protocols.present? + true + else + protocol.to_s == current_application_settings.enabled_git_access_protocols + end + end + end +end |