Merge branch 'stable'
* stable: (30 commits) Clarify the upgrade instructions Draft release notes for 2.1.5 documentation: Document why hook --change-url might be missing documentation: Fix rendering errors in gerrit.config Allow ; and & to seperate parameters in gitweb Include a quick summary of the size of a change in email Display the size of a patch (lines added/removed) Fix clearing of topic during replace Fix inherited Read Access +2 not inheriting Add some basic RefControl tests for delegated ownership Fix branch owner adding exclusive ACL Optimize RegexFilePredicate for common matches Correct copyright headers to AOSP Don't expose /COMMIT_MSG as a modified file in ChangeData Don't enable dk.brics.automaton's optional syntax Fix NPE while matching file:^ pattern on deleted files Fixed unused imports in OutgoingEmail Don't show /COMMIT_MSG in change emails Fix NPE during merge failure on new branch Honor user's syntax coloring preference in unified view ... Conflicts: gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java Change-Id: I80bfdb55872fa4bdf4f751c337b609e7ec809605
This commit is contained in:
Shawn O. Pearce
@@ -0,0 +1,258 @@
|
||||
// Copyright (C) 2010 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.project;
|
||||
|
||||
import static com.google.gerrit.reviewdb.ApprovalCategory.OWN;
|
||||
import static com.google.gerrit.reviewdb.ApprovalCategory.READ;
|
||||
|
||||
import com.google.gerrit.reviewdb.AccountGroup;
|
||||
import com.google.gerrit.reviewdb.AccountProjectWatch;
|
||||
import com.google.gerrit.reviewdb.ApprovalCategory;
|
||||
import com.google.gerrit.reviewdb.Change;
|
||||
import com.google.gerrit.reviewdb.Project;
|
||||
import com.google.gerrit.reviewdb.RefRight;
|
||||
import com.google.gerrit.reviewdb.SystemConfig;
|
||||
import com.google.gerrit.reviewdb.RefRight.RefPattern;
|
||||
import com.google.gerrit.server.AccessPath;
|
||||
import com.google.gerrit.server.AnonymousUser;
|
||||
import com.google.gerrit.server.CurrentUser;
|
||||
import com.google.gerrit.server.config.AuthConfig;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.inject.AbstractModule;
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public class RefControlTest extends TestCase {
|
||||
public void testOwnerProject() {
|
||||
local.add(grant(OWN, admin, "refs/*", 1));
|
||||
|
||||
ProjectControl uBlah = user(devs);
|
||||
ProjectControl uAdmin = user(devs, admin);
|
||||
|
||||
assertFalse("not owner", uBlah.isOwner());
|
||||
assertTrue("is owner", uAdmin.isOwner());
|
||||
}
|
||||
|
||||
public void testBranchDelegation1() {
|
||||
local.add(grant(OWN, admin, "refs/*", 1));
|
||||
local.add(grant(OWN, devs, "refs/heads/x/*", 1));
|
||||
|
||||
ProjectControl uDev = user(devs);
|
||||
assertFalse("not owner", uDev.isOwner());
|
||||
assertTrue("owns ref", uDev.isOwnerAnyRef());
|
||||
|
||||
assertOwner("refs/heads/x/*", uDev);
|
||||
assertOwner("refs/heads/x/y", uDev);
|
||||
assertOwner("refs/heads/x/y/*", uDev);
|
||||
|
||||
assertNotOwner("refs/*", uDev);
|
||||
assertNotOwner("refs/heads/master", uDev);
|
||||
}
|
||||
|
||||
public void testBranchDelegation2() {
|
||||
local.add(grant(OWN, admin, "refs/*", 1));
|
||||
local.add(grant(OWN, devs, "refs/heads/x/*", 1));
|
||||
local.add(grant(OWN, fixers, "-refs/heads/x/y/*", 1));
|
||||
|
||||
ProjectControl uDev = user(devs);
|
||||
assertFalse("not owner", uDev.isOwner());
|
||||
assertTrue("owns ref", uDev.isOwnerAnyRef());
|
||||
|
||||
assertOwner("refs/heads/x/*", uDev);
|
||||
assertOwner("refs/heads/x/y", uDev);
|
||||
assertNotOwner("refs/*", uDev);
|
||||
assertNotOwner("refs/heads/master", uDev);
|
||||
assertNotOwner("refs/heads/x/y/*", uDev);
|
||||
|
||||
ProjectControl uFix = user(fixers);
|
||||
assertFalse("not owner", uFix.isOwner());
|
||||
assertTrue("owns ref", uFix.isOwnerAnyRef());
|
||||
|
||||
assertOwner("refs/heads/x/y/*", uFix);
|
||||
assertOwner("refs/heads/x/y/bar", uFix);
|
||||
assertNotOwner("refs/heads/x/*", uFix);
|
||||
assertNotOwner("refs/heads/x/y", uFix);
|
||||
assertNotOwner("refs/*", uFix);
|
||||
assertNotOwner("refs/heads/master", uFix);
|
||||
}
|
||||
|
||||
public void testInheritRead_SingleBranchDeniesUpload() {
|
||||
inherited.add(grant(READ, registered, "refs/*", 1, 2));
|
||||
local.add(grant(READ, registered, "-refs/heads/foobar", 1, 1));
|
||||
|
||||
ProjectControl u = user();
|
||||
assertTrue("can upload", u.canUploadToAtLeastOneRef());
|
||||
|
||||
assertTrue("can upload refs/heads/master", //
|
||||
u.controlForRef("refs/heads/master").canUpload());
|
||||
|
||||
assertFalse("deny refs/heads/foobar", //
|
||||
u.controlForRef("refs/heads/foobar").canUpload());
|
||||
}
|
||||
|
||||
public void testInheritRead_SingleBranchDoesNotOverrideInherited() {
|
||||
inherited.add(grant(READ, registered, "refs/*", 1, 2));
|
||||
local.add(grant(READ, registered, "refs/heads/foobar", 1, 1));
|
||||
|
||||
ProjectControl u = user();
|
||||
assertTrue("can upload", u.canUploadToAtLeastOneRef());
|
||||
|
||||
assertTrue("can upload refs/heads/master", //
|
||||
u.controlForRef("refs/heads/master").canUpload());
|
||||
|
||||
assertTrue("can upload refs/heads/foobar", //
|
||||
u.controlForRef("refs/heads/foobar").canUpload());
|
||||
}
|
||||
|
||||
public void testCannotUploadToAnyRef() {
|
||||
inherited.add(grant(READ, registered, "refs/*", 1, 1));
|
||||
local.add(grant(READ, devs, "refs/heads/*",1,2));
|
||||
|
||||
ProjectControl u = user();
|
||||
assertFalse("cannot upload", u.canUploadToAtLeastOneRef());
|
||||
assertFalse("cannot upload refs/heads/master", //
|
||||
u.controlForRef("refs/heads/master").canUpload());
|
||||
}
|
||||
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
private final Project.NameKey projectNameKey = new Project.NameKey("test");
|
||||
private final AccountGroup.Id admin = new AccountGroup.Id(1);
|
||||
private final AccountGroup.Id anonymous = new AccountGroup.Id(2);
|
||||
private final AccountGroup.Id registered = new AccountGroup.Id(3);
|
||||
|
||||
private final AccountGroup.Id devs = new AccountGroup.Id(4);
|
||||
private final AccountGroup.Id fixers = new AccountGroup.Id(5);
|
||||
|
||||
private final AuthConfig authConfig;
|
||||
private final AnonymousUser anonymousUser;
|
||||
|
||||
public RefControlTest() {
|
||||
final SystemConfig systemConfig = SystemConfig.create();
|
||||
systemConfig.adminGroupId = admin;
|
||||
systemConfig.anonymousGroupId = anonymous;
|
||||
systemConfig.registeredGroupId = registered;
|
||||
systemConfig.batchUsersGroupId = anonymous;
|
||||
try {
|
||||
byte[] bin = "abcdefghijklmnopqrstuvwxyz".getBytes("UTF-8");
|
||||
systemConfig.registerEmailPrivateKey = Base64.encodeBase64String(bin);
|
||||
} catch (UnsupportedEncodingException err) {
|
||||
throw new RuntimeException("Cannot encode key", err);
|
||||
}
|
||||
|
||||
Injector injector = Guice.createInjector(new AbstractModule() {
|
||||
@Override
|
||||
protected void configure() {
|
||||
bind(Config.class) //
|
||||
.annotatedWith(GerritServerConfig.class) //
|
||||
.toInstance(new Config());
|
||||
|
||||
bind(SystemConfig.class).toInstance(systemConfig);
|
||||
bind(AuthConfig.class);
|
||||
bind(AnonymousUser.class);
|
||||
}
|
||||
});
|
||||
authConfig = injector.getInstance(AuthConfig.class);
|
||||
anonymousUser = injector.getInstance(AnonymousUser.class);
|
||||
}
|
||||
|
||||
private List<RefRight> local;
|
||||
private List<RefRight> inherited;
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
local = new ArrayList<RefRight>();
|
||||
inherited = new ArrayList<RefRight>();
|
||||
}
|
||||
|
||||
private static void assertOwner(String ref, ProjectControl u) {
|
||||
assertTrue("OWN " + ref, u.controlForRef(ref).isOwner());
|
||||
}
|
||||
|
||||
private static void assertNotOwner(String ref, ProjectControl u) {
|
||||
assertFalse("NOT OWN " + ref, u.controlForRef(ref).isOwner());
|
||||
}
|
||||
|
||||
private RefRight grant(ApprovalCategory.Id categoryId, AccountGroup.Id group,
|
||||
String ref, int maxValue) {
|
||||
return grant(categoryId, group, ref, maxValue, maxValue);
|
||||
}
|
||||
|
||||
private RefRight grant(ApprovalCategory.Id categoryId, AccountGroup.Id group,
|
||||
String ref, int minValue, int maxValue) {
|
||||
RefRight right =
|
||||
new RefRight(new RefRight.Key(projectNameKey, new RefPattern(ref),
|
||||
categoryId, group));
|
||||
right.setMinValue((short) minValue);
|
||||
right.setMaxValue((short) maxValue);
|
||||
return right;
|
||||
}
|
||||
|
||||
private ProjectControl user(AccountGroup.Id... memberOf) {
|
||||
return new ProjectControl(new MockUser(memberOf), newProjectState());
|
||||
}
|
||||
|
||||
private ProjectState newProjectState() {
|
||||
ProjectCache projectCache = null;
|
||||
Project.NameKey wildProject = null;
|
||||
ProjectState ps =
|
||||
new ProjectState(anonymousUser, projectCache, wildProject, new Project(
|
||||
projectNameKey), local);
|
||||
ps.setInheritedRights(inherited);
|
||||
return ps;
|
||||
}
|
||||
|
||||
private class MockUser extends CurrentUser {
|
||||
private final Set<AccountGroup.Id> groups;
|
||||
|
||||
MockUser(AccountGroup.Id[] groupId) {
|
||||
super(AccessPath.UNKNOWN, RefControlTest.this.authConfig);
|
||||
groups = new HashSet<AccountGroup.Id>(Arrays.asList(groupId));
|
||||
groups.add(registered);
|
||||
groups.add(anonymous);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<AccountGroup.Id> getEffectiveGroups() {
|
||||
return groups;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Change.Id> getStarredChanges() {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<AccountProjectWatch> getNotificationFilters() {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
// Copyright (C) 2010 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.change;
|
||||
|
||||
import com.google.gerrit.reviewdb.Change;
|
||||
import com.google.gwtorm.client.OrmException;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class RegexFilePredicateTest extends TestCase {
|
||||
public void testPrefixOnlyOptimization() throws OrmException {
|
||||
RegexFilePredicate p = predicate("^a/b/.*");
|
||||
assertTrue(p.match(change("a/b/source.c")));
|
||||
assertFalse(p.match(change("source.c")));
|
||||
|
||||
assertTrue(p.match(change("a/b/source.c", "a/c/test")));
|
||||
assertFalse(p.match(change("a/bb/source.c")));
|
||||
}
|
||||
|
||||
public void testPrefixReducesSearchSpace() throws OrmException {
|
||||
RegexFilePredicate p = predicate("^a/b/.*\\.[ch]");
|
||||
assertTrue(p.match(change("a/b/source.c")));
|
||||
assertFalse(p.match(change("a/b/source.res")));
|
||||
assertFalse(p.match(change("source.res")));
|
||||
|
||||
assertTrue(p.match(change("a/b/a.a", "a/b/a.d", "a/b/a.h")));
|
||||
}
|
||||
|
||||
public void testFileExtension_Constant() throws OrmException {
|
||||
RegexFilePredicate p = predicate("^.*\\.res");
|
||||
assertTrue(p.match(change("test.res")));
|
||||
assertTrue(p.match(change("foo/bar/test.res")));
|
||||
assertFalse(p.match(change("test.res.bar")));
|
||||
}
|
||||
|
||||
public void testFileExtension_CharacterGroup() throws OrmException {
|
||||
RegexFilePredicate p = predicate("^.*\\.[ch]");
|
||||
assertTrue(p.match(change("test.c")));
|
||||
assertTrue(p.match(change("test.h")));
|
||||
assertFalse(p.match(change("test.C")));
|
||||
}
|
||||
|
||||
public void testEndOfString() throws OrmException {
|
||||
assertTrue(predicate("^a$").match(change("a")));
|
||||
assertFalse(predicate("^a$").match(change("a$")));
|
||||
|
||||
assertFalse(predicate("^a\\$").match(change("a")));
|
||||
assertTrue(predicate("^a\\$").match(change("a$")));
|
||||
}
|
||||
|
||||
public void testExactMatch() throws OrmException {
|
||||
RegexFilePredicate p = predicate("^foo.c");
|
||||
assertTrue(p.match(change("foo.c")));
|
||||
assertFalse(p.match(change("foo.cc")));
|
||||
assertFalse(p.match(change("bar.c")));
|
||||
}
|
||||
|
||||
private static RegexFilePredicate predicate(String pattern) {
|
||||
return new RegexFilePredicate(null, null, pattern);
|
||||
}
|
||||
|
||||
private static ChangeData change(String... files) {
|
||||
Arrays.sort(files);
|
||||
ChangeData cd = new ChangeData(new Change.Id(1));
|
||||
cd.setCurrentFilePaths(files);
|
||||
return cd;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user