Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
71ae01fe
Commit
71ae01fe
authored
Nov 11, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more tests and fix write to project check
parent
38fbcb99
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
8 deletions
+36
-8
app/models/deploy_key.rb
app/models/deploy_key.rb
+4
-0
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+1
-1
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+31
-7
No files found.
app/models/deploy_key.rb
View file @
71ae01fe
...
@@ -20,4 +20,8 @@ class DeployKey < Key
...
@@ -20,4 +20,8 @@ class DeployKey < Key
def
destroyed_when_orphaned?
def
destroyed_when_orphaned?
self
.
private?
self
.
private?
end
end
def
can_push_to?
(
project
)
can_push?
&&
projects
.
include?
(
project
)
end
end
end
lib/gitlab/git_access.rb
View file @
71ae01fe
...
@@ -89,7 +89,7 @@ module Gitlab
...
@@ -89,7 +89,7 @@ module Gitlab
end
end
def
deploy_key_push_access_check
(
changes
)
def
deploy_key_push_access_check
(
changes
)
if
deploy_key
.
can_push
?
if
deploy_key
.
can_push
_to?
(
project
)
check_repository_existence!
check_repository_existence!
check_change_access!
(
changes
)
if
user
check_change_access!
(
changes
)
if
user
else
else
...
...
spec/lib/gitlab/git_access_spec.rb
View file @
71ae01fe
...
@@ -353,13 +353,13 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -353,13 +353,13 @@ describe Gitlab::GitAccess, lib: true do
end
end
end
end
shared_examples
'
can not push code'
do
shared_examples
'
pushing code'
do
|
can
|
subject
{
access
.
check
(
'git-receive-pack'
,
'_any'
)
}
subject
{
access
.
check
(
'git-receive-pack'
,
'_any'
)
}
context
'when project is authorized'
do
context
'when project is authorized'
do
before
{
authorize
}
before
{
authorize
}
it
{
expect
(
subject
).
not_to
be_allowed
}
it
{
expect
(
subject
).
public_send
(
can
,
be_allowed
)
}
end
end
context
'when unauthorized'
do
context
'when unauthorized'
do
...
@@ -383,10 +383,20 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -383,10 +383,20 @@ describe Gitlab::GitAccess, lib: true do
end
end
end
end
describe
'full authentication abilities'
do
let
(
:authentication_abilities
)
{
full_authentication_abilities
}
it_behaves_like
'pushing code'
,
:to
do
def
authorize
project
.
team
<<
[
user
,
:developer
]
end
end
end
describe
'build authentication abilities'
do
describe
'build authentication abilities'
do
let
(
:authentication_abilities
)
{
build_authentication_abilities
}
let
(
:authentication_abilities
)
{
build_authentication_abilities
}
it_behaves_like
'
can not push code'
do
it_behaves_like
'
pushing code'
,
:not_to
do
def
authorize
def
authorize
project
.
team
<<
[
user
,
:reporter
]
project
.
team
<<
[
user
,
:reporter
]
end
end
...
@@ -394,12 +404,26 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -394,12 +404,26 @@ describe Gitlab::GitAccess, lib: true do
end
end
describe
'deploy key permissions'
do
describe
'deploy key permissions'
do
let
(
:key
)
{
create
(
:deploy_key
)
}
let
(
:key
)
{
create
(
:deploy_key
,
can_push:
can_push
)
}
let
(
:actor
)
{
key
}
let
(
:actor
)
{
key
}
it_behaves_like
'can not push code'
do
context
'when deploy_key can push'
do
def
authorize
let
(
:can_push
)
{
true
}
key
.
projects
<<
project
it_behaves_like
'pushing code'
,
:to
do
def
authorize
key
.
projects
<<
project
end
end
end
context
'when deploy_key cannot push'
do
let
(
:can_push
)
{
false
}
it_behaves_like
'pushing code'
,
:not_to
do
def
authorize
key
.
projects
<<
project
end
end
end
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment