Commit 1f72c387 authored by Douwe Maan's avatar Douwe Maan

Improve Git access error messages.

parent bd8ff93c
...@@ -24,10 +24,6 @@ module API ...@@ -24,10 +24,6 @@ module API
User.find_by(id: params[:user_id]) User.find_by(id: params[:user_id])
end end
unless actor
return Gitlab::GitAccessStatus.new(false, 'No such user or key')
end
project_path = params[:project] project_path = params[:project]
# Check for *.wiki repositories. # Check for *.wiki repositories.
...@@ -39,7 +35,6 @@ module API ...@@ -39,7 +35,6 @@ module API
project = Project.find_with_namespace(project_path) project = Project.find_with_namespace(project_path)
if project
access = access =
if wiki if wiki
Gitlab::GitAccessWiki.new(actor, project) Gitlab::GitAccessWiki.new(actor, project)
...@@ -47,14 +42,7 @@ module API ...@@ -47,14 +42,7 @@ module API
Gitlab::GitAccess.new(actor, project) Gitlab::GitAccess.new(actor, project)
end end
status = access.check(params[:action], params[:changes]) access.check(params[:action], params[:changes])
end
if project && access.can_read_project?
status
else
Gitlab::GitAccessStatus.new(false, 'No such project')
end
end end
# #
......
...@@ -31,8 +31,7 @@ module Gitlab ...@@ -31,8 +31,7 @@ module Gitlab
def can_push_to_branch?(ref) def can_push_to_branch?(ref)
return false unless user return false unless user
if project.protected_branch?(ref) && if project.protected_branch?(ref) && !project.developers_can_push_to_protected_branch?(ref)
!(project.developers_can_push_to_protected_branch?(ref) && project.team.developer?(user))
user.can?(:push_code_to_protected_branches, project) user.can?(:push_code_to_protected_branches, project)
else else
user.can?(:push_code, project) user.can?(:push_code, project)
...@@ -50,13 +49,25 @@ module Gitlab ...@@ -50,13 +49,25 @@ module Gitlab
end end
def check(cmd, changes = nil) def check(cmd, changes = nil)
unless actor
return build_status_object(false, "No user or key was provided.")
end
if user && !user_allowed?
return build_status_object(false, "Your account has been blocked.")
end
unless project && can_read_project?
return build_status_object(false, 'The project you were looking for could not be found.')
end
case cmd case cmd
when *DOWNLOAD_COMMANDS when *DOWNLOAD_COMMANDS
download_access_check download_access_check
when *PUSH_COMMANDS when *PUSH_COMMANDS
push_access_check(changes) push_access_check(changes)
else else
build_status_object(false, "Wrong command") build_status_object(false, "The command you're trying to execute is not allowed.")
end end
end end
...@@ -64,7 +75,7 @@ module Gitlab ...@@ -64,7 +75,7 @@ module Gitlab
if user if user
user_download_access_check user_download_access_check
elsif deploy_key elsif deploy_key
deploy_key_download_access_check build_status_object(true)
else else
raise 'Wrong actor' raise 'Wrong actor'
end end
...@@ -74,39 +85,27 @@ module Gitlab ...@@ -74,39 +85,27 @@ module Gitlab
if user if user
user_push_access_check(changes) user_push_access_check(changes)
elsif deploy_key elsif deploy_key
build_status_object(false, "Deploy key not allowed to push") build_status_object(false, "Deploy keys are not allowed to push code.")
else else
raise 'Wrong actor' raise 'Wrong actor'
end end
end end
def user_download_access_check def user_download_access_check
if user && user_allowed? && user.can?(:download_code, project) unless user.can?(:download_code, project)
build_status_object(true) return build_status_object(false, "You are not allowed to download code from this project.")
else
build_status_object(false, "You don't have access")
end
end end
def deploy_key_download_access_check
if can_read_project?
build_status_object(true) build_status_object(true)
else
build_status_object(false, "Deploy key not allowed to access this project")
end
end end
def user_push_access_check(changes) def user_push_access_check(changes)
unless user && user_allowed?
return build_status_object(false, "You don't have access")
end
if changes.blank? if changes.blank?
return build_status_object(true) return build_status_object(true)
end end
unless project.repository.exists? unless project.repository.exists?
return build_status_object(false, "Repository does not exist") return build_status_object(false, "A repository for this project does not exist yet.")
end end
changes = changes.lines if changes.kind_of?(String) changes = changes.lines if changes.kind_of?(String)
...@@ -136,11 +135,23 @@ module Gitlab ...@@ -136,11 +135,23 @@ module Gitlab
:push_code :push_code
end end
if user.can?(action, project) unless user.can?(action, project)
build_status_object(true) return
else case action
build_status_object(false, "You don't have permission") when :force_push_code_to_protected_branches
build_status_object(false, "You are not allowed to force push code to a protected branch on this project.")
when :remove_protected_branches
build_status_object(false, "You are not allowed to deleted protected branches from this project.")
when :push_code_to_protected_branches
build_status_object(false, "You are not allowed to push code to protected branches on this project.")
when :admin_project
build_status_object(false, "You are not allowed to change existing tags on this project.")
else # :push_code
build_status_object(false, "You are not allowed to push code to this project.")
end
end end
build_status_object(true)
end end
def forced_push?(oldrev, newrev) def forced_push?(oldrev, newrev)
......
...@@ -4,7 +4,7 @@ module Gitlab ...@@ -4,7 +4,7 @@ module Gitlab
if user.can?(:write_wiki, project) if user.can?(:write_wiki, project)
build_status_object(true) build_status_object(true)
else else
build_status_object(false, "You don't have access") build_status_object(false, "You are not allowed to write to this project's wiki.")
end end
end end
end end
......
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