At the moment the Git history of a user branch is not very useful since it always reads as "Create account", "Update account", "Update account", "Update account" etc. Make the commit messages more specific to the actual update. For this callers of AccountsUpdate are now required to provide a commit message for account creations and account updates. Having specific commit message also makes debugging easier. E.g. if there is bad account update it is easier to identify the code that was doing it. Change-Id: Ifca4479d1c61b4231c1d78d0eecb4a77a01a464a Signed-off-by: Edwin Kempin <ekempin@google.com>
574 lines
19 KiB
Java
574 lines
19 KiB
Java
// Copyright (C) 2017 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package com.google.gerrit.server.query.group;
|
|
|
|
import static com.google.common.truth.Truth.assertThat;
|
|
import static java.util.stream.Collectors.toList;
|
|
import static org.junit.Assert.fail;
|
|
|
|
import com.google.common.base.CharMatcher;
|
|
import com.google.gerrit.extensions.api.GerritApi;
|
|
import com.google.gerrit.extensions.api.accounts.AccountInput;
|
|
import com.google.gerrit.extensions.api.groups.GroupInput;
|
|
import com.google.gerrit.extensions.api.groups.Groups.QueryRequest;
|
|
import com.google.gerrit.extensions.common.AccountInfo;
|
|
import com.google.gerrit.extensions.common.GroupInfo;
|
|
import com.google.gerrit.extensions.restapi.BadRequestException;
|
|
import com.google.gerrit.index.FieldDef;
|
|
import com.google.gerrit.index.IndexConfig;
|
|
import com.google.gerrit.index.QueryOptions;
|
|
import com.google.gerrit.index.Schema;
|
|
import com.google.gerrit.index.query.FieldBundle;
|
|
import com.google.gerrit.lifecycle.LifecycleManager;
|
|
import com.google.gerrit.reviewdb.client.Account;
|
|
import com.google.gerrit.reviewdb.client.AccountGroup;
|
|
import com.google.gerrit.reviewdb.server.ReviewDb;
|
|
import com.google.gerrit.server.AnonymousUser;
|
|
import com.google.gerrit.server.CurrentUser;
|
|
import com.google.gerrit.server.IdentifiedUser;
|
|
import com.google.gerrit.server.account.AccountCache;
|
|
import com.google.gerrit.server.account.AccountManager;
|
|
import com.google.gerrit.server.account.Accounts;
|
|
import com.google.gerrit.server.account.AccountsUpdate;
|
|
import com.google.gerrit.server.account.AuthRequest;
|
|
import com.google.gerrit.server.account.GroupCache;
|
|
import com.google.gerrit.server.config.AllProjectsName;
|
|
import com.google.gerrit.server.group.InternalGroup;
|
|
import com.google.gerrit.server.group.ServerInitiated;
|
|
import com.google.gerrit.server.group.db.GroupsUpdate;
|
|
import com.google.gerrit.server.group.db.InternalGroupUpdate;
|
|
import com.google.gerrit.server.index.group.GroupField;
|
|
import com.google.gerrit.server.index.group.GroupIndexCollection;
|
|
import com.google.gerrit.server.schema.SchemaCreator;
|
|
import com.google.gerrit.server.util.ManualRequestContext;
|
|
import com.google.gerrit.server.util.OneOffRequestContext;
|
|
import com.google.gerrit.server.util.RequestContext;
|
|
import com.google.gerrit.server.util.ThreadLocalRequestContext;
|
|
import com.google.gerrit.testing.GerritServerTests;
|
|
import com.google.gerrit.testing.InMemoryDatabase;
|
|
import com.google.inject.Inject;
|
|
import com.google.inject.Injector;
|
|
import com.google.inject.Provider;
|
|
import com.google.inject.util.Providers;
|
|
import java.util.Arrays;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Optional;
|
|
import org.junit.After;
|
|
import org.junit.Before;
|
|
import org.junit.Ignore;
|
|
import org.junit.Test;
|
|
|
|
@Ignore
|
|
public abstract class AbstractQueryGroupsTest extends GerritServerTests {
|
|
@Inject protected Accounts accounts;
|
|
|
|
@Inject protected AccountsUpdate.Server accountsUpdate;
|
|
|
|
@Inject protected AccountCache accountCache;
|
|
|
|
@Inject protected AccountManager accountManager;
|
|
|
|
@Inject protected GerritApi gApi;
|
|
|
|
@Inject protected IdentifiedUser.GenericFactory userFactory;
|
|
|
|
@Inject private Provider<AnonymousUser> anonymousUser;
|
|
|
|
@Inject protected InMemoryDatabase schemaFactory;
|
|
|
|
@Inject protected SchemaCreator schemaCreator;
|
|
|
|
@Inject protected ThreadLocalRequestContext requestContext;
|
|
|
|
@Inject protected OneOffRequestContext oneOffRequestContext;
|
|
|
|
@Inject protected AllProjectsName allProjects;
|
|
|
|
@Inject protected GroupCache groupCache;
|
|
|
|
@Inject @ServerInitiated protected Provider<GroupsUpdate> groupsUpdateProvider;
|
|
|
|
@Inject protected GroupIndexCollection indexes;
|
|
|
|
protected LifecycleManager lifecycle;
|
|
protected Injector injector;
|
|
protected ReviewDb db;
|
|
protected AccountInfo currentUserInfo;
|
|
protected CurrentUser user;
|
|
|
|
protected abstract Injector createInjector();
|
|
|
|
@Before
|
|
public void setUpInjector() throws Exception {
|
|
lifecycle = new LifecycleManager();
|
|
injector = createInjector();
|
|
lifecycle.add(injector);
|
|
injector.injectMembers(this);
|
|
lifecycle.start();
|
|
setUpDatabase();
|
|
}
|
|
|
|
@After
|
|
public void cleanUp() {
|
|
lifecycle.stop();
|
|
db.close();
|
|
}
|
|
|
|
protected void setUpDatabase() throws Exception {
|
|
db = schemaFactory.open();
|
|
schemaCreator.create(db);
|
|
|
|
Account.Id userId =
|
|
createAccountOutsideRequestContext("user", "User", "user@example.com", true);
|
|
user = userFactory.create(userId);
|
|
requestContext.setContext(newRequestContext(userId));
|
|
currentUserInfo = gApi.accounts().id(userId.get()).get();
|
|
}
|
|
|
|
protected RequestContext newRequestContext(Account.Id requestUserId) {
|
|
final CurrentUser requestUser = userFactory.create(requestUserId);
|
|
return new RequestContext() {
|
|
@Override
|
|
public CurrentUser getUser() {
|
|
return requestUser;
|
|
}
|
|
|
|
@Override
|
|
public Provider<ReviewDb> getReviewDbProvider() {
|
|
return Providers.of(db);
|
|
}
|
|
};
|
|
}
|
|
|
|
protected void setAnonymous() {
|
|
requestContext.setContext(
|
|
new RequestContext() {
|
|
@Override
|
|
public CurrentUser getUser() {
|
|
return anonymousUser.get();
|
|
}
|
|
|
|
@Override
|
|
public Provider<ReviewDb> getReviewDbProvider() {
|
|
return Providers.of(db);
|
|
}
|
|
});
|
|
}
|
|
|
|
@After
|
|
public void tearDownInjector() {
|
|
if (lifecycle != null) {
|
|
lifecycle.stop();
|
|
}
|
|
if (requestContext != null) {
|
|
requestContext.setContext(null);
|
|
}
|
|
if (db != null) {
|
|
db.close();
|
|
}
|
|
InMemoryDatabase.drop(schemaFactory);
|
|
}
|
|
|
|
@Test
|
|
public void byUuid() throws Exception {
|
|
assertQuery("uuid:6d70856bc40ded50f2585c4c0f7e179f3544a272");
|
|
assertQuery("uuid:non-existing");
|
|
|
|
GroupInfo group = createGroup(name("group"));
|
|
assertQuery("uuid:" + group.id, group);
|
|
|
|
GroupInfo admins = gApi.groups().id("Administrators").get();
|
|
assertQuery("uuid:" + admins.id, admins);
|
|
}
|
|
|
|
@Test
|
|
public void byName() throws Exception {
|
|
assertQuery("name:non-existing");
|
|
|
|
GroupInfo group = createGroup(name("Group"));
|
|
assertQuery("name:" + group.name, group);
|
|
assertQuery("name:" + group.name.toLowerCase(Locale.US));
|
|
|
|
// only exact match
|
|
GroupInfo groupWithHyphen = createGroup(name("group-with-hyphen"));
|
|
createGroup(name("group-no-match-with-hyphen"));
|
|
assertQuery("name:" + groupWithHyphen.name, groupWithHyphen);
|
|
}
|
|
|
|
@Test
|
|
public void byInname() throws Exception {
|
|
String namePart = getSanitizedMethodName();
|
|
namePart = CharMatcher.is('_').removeFrom(namePart);
|
|
|
|
GroupInfo group1 = createGroup("group-" + namePart);
|
|
GroupInfo group2 = createGroup("group-" + namePart + "-2");
|
|
GroupInfo group3 = createGroup("group-" + namePart + "3");
|
|
assertQuery("inname:" + namePart, group1, group2, group3);
|
|
assertQuery("inname:" + namePart.toUpperCase(Locale.US), group1, group2, group3);
|
|
assertQuery("inname:" + namePart.toLowerCase(Locale.US), group1, group2, group3);
|
|
}
|
|
|
|
@Test
|
|
public void byDescription() throws Exception {
|
|
GroupInfo group1 = createGroupWithDescription(name("group1"), "This is a test group.");
|
|
GroupInfo group2 = createGroupWithDescription(name("group2"), "ANOTHER TEST GROUP.");
|
|
createGroupWithDescription(name("group3"), "Maintainers of project foo.");
|
|
assertQuery("description:test", group1, group2);
|
|
|
|
assertQuery("description:non-existing");
|
|
|
|
exception.expect(BadRequestException.class);
|
|
exception.expectMessage("description operator requires a value");
|
|
assertQuery("description:\"\"");
|
|
}
|
|
|
|
@Test
|
|
public void byOwner() throws Exception {
|
|
GroupInfo ownerGroup = createGroup(name("owner-group"));
|
|
GroupInfo group = createGroupWithOwner(name("group"), ownerGroup);
|
|
createGroup(name("group2"));
|
|
|
|
assertQuery("owner:" + group.id);
|
|
|
|
// ownerGroup owns itself
|
|
assertQuery("owner:" + ownerGroup.id, group, ownerGroup);
|
|
assertQuery("owner:" + ownerGroup.name, group, ownerGroup);
|
|
}
|
|
|
|
@Test
|
|
public void byIsVisibleToAll() throws Exception {
|
|
assertQuery("is:visibletoall");
|
|
|
|
GroupInfo groupThatIsVisibleToAll =
|
|
createGroupThatIsVisibleToAll(name("group-that-is-visible-to-all"));
|
|
createGroup(name("group"));
|
|
|
|
assertQuery("is:visibletoall", groupThatIsVisibleToAll);
|
|
}
|
|
|
|
@Test
|
|
public void byMember() throws Exception {
|
|
if (getSchemaVersion() < 4) {
|
|
assertMissingField(GroupField.MEMBER);
|
|
assertFailingQuery(
|
|
"member:someName", "'member' operator is not supported by group index version");
|
|
return;
|
|
}
|
|
|
|
AccountInfo user1 = createAccount("user1", "User1", "user1@example.com");
|
|
AccountInfo user2 = createAccount("user2", "User2", "user2@example.com");
|
|
|
|
GroupInfo group1 = createGroup(name("group1"), user1);
|
|
GroupInfo group2 = createGroup(name("group2"), user2);
|
|
GroupInfo group3 = createGroup(name("group3"), user1);
|
|
|
|
assertQuery("member:" + user1.name, group1, group3);
|
|
assertQuery("member:" + user1.email, group1, group3);
|
|
|
|
gApi.groups().id(group3.id).removeMembers(user1.username);
|
|
gApi.groups().id(group2.id).addMembers(user1.username);
|
|
|
|
assertQuery("member:" + user1.name, group1, group2);
|
|
}
|
|
|
|
@Test
|
|
public void bySubgroups() throws Exception {
|
|
if (getSchemaVersion() < 4) {
|
|
assertMissingField(GroupField.SUBGROUP);
|
|
assertFailingQuery(
|
|
"subgroup:someGroupName", "'subgroup' operator is not supported by group index version");
|
|
return;
|
|
}
|
|
|
|
GroupInfo superParentGroup = createGroup(name("superParentGroup"));
|
|
GroupInfo parentGroup1 = createGroup(name("parentGroup1"));
|
|
GroupInfo parentGroup2 = createGroup(name("parentGroup2"));
|
|
GroupInfo subGroup = createGroup(name("subGroup"));
|
|
|
|
gApi.groups().id(superParentGroup.id).addGroups(parentGroup1.id, parentGroup2.id);
|
|
gApi.groups().id(parentGroup1.id).addGroups(subGroup.id);
|
|
gApi.groups().id(parentGroup2.id).addGroups(subGroup.id);
|
|
|
|
assertQuery("subgroup:" + subGroup.id, parentGroup1, parentGroup2);
|
|
assertQuery("subgroup:" + parentGroup1.id, superParentGroup);
|
|
|
|
gApi.groups().id(superParentGroup.id).addGroups(subGroup.id);
|
|
gApi.groups().id(parentGroup1.id).removeGroups(subGroup.id);
|
|
|
|
assertQuery("subgroup:" + subGroup.id, superParentGroup, parentGroup2);
|
|
}
|
|
|
|
@Test
|
|
public void byDefaultField() throws Exception {
|
|
GroupInfo group1 = createGroup(name("foo-group"));
|
|
GroupInfo group2 = createGroup(name("group2"));
|
|
GroupInfo group3 =
|
|
createGroupWithDescription(
|
|
name("group3"), "decription that contains foo and the UUID of group2: " + group2.id);
|
|
|
|
assertQuery("non-existing");
|
|
assertQuery("foo", group1, group3);
|
|
assertQuery(group2.id, group2, group3);
|
|
}
|
|
|
|
@Test
|
|
public void withLimit() throws Exception {
|
|
GroupInfo group1 = createGroup(name("group1"));
|
|
GroupInfo group2 = createGroup(name("group2"));
|
|
GroupInfo group3 = createGroup(name("group3"));
|
|
|
|
String query = "uuid:" + group1.id + " OR uuid:" + group2.id + " OR uuid:" + group3.id;
|
|
List<GroupInfo> result = assertQuery(query, group1, group2, group3);
|
|
assertThat(result.get(result.size() - 1)._moreGroups).isNull();
|
|
|
|
result = assertQuery(newQuery(query).withLimit(2), result.subList(0, 2));
|
|
assertThat(result.get(result.size() - 1)._moreGroups).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void withStart() throws Exception {
|
|
GroupInfo group1 = createGroup(name("group1"));
|
|
GroupInfo group2 = createGroup(name("group2"));
|
|
GroupInfo group3 = createGroup(name("group3"));
|
|
|
|
String query = "uuid:" + group1.id + " OR uuid:" + group2.id + " OR uuid:" + group3.id;
|
|
List<GroupInfo> result = assertQuery(query, group1, group2, group3);
|
|
|
|
assertQuery(newQuery(query).withStart(1), result.subList(1, 3));
|
|
}
|
|
|
|
@Test
|
|
public void asAnonymous() throws Exception {
|
|
GroupInfo group = createGroup(name("group"));
|
|
|
|
setAnonymous();
|
|
assertQuery("uuid:" + group.id);
|
|
}
|
|
|
|
// reindex permissions are tested by {@link GroupsIT#reindexPermissions}
|
|
@Test
|
|
public void reindex() throws Exception {
|
|
GroupInfo group1 = createGroupWithDescription(name("group"), "barX");
|
|
|
|
// update group in the database so that group index is stale
|
|
String newDescription = "barY";
|
|
AccountGroup.UUID groupUuid = new AccountGroup.UUID(group1.id);
|
|
InternalGroupUpdate groupUpdate =
|
|
InternalGroupUpdate.builder().setDescription(newDescription).build();
|
|
groupsUpdateProvider.get().updateGroupInDb(db, groupUuid, groupUpdate);
|
|
|
|
assertQuery("description:" + group1.description, group1);
|
|
assertQuery("description:" + newDescription);
|
|
|
|
gApi.groups().id(group1.id).index();
|
|
assertQuery("description:" + group1.description);
|
|
assertQuery("description:" + newDescription, group1);
|
|
}
|
|
|
|
@Test
|
|
public void rawDocument() throws Exception {
|
|
GroupInfo group1 = createGroup(name("group1"));
|
|
AccountGroup.UUID uuid = new AccountGroup.UUID(group1.id);
|
|
|
|
Optional<FieldBundle> rawFields =
|
|
indexes
|
|
.getSearchIndex()
|
|
.getRaw(
|
|
uuid,
|
|
QueryOptions.create(
|
|
IndexConfig.createDefault(),
|
|
0,
|
|
10,
|
|
indexes.getSearchIndex().getSchema().getStoredFields().keySet()));
|
|
|
|
assertThat(rawFields.isPresent()).isTrue();
|
|
assertThat(rawFields.get().getValue(GroupField.UUID)).isEqualTo(uuid.get());
|
|
}
|
|
|
|
private Account.Id createAccountOutsideRequestContext(
|
|
String username, String fullName, String email, boolean active) throws Exception {
|
|
try (ManualRequestContext ctx = oneOffRequestContext.open()) {
|
|
Account.Id id = accountManager.authenticate(AuthRequest.forUser(username)).getAccountId();
|
|
if (email != null) {
|
|
accountManager.link(id, AuthRequest.forEmail(email));
|
|
}
|
|
accountsUpdate
|
|
.create()
|
|
.update(
|
|
"Update Test Account",
|
|
id,
|
|
u -> {
|
|
u.setFullName(fullName).setPreferredEmail(email).setActive(active);
|
|
});
|
|
return id;
|
|
}
|
|
}
|
|
|
|
protected AccountInfo createAccount(String username, String fullName, String email)
|
|
throws Exception {
|
|
String uniqueName = name(username);
|
|
AccountInput accountInput = new AccountInput();
|
|
accountInput.username = uniqueName;
|
|
accountInput.name = fullName;
|
|
accountInput.email = email;
|
|
return gApi.accounts().create(accountInput).get();
|
|
}
|
|
|
|
protected GroupInfo createGroup(String name, AccountInfo... members) throws Exception {
|
|
return createGroupWithDescription(name, null, members);
|
|
}
|
|
|
|
protected GroupInfo createGroupWithDescription(
|
|
String name, String description, AccountInfo... members) throws Exception {
|
|
GroupInput in = new GroupInput();
|
|
in.name = name;
|
|
in.description = description;
|
|
in.members =
|
|
Arrays.asList(members).stream().map(a -> String.valueOf(a._accountId)).collect(toList());
|
|
return gApi.groups().create(in).get();
|
|
}
|
|
|
|
protected GroupInfo createGroupWithOwner(String name, GroupInfo ownerGroup) throws Exception {
|
|
GroupInput in = new GroupInput();
|
|
in.name = name;
|
|
in.ownerId = ownerGroup.id;
|
|
return gApi.groups().create(in).get();
|
|
}
|
|
|
|
protected GroupInfo createGroupThatIsVisibleToAll(String name) throws Exception {
|
|
GroupInput in = new GroupInput();
|
|
in.name = name;
|
|
in.visibleToAll = true;
|
|
return gApi.groups().create(in).get();
|
|
}
|
|
|
|
protected GroupInfo getGroup(AccountGroup.UUID uuid) throws Exception {
|
|
return gApi.groups().id(uuid.get()).get();
|
|
}
|
|
|
|
protected List<GroupInfo> assertQuery(Object query, GroupInfo... groups) throws Exception {
|
|
return assertQuery(newQuery(query), groups);
|
|
}
|
|
|
|
protected List<GroupInfo> assertQuery(QueryRequest query, GroupInfo... groups) throws Exception {
|
|
return assertQuery(query, Arrays.asList(groups));
|
|
}
|
|
|
|
protected List<GroupInfo> assertQuery(QueryRequest query, List<GroupInfo> groups)
|
|
throws Exception {
|
|
List<GroupInfo> result = query.get();
|
|
Iterable<String> uuids = uuids(result);
|
|
assertThat(uuids).named(format(query, result, groups)).containsExactlyElementsIn(uuids(groups));
|
|
return result;
|
|
}
|
|
|
|
protected QueryRequest newQuery(Object query) {
|
|
return gApi.groups().query(query.toString());
|
|
}
|
|
|
|
protected String format(
|
|
QueryRequest query, List<GroupInfo> actualGroups, List<GroupInfo> expectedGroups) {
|
|
StringBuilder b = new StringBuilder();
|
|
b.append("query '").append(query.getQuery()).append("' with expected groups ");
|
|
b.append(format(expectedGroups));
|
|
b.append(" and result ");
|
|
b.append(format(actualGroups));
|
|
return b.toString();
|
|
}
|
|
|
|
protected String format(Iterable<GroupInfo> groups) {
|
|
StringBuilder b = new StringBuilder();
|
|
b.append("[");
|
|
Iterator<GroupInfo> it = groups.iterator();
|
|
while (it.hasNext()) {
|
|
GroupInfo g = it.next();
|
|
b.append("{")
|
|
.append(g.id)
|
|
.append(", ")
|
|
.append("name=")
|
|
.append(g.name)
|
|
.append(", ")
|
|
.append("groupId=")
|
|
.append(g.groupId)
|
|
.append(", ")
|
|
.append("url=")
|
|
.append(g.url)
|
|
.append(", ")
|
|
.append("ownerId=")
|
|
.append(g.ownerId)
|
|
.append(", ")
|
|
.append("owner=")
|
|
.append(g.owner)
|
|
.append(", ")
|
|
.append("description=")
|
|
.append(g.description)
|
|
.append(", ")
|
|
.append("visibleToAll=")
|
|
.append(toBoolean(g.options.visibleToAll))
|
|
.append("}");
|
|
if (it.hasNext()) {
|
|
b.append(", ");
|
|
}
|
|
}
|
|
b.append("]");
|
|
return b.toString();
|
|
}
|
|
|
|
protected static boolean toBoolean(Boolean b) {
|
|
return b == null ? false : b;
|
|
}
|
|
|
|
protected static Iterable<String> ids(GroupInfo... groups) {
|
|
return uuids(Arrays.asList(groups));
|
|
}
|
|
|
|
protected static Iterable<String> uuids(List<GroupInfo> groups) {
|
|
return groups.stream().map(g -> g.id).collect(toList());
|
|
}
|
|
|
|
protected String name(String name) {
|
|
if (name == null) {
|
|
return null;
|
|
}
|
|
|
|
return name + "_" + getSanitizedMethodName();
|
|
}
|
|
|
|
protected void assertMissingField(FieldDef<InternalGroup, ?> field) {
|
|
assertThat(getSchema().hasField(field))
|
|
.named("schema %s has field %s", getSchemaVersion(), field.getName())
|
|
.isFalse();
|
|
}
|
|
|
|
protected void assertFailingQuery(String query, String expectedMessage) throws Exception {
|
|
try {
|
|
assertQuery(query);
|
|
fail("expected BadRequestException for query '" + query + "'");
|
|
} catch (BadRequestException e) {
|
|
assertThat(e.getMessage()).isEqualTo(expectedMessage);
|
|
}
|
|
}
|
|
|
|
protected int getSchemaVersion() {
|
|
return getSchema().getVersion();
|
|
}
|
|
|
|
protected Schema<InternalGroup> getSchema() {
|
|
return indexes.getSearchIndex().getSchema();
|
|
}
|
|
}
|