opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15

Browse Source 
* stable-2.14:
  Update git submodules
  IndexChangeIT: Test index of change after its owner loses access
  ChangeData: Prevent false 'Merge Conflict' for user's open review
  Don't treat MergeIdenticalTreeException as internal server error
  Update git submodules
  Update git submodules

Change-Id: Ibd6f3a1da32388725fd9ccc330c17b03374752f2
This commit is contained in:
David Pursehouse 2018-02-25 09:16:00 +09:00
commit 681e48bc46
2 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/IndexChangeIT.java
View File

@ -14,7 +14,21 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.project.Util;
import java.util.List;
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
import org.eclipse.jgit.junit.TestRepository;
import org.junit.Test;
public class IndexChangeIT extends AbstractDaemonTest {
@ -30,4 +44,62 @@ public class IndexChangeIT extends AbstractDaemonTest {
blockRead("refs/heads/master");
userRestSession.post("/changes/" + changeId + "/index/").assertNotFound();
}
@Test
public void indexChangeAfterOwnerLosesVisibility() throws Exception {
// Create a test group with 2 users as members
TestAccount user2 = accountCreator.user2();
String group = createGroup("test");
gApi.groups().id(group).addMembers("admin", "user", user2.username);
// Create a project and restrict its visibility to the group
Project.NameKey p = createProject("p");
ProjectConfig cfg = projectCache.checkedGet(p).getConfig();
Util.allow(
cfg,
Permission.READ,
groupCache.get(new AccountGroup.NameKey(group)).get().getGroupUUID(),
"refs/*");
Util.block(cfg, Permission.READ, REGISTERED_USERS, "refs/*");
saveProjectConfig(p, cfg);
// Clone it and push a change as a regular user
TestRepository<InMemoryRepository> repo = cloneProject(p, user);
PushOneCommit push = pushFactory.create(db, user.getIdent(), repo);
PushOneCommit.Result result = push.to("refs/for/master");
result.assertOkStatus();
assertThat(result.getChange().change().getOwner()).isEqualTo(user.id);
String changeId = result.getChangeId();
// User can see the change and it is mergeable
setApiUser(user);
List<ChangeInfo> changes = gApi.changes().query(changeId).get();
assertThat(changes).hasSize(1);
assertThat(changes.get(0).mergeable).isNotNull();
// Other user can see the change and it is mergeable
setApiUser(user2);
changes = gApi.changes().query(changeId).get();
assertThat(changes).hasSize(1);
assertThat(changes.get(0).mergeable).isTrue();
// Remove the user from the group so they can no longer see the project
setApiUser(admin);
gApi.groups().id(group).removeMembers("user");
// User can no longer see the change
setApiUser(user);
changes = gApi.changes().query(changeId).get();
assertThat(changes).isEmpty();
// Reindex the change
setApiUser(admin);
gApi.changes().id(changeId).index();
// Other user can still see the change and it is still mergeable
setApiUser(user2);
changes = gApi.changes().query(changeId).get();
assertThat(changes).hasSize(1);
assertThat(changes.get(0).mergeable).isTrue();
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeIdenticalTreeException.java
View File

@ -14,13 +14,13 @@
package com.google.gerrit.server.git;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
/**
* Indicates that the commit is already contained in destination branch. Either the commit itself is
* in the source tree, or the content is merged
*/
public class MergeIdenticalTreeException extends RestApiException {
public class MergeIdenticalTreeException extends ResourceConflictException {
private static final long serialVersionUID = 1L;
/** @param msg message to return to the client describing the error. */