deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into api/system_hooks_adjustments

Browse source
This commit is contained in:
Sebastian Ziebell 2013-03-07 17:59:27 +01:00
commit 562de2a438
2 changed files with 52 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/api/internal.rb
View file

@ -20,6 +20,9 @@ module Gitlab
project == key.project && git_cmd == 'git-upload-pack' project == key.project && git_cmd == 'git-upload-pack'
else else
user = key.user user = key.user
return false if user.blocked?
action = case git_cmd action = case git_cmd
when 'git-upload-pack' when 'git-upload-pack'
then :download_code then :download_code

77
spec/requests/api/internal_spec.rb
View file

@ -34,13 +34,7 @@ describe Gitlab::API do
context "git pull" do context "git pull" do
it do it do
get( pull(key, project)
api("/internal/allowed"),
ref: 'master',
key_id: key.id,
project: project.path_with_namespace,
action: 'git-upload-pack'
)
response.status.should == 200 response.status.should == 200
response.body.should == 'true' response.body.should == 'true'
@ -49,13 +43,7 @@ describe Gitlab::API do
context "git push" do context "git push" do
it do it do
get( push(key, project)
api("/internal/allowed"),
ref: 'master',
key_id: key.id,
project: project.path_with_namespace,
action: 'git-receive-pack'
)
response.status.should == 200 response.status.should == 200
response.body.should == 'true' response.body.should == 'true'
@ -70,13 +58,7 @@ describe Gitlab::API do
context "git pull" do context "git pull" do
it do it do
get( pull(key, project)
api("/internal/allowed"),
ref: 'master',
key_id: key.id,
project: project.path_with_namespace,
action: 'git-upload-pack'
)
response.status.should == 200 response.status.should == 200
response.body.should == 'false' response.body.should == 'false'
@ -85,13 +67,7 @@ describe Gitlab::API do
context "git push" do context "git push" do
it do it do
get( push(key, project)
api("/internal/allowed"),
ref: 'master',
key_id: key.id,
project: project.path_with_namespace,
action: 'git-receive-pack'
)
response.status.should == 200 response.status.should == 200
response.body.should == 'false' response.body.should == 'false'
@ -99,5 +75,50 @@ describe Gitlab::API do
end end
end end
context "blocked user" do
let(:personal_project) { create(:project, namespace: user.namespace) }
before do
user.block
end
context "git pull" do
it do
pull(key, personal_project)
response.status.should == 200
response.body.should == 'false'
end
end
context "git push" do
it do
push(key, personal_project)
response.status.should == 200
response.body.should == 'false'
end
end
end
end
def pull(key, project)
get(
api("/internal/allowed"),
ref: 'master',
key_id: key.id,
project: project.path_with_namespace,
action: 'git-upload-pack'
)
end
def push(key, project)
get(
api("/internal/allowed"),
ref: 'master',
key_id: key.id,
project: project.path_with_namespace,
action: 'git-receive-pack'
)
end end
end end