opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  ChangeApiImpl: Don't catch bare Exception when getting past assignees
  ChangeApiImpl: Don't catch RestApiException when editing hashtag

Change-Id: I788b52eefd6afb30e7d9691a92eccd09c247b5af
This commit is contained in:
David Pursehouse
2017-03-29 21:27:08 +09:00
parent 7aab0e87a9 811b72685b
commit c40de715e8
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.acceptance.rest.change;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume; import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@@ -25,8 +26,10 @@ import com.google.common.truth.IterableSubject;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.changes.HashtagsInput; import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.common.ChangeMessageInfo; import com.google.gerrit.extensions.common.ChangeMessageInfo;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.testutil.TestTimeUtil; import com.google.gerrit.testutil.TestTimeUtil;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
@@ -244,6 +247,25 @@ public class HashtagsIT extends AbstractDaemonTest {
assertMessage(r, "Hashtag added: MyHashtag"); assertMessage(r, "Hashtag added: MyHashtag");
} }
@Test
public void addHashtagWithoutPermissionNotAllowed() throws Exception {
PushOneCommit.Result r = createChange();
setApiUser(user);
exception.expect(AuthException.class);
exception.expectMessage("Editing hashtags not permitted");
addHashtags(r, "MyHashtag");
}
@Test
public void addHashtagWithPermissionAllowed() throws Exception {
PushOneCommit.Result r = createChange();
grant(Permission.EDIT_HASHTAGS, project, "refs/heads/master", false, REGISTERED_USERS);
setApiUser(user);
addHashtags(r, "MyHashtag");
assertThatGet(r).containsExactly("MyHashtag");
assertMessage(r, "Hashtag added: MyHashtag");
}
private IterableSubject assertThatGet(PushOneCommit.Result r) throws Exception { private IterableSubject assertThatGet(PushOneCommit.Result r) throws Exception {
return assertThat(gApi.changes().id(r.getChange().getId().get()).getHashtags()); return assertThat(gApi.changes().id(r.getChange().getId().get()).getHashtags());
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
View File

@@ -475,7 +475,7 @@ class ChangeApiImpl implements ChangeApi {
public void setHashtags(HashtagsInput input) throws RestApiException { public void setHashtags(HashtagsInput input) throws RestApiException {
try { try {
postHashtags.apply(change, input); postHashtags.apply(change, input);
} catch (RestApiException | UpdateException e) { } catch (UpdateException e) {
throw new RestApiException("Cannot post hashtags", e); throw new RestApiException("Cannot post hashtags", e);
} }
} }
@@ -512,7 +512,7 @@ class ChangeApiImpl implements ChangeApi {
public List<AccountInfo> getPastAssignees() throws RestApiException { public List<AccountInfo> getPastAssignees() throws RestApiException {
try { try {
return getPastAssignees.apply(change).value(); return getPastAssignees.apply(change).value();
} catch (Exception e) { } catch (OrmException e) {
throw new RestApiException("Cannot get past assignees", e); throw new RestApiException("Cannot get past assignees", e);
} }
} }