Extend ProtectDefaultBranchService to support security policy project
What does this MR do?
Addresses #335661 (closed) and based on !65830 (comment 630697095)
As a part of &5362 (closed), a GraphQL mutation was introduced to create security policy project for a given project. The newly created project should have the default branch protected and it should override the default branch protection configured for the group and only maintainers
should have access to merge and no one having access to push to the default branch. But there was a bug in creating protected branch. The bug due to race-condition in creating protected branch for security policy project was because there were 2 independent write paths. But the fix to the race-condition as implemented in !65830 (closed) had performance problems because of transaction.
This MR checks if the project is a security policy project when the protected branch rule is created for default branch. For security policy project, the merge and push access levels are set to MAINTAINER
and NO_ACCESS
respectively. This removes the need to create another protected branch in Security::SecurityOrchestrationPolicies::ProjectCreateService
!66448 (merged) removes the part that creates protected branch in Security::SecurityOrchestrationPolicies::ProjectCreateService
Screenshots or Screencasts (strongly suggested)
Does this MR meet the acceptance criteria?
Conformity
-
I have included changelog trailers, or none are needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides. -
This change is backwards compatible across updates, or this does not apply.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec
-
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team