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
6e8ea52b
Commit
6e8ea52b
authored
Jun 26, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add functionality and security.
parent
e364c118
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
312 additions
and
239 deletions
+312
-239
app/controllers/projects/pipeline_schedules_controller.rb
app/controllers/projects/pipeline_schedules_controller.rb
+2
-0
app/policies/ci/pipeline_schedule_policy.rb
app/policies/ci/pipeline_schedule_policy.rb
+6
-16
spec/controllers/projects/pipeline_schedules_controller_spec.rb
...ontrollers/projects/pipeline_schedules_controller_spec.rb
+304
-223
No files found.
app/controllers/projects/pipeline_schedules_controller.rb
View file @
6e8ea52b
...
@@ -33,6 +33,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
...
@@ -33,6 +33,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
end
end
def
update
def
update
return
access_denied!
unless
can?
(
current_user
,
:update_pipeline_schedule
,
schedule
)
if
Ci
::
CreatePipelineScheduleService
if
Ci
::
CreatePipelineScheduleService
.
new
(
@project
,
current_user
,
schedule_params
).
update
(
schedule
)
.
new
(
@project
,
current_user
,
schedule_params
).
update
(
schedule
)
redirect_to
namespace_project_pipeline_schedules_path
(
@project
.
namespace
.
becomes
(
Namespace
),
@project
)
redirect_to
namespace_project_pipeline_schedules_path
(
@project
.
namespace
.
becomes
(
Namespace
),
@project
)
...
...
app/policies/ci/pipeline_schedule_policy.rb
View file @
6e8ea52b
...
@@ -2,24 +2,14 @@ module Ci
...
@@ -2,24 +2,14 @@ module Ci
class
PipelineSchedulePolicy
<
PipelinePolicy
class
PipelineSchedulePolicy
<
PipelinePolicy
alias_method
:pipeline_schedule
,
:subject
alias_method
:pipeline_schedule
,
:subject
condition
(
:protected_action
)
do
def
rules
owned_by_developer?
&&
owned_by_another?
super
end
rule
{
protected_action
}.
prevent
:update_pipeline_schedule
private
def
owned_by_developer?
access
=
pipeline_schedule
.
project
.
team
.
max_member_access
(
user
.
id
)
return
false
unless
@user
pipeline_schedule
.
project
.
team
.
developer?
(
@user
)
if
access
==
Gitlab
::
Access
::
DEVELOPER
&&
pipeline_schedule
.
owner
!=
user
cannot!
:update_pipeline_schedule
end
end
def
owned_by_another?
return
false
unless
@user
!
pipeline_schedule
.
owned_by?
(
@user
)
end
end
end
end
end
end
spec/controllers/projects/pipeline_schedules_controller_spec.rb
View file @
6e8ea52b
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
PipelineSchedulesController
do
describe
Projects
::
PipelineSchedulesController
do
include
AccessMatchersForController
set
(
:project
)
{
create
(
:empty_project
,
:public
)
}
set
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let!
(
:pipeline_schedule
)
{
create
(
:ci_pipeline_schedule
,
project:
project
)
}
let!
(
:pipeline_schedule
)
{
create
(
:ci_pipeline_schedule
,
project:
project
)
}
...
@@ -53,6 +55,7 @@ describe Projects::PipelineSchedulesController do
...
@@ -53,6 +55,7 @@ describe Projects::PipelineSchedulesController do
end
end
describe
'POST #create'
do
describe
'POST #create'
do
describe
'functionality'
do
before
do
before
do
create
(
:user
).
tap
do
|
user
|
create
(
:user
).
tap
do
|
user
|
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
...
@@ -65,9 +68,7 @@ describe Projects::PipelineSchedulesController do
...
@@ -65,9 +68,7 @@ describe Projects::PipelineSchedulesController do
end
end
context
'when variables_attributes is empty'
do
context
'when variables_attributes is empty'
do
let
(
:schedule
)
do
let
(
:schedule
)
{
basic_param
}
basic_param
end
it
'creates a new schedule'
do
it
'creates a new schedule'
do
expect
{
post
:create
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
schedule:
schedule
}
expect
{
post
:create
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
schedule:
schedule
}
...
@@ -158,19 +159,44 @@ describe Projects::PipelineSchedulesController do
...
@@ -158,19 +159,44 @@ describe Projects::PipelineSchedulesController do
end
end
end
end
describe
'security'
do
let
(
:action
)
do
proc
do
|
user
|
post
:create
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
schedule:
{
description:
'aaaaaaaa'
,
cron:
'0 4 * * *'
,
cron_timezone:
'UTC'
,
ref:
'master'
,
active:
'1'
}
end
end
specify
{
expect
(
action
).
to
be_allowed_for
(
:admin
)
}
specify
{
expect
(
action
).
to
be_allowed_for
(
:owner
).
of
(
project
)
}
specify
{
expect
(
action
).
to
be_allowed_for
(
:master
).
of
(
project
)
}
specify
{
expect
(
action
).
to
be_allowed_for
(
:developer
).
of
(
project
)
}
specify
{
expect
(
action
).
to
be_denied_for
(
:reporter
).
of
(
project
)
}
specify
{
expect
(
action
).
to
be_denied_for
(
:guest
).
of
(
project
)
}
specify
{
expect
(
action
).
to
be_denied_for
(
:user
)
}
specify
{
expect
(
action
).
to
be_denied_for
(
:external
)
}
specify
{
expect
(
action
).
to
be_denied_for
(
:visitor
)
}
end
end
describe
'PUT #update'
do
describe
'PUT #update'
do
describe
'functionality'
do
let
(
:user
)
{
create
(
:user
)
}
let!
(
:pipeline_schedule
)
{
create
(
:ci_pipeline_schedule
,
project:
project
,
owner:
user
)
}
before
do
before
do
create
(
:user
).
tap
do
|
user
|
project
.
add_developer
(
user
)
project
.
add_developer
(
user
)
sign_in
(
user
)
sign_in
(
user
)
end
end
end
context
'when a pipeline schedule has no variables'
do
let
(
:basic_param
)
do
let
(
:basic_param
)
do
{
description:
'updated_desc'
,
cron:
'0 1 * * *'
,
cron_timezone:
'UTC'
,
ref:
'patch-x'
,
active:
'1'
}
{
description:
'updated_desc'
,
cron:
'0 1 * * *'
,
cron_timezone:
'UTC'
,
ref:
'patch-x'
,
active:
'1'
}
end
end
context
'when a pipeline schedule has no variables'
do
context
'when params do not include variables'
do
context
'when params do not include variables'
do
let
(
:schedule
)
{
basic_param
}
let
(
:schedule
)
{
basic_param
}
...
@@ -251,6 +277,10 @@ describe Projects::PipelineSchedulesController do
...
@@ -251,6 +277,10 @@ describe Projects::PipelineSchedulesController do
end
end
context
'when a pipeline schedule has one variable'
do
context
'when a pipeline schedule has one variable'
do
let
(
:basic_param
)
do
{
description:
'updated_desc'
,
cron:
'0 1 * * *'
,
cron_timezone:
'UTC'
,
ref:
'patch-x'
,
active:
'1'
}
end
let!
(
:pipeline_schedule_variable
)
do
let!
(
:pipeline_schedule_variable
)
do
create
(
:ci_pipeline_schedule_variable
,
key:
'CCC'
,
create
(
:ci_pipeline_schedule_variable
,
key:
'CCC'
,
pipeline_schedule:
pipeline_schedule
)
pipeline_schedule:
pipeline_schedule
)
...
@@ -331,65 +361,116 @@ describe Projects::PipelineSchedulesController do
...
@@ -331,65 +361,116 @@ describe Projects::PipelineSchedulesController do
end
end
end
end
describe
'GET edit'
do
describe
'security'
do
context
'TODO: integrate to bottom'
do
context
'when a developer created a pipeline schedule'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:developer_1
)
{
create
(
:user
)
}
let!
(
:pipeline_schedule
)
{
create
(
:ci_pipeline_schedule
,
project:
project
,
owner:
developer_1
)
}
before
do
before
do
project
.
add_master
(
user
)
project
.
add_developer
(
developer_1
)
end
sign_in
(
user
)
context
'when the developer updates'
do
let
(
:action
)
do
proc
do
|
user
|
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
,
schedule:
{
description:
'updated_desc'
}
end
end
end
it
'loads the pipeline schedule'
do
specify
{
expect
(
action
).
to
be_allowed_for
(
developer_1
)
}
get
:edit
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
.
i
d
en
d
expect
(
response
).
to
have_http_status
(
:ok
)
context
'when another developer updates'
do
expect
(
assigns
(
:schedule
)).
to
eq
(
pipeline_schedule
)
let
(
:action
)
do
proc
do
|
user
|
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
,
schedule:
{
description:
'updated_desc'
}
end
end
end
end
context
'when a developer created a pipeline schedule'
do
specify
{
expect
(
action
).
to
be_denied_for
(
:developer
).
of
(
project
)
}
context
'when the developer edits'
do
end
it
'can edit variables'
do
# TODO:
context
'when a master updates'
do
let
(
:action
)
do
proc
do
|
user
|
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
,
schedule:
{
description:
'updated_desc'
}
end
end
end
end
context
'when other developers edit'
do
specify
{
expect
(
action
).
to
be_allowed_for
(
:master
).
of
(
project
)
}
it
'can not edit variables'
do
end
# TODO:
end
end
context
'when a master created a pipeline schedule'
do
let
(
:master_1
)
{
create
(
:user
)
}
let!
(
:pipeline_schedule
)
{
create
(
:ci_pipeline_schedule
,
project:
project
,
owner:
master_1
)
}
before
do
project
.
add_master
(
master_1
)
end
end
context
'when a master edits'
do
context
'when the master updates'
do
it
'can edit variables'
do
let
(
:action
)
do
# TODO:
proc
do
|
user
|
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
,
schedule:
{
description:
'updated_desc'
}
end
end
end
end
specify
{
expect
(
action
).
to
be_allowed_for
(
master_1
)
}
end
end
context
'when a master created a pipeline schedule'
do
context
'when other masters updates'
do
context
'when the master edits'
do
let
(
:action
)
do
it
'can edit variables'
do
proc
do
|
user
|
# TODO:
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
,
schedule:
{
description:
'updated_desc'
}
end
end
end
specify
{
expect
(
action
).
to
be_allowed_for
(
:master
).
of
(
project
)
}
end
end
context
'when other masters edit'
do
context
'when a developer updates'
do
it
'can edit variables'
do
let
(
:action
)
do
# TODO:
proc
do
|
user
|
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
,
schedule:
{
description:
'updated_desc'
}
end
end
end
end
context
'when developers edit'
do
specify
{
expect
(
action
).
to
be_denied_for
(
:developer
).
of
(
project
)
}
it
'can not edit variables'
do
# TODO:
end
end
end
end
end
end
end
end
describe
'GET edit'
do
let
(
:user
)
{
create
(
:user
)
}
before
do
project
.
add_master
(
user
)
sign_in
(
user
)
end
it
'loads the pipeline schedule'
do
get
:edit
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
.
id
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
assigns
(
:schedule
)).
to
eq
(
pipeline_schedule
)
end
end
describe
'DELETE #destroy'
do
describe
'DELETE #destroy'
do
set
(
:user
)
{
create
(
:user
)
}
set
(
:user
)
{
create
(
:user
)
}
...
...
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