opendev/gerrit
Code Issues Proposed changes

Fix logic for revert permissions

Browse Source 
Revert creates a new change with a merged change's patch set.
Therefore it's OK to revert so long as the user can add a patch set
to this change's branch. Use the destination branch RefControl
instead of the ChangeControl to get that check.

Change-Id: I319914caf4a9ff631079a5ca7dee09b02bb827ed
This commit is contained in:
Nasser Grainawi
2015-11-09 10:51:07 -08:00
parent abd3d1e2d6
commit c767f0a26a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
View File

@@ -29,8 +29,8 @@ import com.google.gerrit.reviewdb.client.Change.Status;
import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.git.UpdateException; import com.google.gerrit.server.git.UpdateException;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.NoSuchChangeException;
import com.google.gerrit.server.project.RefControl;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
@@ -59,9 +59,9 @@ public class Revert implements RestModifyView<ChangeResource, RevertInput>,
public ChangeInfo apply(ChangeResource req, RevertInput input) public ChangeInfo apply(ChangeResource req, RevertInput input)
throws IOException, OrmException, RestApiException, throws IOException, OrmException, RestApiException,
UpdateException { UpdateException {
ChangeControl control = req.getControl(); RefControl refControl = req.getControl().getRefControl();
Change change = req.getChange(); Change change = req.getChange();
if (!control.canAddPatchSet()) { if (!refControl.canUpload()) {
throw new AuthException("revert not permitted"); throw new AuthException("revert not permitted");
} else if (change.getStatus() != Status.MERGED) { } else if (change.getStatus() != Status.MERGED) {
throw new ResourceConflictException("change is " + status(change)); throw new ResourceConflictException("change is " + status(change));
@@ -69,7 +69,7 @@ public class Revert implements RestModifyView<ChangeResource, RevertInput>,
Change.Id revertedChangeId; Change.Id revertedChangeId;
try { try {
revertedChangeId = changeUtil.revert(control, revertedChangeId = changeUtil.revert(req.getControl(),
change.currentPatchSetId(), change.currentPatchSetId(),
Strings.emptyToNull(input.message), Strings.emptyToNull(input.message),
new PersonIdent(myIdent, TimeUtil.nowTs())); new PersonIdent(myIdent, TimeUtil.nowTs()));