Merge changes I9243e16c,I29533337,Ifbbdbb46
* changes:
Fix names of "refs/users/" constants
Include refs/users/default branch when listing branches
Grant admins read, push and create on refs/users/default
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Account.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Account.java
index d4fb311..2750380 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Account.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Account.java
@@ -14,7 +14,7 @@
package com.google.gerrit.reviewdb.client;
-import static com.google.gerrit.reviewdb.client.RefNames.REFS_USER;
+import static com.google.gerrit.reviewdb.client.RefNames.REFS_USERS;
import com.google.gwtorm.client.Column;
import com.google.gwtorm.client.IntKey;
@@ -111,8 +111,8 @@
if (name == null) {
return null;
}
- if (name.startsWith(REFS_USER)) {
- return fromRefPart(name.substring(REFS_USER.length()));
+ if (name.startsWith(REFS_USERS)) {
+ return fromRefPart(name.substring(REFS_USERS.length()));
}
return null;
}
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java
index e6015e6..4154913 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/RefNames.java
@@ -30,7 +30,10 @@
public static final String REFS_CONFIG = "refs/meta/config";
/** Preference settings for a user {@code refs/users} */
- public static final String REFS_USER = "refs/users/";
+ public static final String REFS_USERS = "refs/users/";
+
+ /** Default user preference settings */
+ public static final String REFS_USERS_DEFAULT = RefNames.REFS_USERS + "default";
/** Configurations of project-specific dashboards (canned search queries). */
public static final String REFS_DASHBOARDS = "refs/meta/dashboards/";
@@ -64,7 +67,7 @@
public static String refsUsers(Account.Id accountId) {
StringBuilder r = new StringBuilder();
- r.append(REFS_USER);
+ r.append(REFS_USERS);
int account = accountId.get();
int m = account % 100;
if (m < 10) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountPreferences.java
index c4d4b06..da7d141 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountPreferences.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountPreferences.java
@@ -27,7 +27,6 @@
/** Preferences for user accounts. */
public class VersionedAccountPreferences extends VersionedMetaData {
- private static final String REFS_USER_DEFAULT = RefNames.REFS_USER + "default";
private static final String PREFERENCES = "preferences.config";
public static VersionedAccountPreferences forUser(Account.Id id) {
@@ -35,7 +34,7 @@
}
public static VersionedAccountPreferences forDefault() {
- return new VersionedAccountPreferences(REFS_USER_DEFAULT);
+ return new VersionedAccountPreferences(RefNames.REFS_USERS_DEFAULT);
}
private final String ref;
@@ -46,7 +45,7 @@
}
public boolean isDefaults() {
- return REFS_USER_DEFAULT.equals(getRefName());
+ return RefNames.REFS_USERS_DEFAULT.equals(getRefName());
}
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
index 85a9264..a370720 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
@@ -117,6 +117,7 @@
refs.addAll(heads);
addRef(db, refs, Constants.HEAD);
addRef(db, refs, RefNames.REFS_CONFIG);
+ addRef(db, refs, RefNames.REFS_USERS_DEFAULT);
} catch (RepositoryNotFoundException noGitRepository) {
throw new ResourceNotFoundException();
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AclUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AclUtil.java
new file mode 100644
index 0000000..ced8cd0
--- /dev/null
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AclUtil.java
@@ -0,0 +1,59 @@
+// Copyright (C) 2015 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.schema;
+
+import com.google.gerrit.common.data.AccessSection;
+import com.google.gerrit.common.data.GroupReference;
+import com.google.gerrit.common.data.LabelType;
+import com.google.gerrit.common.data.Permission;
+import com.google.gerrit.common.data.PermissionRule;
+import com.google.gerrit.server.git.ProjectConfig;
+
+public class AclUtil {
+ public static void grant(ProjectConfig config, AccessSection section,
+ String permission, GroupReference... groupList) {
+ grant(config, section, permission, false, groupList);
+ }
+
+ public static void grant(ProjectConfig config, AccessSection section,
+ String permission, boolean force, GroupReference... groupList) {
+ Permission p = section.getPermission(permission, true);
+ for (GroupReference group : groupList) {
+ if (group != null) {
+ PermissionRule r = rule(config, group);
+ r.setForce(force);
+ p.add(r);
+ }
+ }
+ }
+
+ public static void grant(ProjectConfig config,
+ AccessSection section, LabelType type,
+ int min, int max, GroupReference... groupList) {
+ String name = Permission.LABEL + type.getName();
+ Permission p = section.getPermission(name, true);
+ for (GroupReference group : groupList) {
+ if (group != null) {
+ PermissionRule r = rule(config, group);
+ r.setRange(min, max);
+ p.add(r);
+ }
+ }
+ }
+
+ public static PermissionRule rule(ProjectConfig config, GroupReference group) {
+ return new PermissionRule(config.resolve(group));
+ }
+}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java
index 81f744f..1198176 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java
@@ -17,6 +17,8 @@
import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
import static com.google.gerrit.server.group.SystemGroupBackend.PROJECT_OWNERS;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
+import static com.google.gerrit.server.schema.AclUtil.grant;
+import static com.google.gerrit.server.schema.AclUtil.rule;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
@@ -183,41 +185,6 @@
config.commitToNewRef(md, RefNames.REFS_CONFIG);
}
- private void grant(ProjectConfig config, AccessSection section,
- String permission, GroupReference... groupList) {
- grant(config, section, permission, false, groupList);
- }
-
- private void grant(ProjectConfig config, AccessSection section,
- String permission, boolean force, GroupReference... groupList) {
- Permission p = section.getPermission(permission, true);
- for (GroupReference group : groupList) {
- if (group != null) {
- PermissionRule r = rule(config, group);
- r.setForce(force);
- p.add(r);
- }
- }
- }
-
- private void grant(ProjectConfig config,
- AccessSection section, LabelType type,
- int min, int max, GroupReference... groupList) {
- String name = Permission.LABEL + type.getName();
- Permission p = section.getPermission(name, true);
- for (GroupReference group : groupList) {
- if (group != null) {
- PermissionRule r = rule(config, group);
- r.setRange(min, max);
- p.add(r);
- }
- }
- }
-
- private PermissionRule rule(ProjectConfig config, GroupReference group) {
- return new PermissionRule(config.resolve(group));
- }
-
public static LabelType initCodeReviewLabel(ProjectConfig c) {
LabelType type = new LabelType("Code-Review", ImmutableList.of(
new LabelValue((short) 2, "Looks good to me, approved"),
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java
index fda5306..3fa7986 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java
@@ -14,8 +14,11 @@
package com.google.gerrit.server.schema;
+import static com.google.gerrit.server.schema.AclUtil.grant;
+
import com.google.gerrit.common.Version;
import com.google.gerrit.common.data.AccessSection;
+import com.google.gerrit.common.data.GroupReference;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
@@ -40,6 +43,8 @@
private final AllUsersName allUsersName;
private final PersonIdent serverUser;
+ private GroupReference admin;
+
@Inject
AllUsersCreator(
GitRepositoryManager mgr,
@@ -50,6 +55,11 @@
this.serverUser = serverUser;
}
+ public AllUsersCreator setAdministrators(GroupReference admin) {
+ this.admin = admin;
+ return this;
+ }
+
public void create() throws IOException, ConfigInvalidException {
Repository git = null;
try {
@@ -84,8 +94,17 @@
Project project = config.getProject();
project.setDescription("Individual user settings and preferences.");
- AccessSection all = config.getAccessSection(RefNames.REFS_USER + "*", true);
+ AccessSection all = config.getAccessSection(RefNames.REFS_USERS + "*", true);
all.getPermission(Permission.READ, true).setExclusiveGroup(true);
+
+ AccessSection defaults = config.getAccessSection(RefNames.REFS_USERS_DEFAULT, true);
+ defaults.getPermission(Permission.READ, true).setExclusiveGroup(true);
+ grant(config, defaults, Permission.READ, admin);
+ defaults.getPermission(Permission.PUSH, true).setExclusiveGroup(true);
+ grant(config, defaults, Permission.PUSH, admin);
+ defaults.getPermission(Permission.CREATE, true).setExclusiveGroup(true);
+ grant(config, defaults, Permission.CREATE, admin);
+
config.commit(md);
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
index bfb9604..2581d56 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
@@ -87,7 +87,9 @@
.setAdministrators(GroupReference.forGroup(admin))
.setBatchUsers(GroupReference.forGroup(batch))
.create();
- allUsersCreator.create();
+ allUsersCreator
+ .setAdministrators(GroupReference.forGroup(admin))
+ .create();
dataSourceType.getIndexScript().run(db);
}