BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1b8f52d9
Commit
1b8f52d9
authored
Jun 14, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid enabling locked runners. Give 403 in this case
parent
cbd6ca69
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
runner_projects_controller.rb
app/controllers/admin/runner_projects_controller.rb
+2
-0
runner_projects_controller.rb
app/controllers/projects/runner_projects_controller.rb
+1
-0
runners.rb
lib/api/runners.rb
+1
-0
runners_spec.rb
spec/requests/api/runners_spec.rb
+14
-2
No files found.
app/controllers/admin/runner_projects_controller.rb
View file @
1b8f52d9
...
...
@@ -9,6 +9,8 @@ class Admin::RunnerProjectsController < Admin::ApplicationController
def
create
@runner
=
Ci
::
Runner
.
find
(
params
[
:runner_project
][
:runner_id
])
return
head
(
403
)
if
runner
.
is_shared?
||
runner
.
is_locked?
if
@runner
.
assign_to
(
@project
,
current_user
)
redirect_to
admin_runner_path
(
@runner
)
else
...
...
app/controllers/projects/runner_projects_controller.rb
View file @
1b8f52d9
...
...
@@ -6,6 +6,7 @@ class Projects::RunnerProjectsController < Projects::ApplicationController
def
create
@runner
=
Ci
::
Runner
.
find
(
params
[
:runner_project
][
:runner_id
])
return
head
(
403
)
if
runner
.
is_shared?
||
runner
.
is_locked?
return
head
(
403
)
unless
current_user
.
ci_authorized_runners
.
include?
(
@runner
)
path
=
runners_path
(
project
)
...
...
lib/api/runners.rb
View file @
1b8f52d9
...
...
@@ -163,6 +163,7 @@ module API
def
authenticate_enable_runner!
(
runner
)
forbidden!
(
"Runner is shared"
)
if
runner
.
is_shared?
forbidden!
(
"Runner is locked"
)
if
runner
.
locked?
return
if
current_user
.
is_admin?
forbidden!
(
"No access granted"
)
unless
user_can_access_runner?
(
runner
)
end
...
...
spec/requests/api/runners_spec.rb
View file @
1b8f52d9
...
...
@@ -362,11 +362,13 @@ describe API::Runners, api: true do
describe
'POST /projects/:id/runners'
do
context
'authorized user'
do
it
'should enable specific runner'
do
specific_runner2
=
create
(
:ci_runner
).
tap
do
|
runner
|
let
(
:specific_runner2
)
do
create
(
:ci_runner
).
tap
do
|
runner
|
create
(
:ci_runner_project
,
runner:
runner
,
project:
project2
)
end
end
it
'should enable specific runner'
do
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/runners"
,
user
),
runner_id:
specific_runner2
.
id
end
.
to
change
{
project
.
runners
.
count
}.
by
(
+
1
)
...
...
@@ -380,6 +382,16 @@ describe API::Runners, api: true do
expect
(
response
.
status
).
to
eq
(
201
)
end
it
'should not enable locked runner'
do
specific_runner2
.
update
(
locked:
true
)
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/runners"
,
user
),
runner_id:
specific_runner2
.
id
end
.
to
change
{
project
.
runners
.
count
}.
by
(
0
)
expect
(
response
.
status
).
to
eq
(
403
)
end
it
'should not enable shared runner'
do
post
api
(
"/projects/
#{
project
.
id
}
/runners"
,
user
),
runner_id:
shared_runner
.
id
...
...
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