opendev/gerrit
Code Issues Proposed changes

Return 400 Bad Request on ignore of own change

Browse Source 
Users cannot ignore own changes. When a user tries to ignore an own
change the request succeeded with 200 OK, but then the change was still
not ignored. This behavior was confusing and it's better to return a
proper response code that indicates that ignoring the change was not
possible.

Change-Id: Ief8f6e429f119bb9504bdfa9ee41944e01a9ecf8
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2017-09-18 14:23:52 +02:00
parent c8cfdb0855
commit 15e327deda
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -3464,8 +3464,10 @@ public class ChangeIT extends AbstractDaemonTest {
@Test
public void cannotIgnoreOwnChange() throws Exception {
String changeId = createChange().getChangeId();
exception.expect(BadRequestException.class);
exception.expectMessage("cannot ignore own change");
gApi.changes().id(changeId).ignore(true);
assertThat(gApi.changes().id(changeId).ignored()).isFalse();
}
@Test

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

@@ -14,6 +14,7 @@
package com.google.gerrit.server.change;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestApiException;
@@ -52,8 +53,11 @@ public class Ignore
@Override
public Response<String> apply(ChangeResource rsrc, Input input) throws RestApiException {
try {
// Don't try to ignore own changes or already ignored changes
if (canIgnore(rsrc)) {
if (rsrc.isUserOwner()) {
throw new BadRequestException("cannot ignore own change");
}
if (!isIgnored(rsrc)) {
stars.ignore(rsrc);
}
return Response.ok("");