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
5525db8b
Commit
5525db8b
authored
Apr 06, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check branch access when user triggers manual action
parent
ee592f0d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
12 deletions
+63
-12
app/models/ci/build.rb
app/models/ci/build.rb
+10
-0
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+53
-12
No files found.
app/models/ci/build.rb
View file @
5525db8b
...
@@ -115,7 +115,17 @@ module Ci
...
@@ -115,7 +115,17 @@ module Ci
commands
.
present?
commands
.
present?
end
end
def
can_play?
(
current_user
)
::
Gitlab
::
UserAccess
.
new
(
current_user
,
project:
project
)
.
can_push_to_branch?
(
ref
)
end
def
play
(
current_user
)
def
play
(
current_user
)
unless
can_play?
(
current_user
)
raise
Gitlab
::
Access
::
AccessDeniedError
end
# Try to queue a current build
# Try to queue a current build
if
self
.
enqueue
if
self
.
enqueue
self
.
update
(
user:
current_user
)
self
.
update
(
user:
current_user
)
...
...
spec/models/ci/build_spec.rb
View file @
5525db8b
...
@@ -925,6 +925,33 @@ describe Ci::Build, :models do
...
@@ -925,6 +925,33 @@ describe Ci::Build, :models do
end
end
end
end
describe
'#can_play?'
do
before
do
project
.
add_developer
(
user
)
end
let
(
:build
)
do
create
(
:ci_build
,
ref:
'some-ref'
,
pipeline:
pipeline
)
end
context
'when branch build is running for is protected'
do
before
do
create
(
:protected_branch
,
:no_one_can_push
,
name:
'some-ref'
,
project:
project
)
end
it
'indicates that user can not trigger an action'
do
expect
(
build
.
can_play?
(
user
)).
to
be_falsey
end
end
context
'when branch build is running for is not protected'
do
it
'indicates that user can trigger an action'
do
expect
(
build
.
can_play?
(
user
)).
to
be_truthy
end
end
end
describe
'#play'
do
describe
'#play'
do
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
:manual
,
pipeline:
pipeline
)
}
...
@@ -932,6 +959,19 @@ describe Ci::Build, :models do
...
@@ -932,6 +959,19 @@ describe Ci::Build, :models do
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
end
end
context
'when user does not have ability to trigger action'
do
before
do
create
(
:protected_branch
,
:no_one_can_push
,
name:
build
.
ref
,
project:
project
)
end
it
'raises an error'
do
expect
{
build
.
play
(
user
)
}
.
to
raise_error
Gitlab
::
Access
::
AccessDeniedError
end
end
context
'when user has ability to trigger manual action'
do
context
'when build is manual'
do
context
'when build is manual'
do
it
'enqueues a build'
do
it
'enqueues a build'
do
new_build
=
build
.
play
(
user
)
new_build
=
build
.
play
(
user
)
...
@@ -941,7 +981,7 @@ describe Ci::Build, :models do
...
@@ -941,7 +981,7 @@ describe Ci::Build, :models do
end
end
end
end
context
'when build is passed
'
do
context
'when build is not manual
'
do
before
do
before
do
build
.
update
(
status:
'success'
)
build
.
update
(
status:
'success'
)
end
end
...
@@ -954,6 +994,7 @@ describe Ci::Build, :models do
...
@@ -954,6 +994,7 @@ describe Ci::Build, :models do
end
end
end
end
end
end
end
describe
'project settings'
do
describe
'project settings'
do
describe
'#timeout'
do
describe
'#timeout'
do
...
...
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