opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'ref-validation-fixes' into stable-2.14

Browse Source 
* changes:
  DeleteRef: Pass project name into validateRefOperation
  Be more consistent about object ids used in ref operation validation
This commit is contained in:
Dave Borowitz
2017-03-24 19:18:26 +00:00
committed by Gerrit Code Review
parent a4e3e01170 17d85f12fd
commit 2a35a2cdd2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/validators/RefOperationValidators.java
View File

@@ -39,7 +39,7 @@ public class RefOperationValidators {
public static ReceiveCommand getCommand(RefUpdate update, ReceiveCommand.Type type) { public static ReceiveCommand getCommand(RefUpdate update, ReceiveCommand.Type type) {
return new ReceiveCommand( return new ReceiveCommand(
update.getOldObjectId(), update.getNewObjectId(), update.getName(), type); update.getExpectedOldObjectId(), update.getNewObjectId(), update.getName(), type);
} }
private final RefReceivedEvent event; private final RefReceivedEvent event;

6
gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java
View File

@@ -115,8 +115,10 @@ public class DeleteRef {
} }
RefUpdate.Result result; RefUpdate.Result result;
RefUpdate u = r.updateRef(ref); RefUpdate u = r.updateRef(ref);
u.setExpectedOldObjectId(r.exactRef(ref).getObjectId());
u.setNewObjectId(ObjectId.zeroId());
u.setForceUpdate(true); u.setForceUpdate(true);
refDeletionValidator.validateRefOperation(ref, identifiedUser.get(), u); refDeletionValidator.validateRefOperation(resource.getName(), identifiedUser.get(), u);
int remainingLockFailureCalls = MAX_LOCK_FAILURE_CALLS; int remainingLockFailureCalls = MAX_LOCK_FAILURE_CALLS;
for (; ; ) { for (; ; ) {
try { try {
@@ -222,6 +224,8 @@ public class DeleteRef {
RefUpdate u = r.updateRef(refName); RefUpdate u = r.updateRef(refName);
u.setForceUpdate(true); u.setForceUpdate(true);
u.setExpectedOldObjectId(r.exactRef(refName).getObjectId());
u.setNewObjectId(ObjectId.zeroId());
refDeletionValidator.validateRefOperation(project.getName(), identifiedUser.get(), u); refDeletionValidator.validateRefOperation(project.getName(), identifiedUser.get(), u);
return command; return command;
} }