Merge "Fix: Permission.PUSH_MERGE checking for push bypassing Gerrit"

Documentation/access-control.txt

@@ -609,12 +609,11 @@ push to happen.  Some projects wish to restrict merges to being created
 by Gerrit. By granting `Push` without `Push Merge Commit`, the only
 merges that enter the system will be those created by Gerrit.
 
-The reference name connected to a `Push Merge Commit` entry must always
+For pushing a merge commit for review, the reference name connected to
-be prefixed with `refs/for/`, for example `refs/for/refs/heads/BRANCH`.
+a `Push Merge Commit` entry must be prefixed with `refs/for/`,
-This applies even for an entry that complements a `Push` entry for
+for example `refs/for/refs/heads/BRANCH`. For pushing a merge commit
-`refs/heads/BRANCH` that allows direct pushes of non-merge commits, and
+directly into the repository bypassing review, the reference name
-the intention of the `Push Merge Commit` entry is to allow direct pushes
+must be `refs/heads/BRANCH`.
-of merge commits.
 
 
 [[category_push_annotated]]

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

@@ -1986,7 +1986,8 @@ public class ReceiveCommits {
     if (ctl.canForgeAuthor()
         && ctl.canForgeCommitter()
         && ctl.canForgeGerritServerIdentity()
-        && ctl.canUploadMerges()
+        && (MagicBranch.isForReview(cmd.getRefName()) ? ctl.canUploadMerges()
+            : ctl.canPushMerges())
         && !projectControl.getProjectState().isUseSignedOffBy()
         && Iterables.isEmpty(rejectCommits)
         && !GitRepositoryManager.REF_CONFIG.equals(ctl.getRefName())

gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java

@@ -355,11 +355,21 @@ public class CommitValidators {
     @Override
     public List<CommitValidationMessage> onCommitReceived(
         CommitReceivedEvent receiveEvent) throws CommitValidationException {
-      if (receiveEvent.commit.getParentCount() > 1
+      if (receiveEvent.commit.getParentCount() > 1) {
-          && !refControl.canUploadMerges()) {
+        if (MagicBranch.isForReview(receiveEvent.command.getRefName())) {
-        throw new CommitValidationException("you are not allowed to upload merges");
+          if (!refControl.canUploadMerges()) {
+            throw new CommitValidationException(
+                "you are not allowed to upload merges for review");
           }
-      return Collections.<CommitValidationMessage>emptyList();
+        } else {
+          if (!refControl.canPushMerges()) {
+            throw new CommitValidationException(
+                "you are not allowed to push merges directly bypassing code review");
+          }
+        }
+      }
+
+      return Collections.<CommitValidationMessage> emptyList();
     }
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java

@@ -147,7 +147,17 @@ public class RefControl {
         && canWrite();
   }
 
-  /** @return true if this user can submit merge patch sets to this ref */
+  /**
+   * @return true if this user can push merge commits directly bypassing code
+   *         review to this ref.
+   */
+  public boolean canPushMerges() {
+    return projectControl.controlForRef(getRefName()).canPerform(
+        Permission.PUSH_MERGE)
+        && canWrite();
+  }
+
+  /** @return true if this user can upload merge commits to this ref for review */
   public boolean canUploadMerges() {
     return projectControl.controlForRef("refs/for/" + getRefName())
         .canPerform(Permission.PUSH_MERGE)

gerrit-server/src/main/java/com/google/gerrit/server/util/MagicBranch.java

@@ -51,6 +51,11 @@ public final class MagicBranch {
         || refName.startsWith(NEW_CHANGE);
   }
 
+  /** Checks if the supplied ref name is a magic branch for review */
+  public static boolean isForReview(String refName) {
+    return isMagicBranch(refName);
+  }
+
   /** Returns the ref name prefix for a magic branch, <code>null</code> if the branch is not magic */
   public static String getMagicRefNamePrefix(String refName) {
     if (refName.startsWith(NEW_DRAFT_CHANGE)) {