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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
2532ec9e
Commit
2532ec9e
authored
Jul 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to pull code with deploy key from public projects
parent
cd546a78
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
63 additions
and
11 deletions
+63
-11
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/git_access.rb
lib/gitlab/git_access.rb
+1
-0
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+61
-11
No files found.
CHANGELOG
View file @
2532ec9e
...
@@ -24,6 +24,7 @@ v 8.10.0 (unreleased)
...
@@ -24,6 +24,7 @@ v 8.10.0 (unreleased)
- Escape file extension when parsing search results !5141 (winniehell)
- Escape file extension when parsing search results !5141 (winniehell)
- Apply the trusted_proxies config to the rack request object for use with rack_attack
- Apply the trusted_proxies config to the rack request object for use with rack_attack
- Upgrade to Rails 4.2.7. !5236
- Upgrade to Rails 4.2.7. !5236
- Allow to pull code with deploy key from public projects
- Add Sidekiq queue duration to transaction metrics.
- Add Sidekiq queue duration to transaction metrics.
- Add a new column `artifacts_size` to table `ci_builds` !4964
- Add a new column `artifacts_size` to table `ci_builds` !4964
- Let Workhorse serve format-patch diffs
- Let Workhorse serve format-patch diffs
...
...
lib/gitlab/git_access.rb
View file @
2532ec9e
...
@@ -110,6 +110,7 @@ module Gitlab
...
@@ -110,6 +110,7 @@ module Gitlab
def
deploy_key_can_read_project?
def
deploy_key_can_read_project?
if
deploy_key
if
deploy_key
return
true
if
project
.
public?
deploy_key
.
projects
.
include?
(
project
)
deploy_key
.
projects
.
include?
(
project
)
else
else
false
false
...
...
spec/lib/gitlab/git_access_spec.rb
View file @
2532ec9e
...
@@ -44,12 +44,12 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -44,12 +44,12 @@ describe Gitlab::GitAccess, lib: true do
end
end
describe
'download_access_check'
do
describe
'download_access_check'
do
subject
{
access
.
check
(
'git-upload-pack'
)
}
describe
'master permissions'
do
describe
'master permissions'
do
before
{
project
.
team
<<
[
user
,
:master
]
}
before
{
project
.
team
<<
[
user
,
:master
]
}
context
'pull code'
do
context
'pull code'
do
subject
{
access
.
download_access_check
}
it
{
expect
(
subject
.
allowed?
).
to
be_truthy
}
it
{
expect
(
subject
.
allowed?
).
to
be_truthy
}
end
end
end
end
...
@@ -58,8 +58,6 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -58,8 +58,6 @@ describe Gitlab::GitAccess, lib: true do
before
{
project
.
team
<<
[
user
,
:guest
]
}
before
{
project
.
team
<<
[
user
,
:guest
]
}
context
'pull code'
do
context
'pull code'
do
subject
{
access
.
download_access_check
}
it
{
expect
(
subject
.
allowed?
).
to
be_falsey
}
it
{
expect
(
subject
.
allowed?
).
to
be_falsey
}
end
end
end
end
...
@@ -71,16 +69,12 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -71,16 +69,12 @@ describe Gitlab::GitAccess, lib: true do
end
end
context
'pull code'
do
context
'pull code'
do
subject
{
access
.
download_access_check
}
it
{
expect
(
subject
.
allowed?
).
to
be_falsey
}
it
{
expect
(
subject
.
allowed?
).
to
be_falsey
}
end
end
end
end
describe
'without acccess to project'
do
describe
'without acccess to project'
do
context
'pull code'
do
context
'pull code'
do
subject
{
access
.
download_access_check
}
it
{
expect
(
subject
.
allowed?
).
to
be_falsey
}
it
{
expect
(
subject
.
allowed?
).
to
be_falsey
}
end
end
end
end
...
@@ -90,10 +84,31 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -90,10 +84,31 @@ describe Gitlab::GitAccess, lib: true do
let
(
:actor
)
{
key
}
let
(
:actor
)
{
key
}
context
'pull code'
do
context
'pull code'
do
before
{
key
.
projects
<<
project
}
context
'when project is authorized'
do
subject
{
access
.
download_access_check
}
before
{
key
.
projects
<<
project
}
it
{
expect
(
subject
.
allowed?
).
to
be_truthy
}
it
{
expect
(
subject
).
to
be_allowed
}
end
context
'when unauthorized'
do
context
'from public project'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
it
{
expect
(
subject
).
to
be_allowed
}
end
context
'from internal project'
do
let
(
:project
)
{
create
(
:project
,
:internal
)
}
it
{
expect
(
subject
).
not_to
be_allowed
}
end
context
'from private project'
do
let
(
:project
)
{
create
(
:project
,
:internal
)
}
it
{
expect
(
subject
).
not_to
be_allowed
}
end
end
end
end
end
end
end
end
...
@@ -240,5 +255,40 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -240,5 +255,40 @@ describe Gitlab::GitAccess, lib: true do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
true
,
push_all:
true
,
merge_into_protected_branch:
true
}))
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
push_protected_branch:
true
,
push_all:
true
,
merge_into_protected_branch:
true
}))
end
end
end
end
describe
'deploy key permissions'
do
let
(
:key
)
{
create
(
:deploy_key
)
}
let
(
:actor
)
{
key
}
context
'push code'
do
subject
{
access
.
check
(
'git-receive-pack'
)
}
context
'when project is authorized'
do
before
{
key
.
projects
<<
project
}
it
{
expect
(
subject
).
not_to
be_allowed
}
end
context
'when unauthorized'
do
context
'to public project'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
it
{
expect
(
subject
).
not_to
be_allowed
}
end
context
'to internal project'
do
let
(
:project
)
{
create
(
:project
,
:internal
)
}
it
{
expect
(
subject
).
not_to
be_allowed
}
end
context
'to private project'
do
let
(
:project
)
{
create
(
:project
,
:internal
)
}
it
{
expect
(
subject
).
not_to
be_allowed
}
end
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