kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

API: Introduce `#find_project!` which also check access permission 

Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2016-11-24 14:40:35 +01:00
parent 304163becb
commit 4f5ed81232
No known key found for this signature in database
GPG Key ID: 46DF07E5CD9E96AB
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/api/helpers.rb
View File

@ -68,7 +68,7 @@ module API
end end
def user_project def user_project
@project ||= find_project(params[:id]) @project ||= find_project!(params[:id])
end end
def available_labels def available_labels
@ -76,12 +76,15 @@ module API
end end
def find_project(id) def find_project(id)
project = if id =~ /^\d+$/
if id =~ /^\d+$/ Project.find_by(id: id)
Project.find_by(id: id) else
else Project.find_with_namespace(id)
Project.find_with_namespace(id) end
end end
def find_project!(id)
project = find_project(id)
if can?(current_user, :read_project, project) if can?(current_user, :read_project, project)
project project

2
lib/api/projects.rb
View File

@ -379,7 +379,7 @@ module API
# POST /projects/:id/fork/:forked_from_id # POST /projects/:id/fork/:forked_from_id
post ":id/fork/:forked_from_id" do post ":id/fork/:forked_from_id" do
authenticated_as_admin! authenticated_as_admin!
forked_from_project = find_project(params[:forked_from_id]) forked_from_project = find_project!(params[:forked_from_id])
unless forked_from_project.nil? unless forked_from_project.nil?
if user_project.forked_from_project.nil? if user_project.forked_from_project.nil?
user_project.create_forked_project_link(forked_to_project_id: user_project.id, forked_from_project_id: forked_from_project.id) user_project.create_forked_project_link(forked_to_project_id: user_project.id, forked_from_project_id: forked_from_project.id)