Skip to content
Snippets Groups Projects
Commit d81400b5 authored by Jarka Kadlecova's avatar Jarka Kadlecova Committed by GitLab Release Tools Bot
Browse files

Prevent users with admin_group_member custom ab. to manage custom roles

Merge branch 'security-fix-cr-edit-17-2' into '17-2-stable-ee'

See merge request gitlab-org/security/gitlab!4426

Changelog: security
parent af196fe5
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -544,10 +544,6 @@ module GroupPolicy
enable :admin_member_role
end
 
rule { custom_roles_allowed & can?(:admin_group_member) }.policy do
enable :admin_member_role
end
rule { custom_role_enables_admin_cicd_variables }.policy do
enable :admin_cicd_variables
end
Loading
Loading
Loading
Loading
@@ -3582,7 +3582,7 @@ def create_member_role(member, abilities = member_role_abilities)
 
context 'for a member role with admin_group_member true' do
let(:member_role_abilities) { { admin_group_member: true } }
let(:allowed_abilities) { [:admin_group_member, :admin_member_role] }
let(:allowed_abilities) { [:admin_group_member] }
 
it_behaves_like 'custom roles abilities'
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment