opendev/gerrit
Code Issues Proposed changes

Merge "Clarify error message about FORGE_SERVER permission."

Browse Source
This commit is contained in:
Edwin Kempin
2017-08-14 08:53:28 +00:00
committed by Gerrit Code Review
parent fa428452c4 7718c5e164
commit ce254ddbf6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -610,9 +610,15 @@ public class CommitValidators {
&& author.getName().equals(gerritIdent.getName()) && author.getName().equals(gerritIdent.getName())
&& author.getEmailAddress().equals(gerritIdent.getEmailAddress())) { && author.getEmailAddress().equals(gerritIdent.getEmailAddress())) {
try { try {
// Stop authors from amending the merge commits that Gerrit itself creates.
perm.check(RefPermission.FORGE_SERVER); perm.check(RefPermission.FORGE_SERVER);
} catch (AuthException denied) { } catch (AuthException denied) {
throw new CommitValidationException("do not amend merges not made by you"); throw new CommitValidationException(
String.format(
"pushing merge commit %s by %s requires '%s' permission",
receiveEvent.commit.getId(),
gerritIdent.getEmailAddress(),
RefPermission.FORGE_SERVER.name()));
} catch (PermissionBackendException e) { } catch (PermissionBackendException e) {
log.error("cannot check FORGE_SERVER", e); log.error("cannot check FORGE_SERVER", e);
throw new CommitValidationException("internal auth error"); throw new CommitValidationException("internal auth error");