opendev/gerrit
Code Issues Proposed changes

Merge "Add a server config to disable "move change" endpoint"

Browse Source
This commit is contained in:
xchangcheng 2018-10-25 08:36:51 +00:00 committed by Gerrit Code Review
commit c1976d6547
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/com/google/gerrit/server/restapi/change/Move.java
View File

@ -27,6 +27,7 @@ import com.google.gerrit.extensions.api.changes.MoveInput;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.webui.UiAction;
@ -47,6 +48,7 @@ import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.change.ChangeJson;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.permissions.PermissionBackend;
@ -68,6 +70,7 @@ import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@ -87,6 +90,7 @@ public class Move extends RetryingRestModifyView<ChangeResource, MoveInput, Chan
private final PatchSetUtil psUtil;
private final ApprovalsUtil approvalsUtil;
private final ProjectCache projectCache;
private final boolean moveEnabled;
@Inject
Move(
@ -99,7 +103,8 @@ public class Move extends RetryingRestModifyView<ChangeResource, MoveInput, Chan
RetryHelper retryHelper,
PatchSetUtil psUtil,
ApprovalsUtil approvalsUtil,
ProjectCache projectCache) {
ProjectCache projectCache,
@GerritServerConfig Config gerritConfig) {
super(retryHelper);
this.permissionBackend = permissionBackend;
this.dbProvider = dbProvider;
@ -110,6 +115,7 @@ public class Move extends RetryingRestModifyView<ChangeResource, MoveInput, Chan
this.psUtil = psUtil;
this.approvalsUtil = approvalsUtil;
this.projectCache = projectCache;
this.moveEnabled = gerritConfig.getBoolean("change", null, "move", true);
}
@Override
@ -117,6 +123,12 @@ public class Move extends RetryingRestModifyView<ChangeResource, MoveInput, Chan
BatchUpdate.Factory updateFactory, ChangeResource rsrc, MoveInput input)
throws RestApiException, OrmException, UpdateException, PermissionBackendException,
IOException {
if (!moveEnabled) {
// This will be removed with the above config once we reach consensus for the move change
// behavior. See: https://bugs.chromium.org/p/gerrit/issues/detail?id=9877
throw new MethodNotAllowedException("move changes endpoint is disabled");
}
Change change = rsrc.getChange();
Project.NameKey project = rsrc.getProject();
IdentifiedUser caller = rsrc.getUser().asIdentifiedUser();

12
javatests/com/google/gerrit/acceptance/rest/change/MoveChangeIT.java
View File

@ -19,6 +19,7 @@ import static com.google.gerrit.acceptance.GitUtil.pushHead;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.GitUtil;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
@ -30,6 +31,7 @@ import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.projects.BranchInput;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.AccountGroup;
@ -332,6 +334,16 @@ public class MoveChangeIT extends AbstractDaemonTest {
move(r.getChangeId(), null);
}
@Test
@GerritConfig(name = "change.move", value = "false")
public void moveCanBeDisabledByConfig() throws Exception {
PushOneCommit.Result r = createChange();
exception.expect(MethodNotAllowedException.class);
exception.expectMessage("move changes endpoint is disabled");
move(r.getChangeId(), null);
}
private void move(int changeNum, String destination) throws RestApiException {
gApi.changes().id(changeNum).move(destination);
}