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
1e09a677
Commit
1e09a677
authored
Jun 04, 2020
by
Tetiana Chupryna
Committed by
Igor Drozdov
Jun 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add policy for auto_fix
Only Maintainer can modify it. Expose it with Configuration json
parent
81d437ab
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
4 deletions
+24
-4
ee/app/controllers/projects/security/configuration_controller.rb
...controllers/projects/security/configuration_controller.rb
+7
-1
ee/app/policies/ee/project_policy.rb
ee/app/policies/ee/project_policy.rb
+3
-0
ee/app/presenters/projects/security/configuration_presenter.rb
...p/presenters/projects/security/configuration_presenter.rb
+1
-1
ee/changelogs/unreleased/215668-policy-for-auto-fix.yml
ee/changelogs/unreleased/215668-policy-for-auto-fix.yml
+5
-0
ee/spec/policies/project_policy_spec.rb
ee/spec/policies/project_policy_spec.rb
+3
-1
ee/spec/presenters/projects/security/configuration_presenter_spec.rb
...senters/projects/security/configuration_presenter_spec.rb
+5
-1
No files found.
ee/app/controllers/projects/security/configuration_controller.rb
View file @
1e09a677
...
...
@@ -12,7 +12,13 @@ module Projects
end
def
show
@configuration
=
ConfigurationPresenter
.
new
(
project
)
@configuration
=
ConfigurationPresenter
.
new
(
project
,
auto_fix_permission:
auto_fix_permission
)
end
private
def
auto_fix_permission
can?
(
current_user
,
:modify_auto_fix_setting
,
project
)
end
end
end
...
...
ee/app/policies/ee/project_policy.rb
View file @
1e09a677
...
...
@@ -279,6 +279,7 @@ module EE
enable
:admin_feature_flags_client
enable
:modify_approvers_rules
enable
:modify_approvers_list
enable
:modify_auto_fix_setting
enable
:modify_merge_request_author_setting
enable
:modify_merge_request_committer_setting
end
...
...
@@ -331,6 +332,8 @@ module EE
rule
{
~
admin
&
owner
&
owner_cannot_destroy_project
}.
prevent
:remove_project
rule
{
archived
}.
policy
do
prevent
:modify_auto_fix_setting
READONLY_FEATURES_WHEN_ARCHIVED
.
each
do
|
feature
|
prevent
(
*::
ProjectPolicy
.
create_update_admin_destroy
(
feature
))
end
...
...
ee/app/presenters/projects/security/configuration_presenter.rb
View file @
1e09a677
...
...
@@ -52,7 +52,7 @@ module Projects
dependency_scanning:
true
,
container_scanning:
true
}.
to_json
,
can_toggle_auto_fix_settings:
true
,
# To be replaced with the real value in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/32783
can_toggle_auto_fix_settings:
auto_fix_permission
,
auto_fix_user_path:
'/'
# TODO: real link will be updated with https://gitlab.com/gitlab-org/gitlab/-/issues/215669
}
end
...
...
ee/changelogs/unreleased/215668-policy-for-auto-fix.yml
0 → 100644
View file @
1e09a677
---
title
:
Add policy for auto_fix
merge_request
:
32783
author
:
type
:
added
ee/spec/policies/project_policy_spec.rb
View file @
1e09a677
...
...
@@ -41,7 +41,9 @@ describe ProjectPolicy do
admin_vulnerability_issue_link read_merge_train
]
end
let
(
:additional_maintainer_permissions
)
{
%i[push_code_to_protected_branches admin_feature_flags_client]
}
let
(
:additional_maintainer_permissions
)
do
%i[push_code_to_protected_branches admin_feature_flags_client modify_auto_fix_setting]
end
let
(
:auditor_permissions
)
do
%i[
download_code download_wiki_code read_project read_board read_list
...
...
ee/spec/presenters/projects/security/configuration_presenter_spec.rb
View file @
1e09a677
...
...
@@ -14,7 +14,7 @@ describe Projects::Security::ConfigurationPresenter do
end
describe
'#to_h'
do
subject
{
described_class
.
new
(
project
).
to_h
}
subject
{
described_class
.
new
(
project
,
auto_fix_permission:
true
).
to_h
}
it
'includes links to auto devops and secure product docs'
do
expect
(
subject
[
:auto_devops_help_page_path
]).
to
eq
(
help_page_path
(
'topics/autodevops/index'
))
...
...
@@ -36,6 +36,10 @@ describe Projects::Security::ConfigurationPresenter do
expect
(
subject
[
:auto_devops_enabled
]).
to
be_truthy
end
it
'reports auto_fix permissions'
do
expect
(
subject
[
:can_toggle_auto_fix_settings
]).
to
be_truthy
end
it
'reports that all security jobs are configured'
do
expect
(
Gitlab
::
Json
.
parse
(
subject
[
:features
])).
to
contain_exactly
(
security_scan
(
:dast
,
configured:
true
),
...
...
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