Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Upgrade mockito-core to 2.27.0
Change-Id: Iba1358e97eac02cd65f8ba40b25e64554dfa789c
diff --git a/README.md b/README.md
index b133981..1ed0bf5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
# Rename project plugin for Gerrit Code Review
-This plugin currently only supports Gerrit version 2.14.X.
+This plugin currently supports Gerrit version 2.14.X and 2.15.X with changes in reviewDb, noteDB is not yet supported.
For more information, see: `src/main/resources/Documentation/about.md`
diff --git a/WORKSPACE b/WORKSPACE
index 7620960..21ad9d6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "8d7664e169100e537340aed89345c3245cf12f22",
+ commit = "8386b3fbf80e375f0a10c8386c0a8dfe260c5c1b",
)
# Release Plugin API
diff --git a/src/main/java/com/googlesource/gerrit/plugins/renameproject/RenameProject.java b/src/main/java/com/googlesource/gerrit/plugins/renameproject/RenameProject.java
index 3afc396..8bc3828 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/renameproject/RenameProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/renameproject/RenameProject.java
@@ -19,6 +19,7 @@
import com.google.common.base.Strings;
import com.google.gerrit.extensions.annotations.PluginName;
+import com.google.gerrit.extensions.api.access.PluginPermission;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
@@ -26,8 +27,9 @@
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
-import com.google.gerrit.server.account.CapabilityControl;
import com.google.gerrit.server.extensions.events.PluginEvent;
+import com.google.gerrit.server.permissions.GlobalPermission;
+import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.project.ProjectResource;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -65,6 +67,7 @@
private final PluginEvent pluginEvent;
private final String pluginName;
private final RenameLog renameLog;
+ private final PermissionBackend permissionBackend;
@Inject
RenameProject(
@@ -77,7 +80,8 @@
LockUnlockProject lockUnlockProject,
PluginEvent pluginEvent,
@PluginName String pluginName,
- RenameLog renameLog) {
+ RenameLog renameLog,
+ PermissionBackend permissionBackend) {
this.dbHandler = dbHandler;
this.fsHandler = fsHandler;
this.cacheHandler = cacheHandler;
@@ -88,6 +92,7 @@
this.pluginEvent = pluginEvent;
this.pluginName = pluginName;
this.renameLog = renameLog;
+ this.permissionBackend = permissionBackend;
}
private void assertNewNameNotNull(Input input) throws BadRequestException {
@@ -103,10 +108,11 @@
}
protected boolean canRename(ProjectResource rsrc) {
- CapabilityControl ctl = userProvider.get().getCapabilities();
- return ctl.canAdministrateServer()
- || ctl.canPerform(pluginName + "-" + RENAME_PROJECT)
- || (ctl.canPerform(pluginName + "-" + RENAME_OWN_PROJECT) && rsrc.getControl().isOwner());
+ PermissionBackend.WithUser userPermission = permissionBackend.user(userProvider);
+ return userPermission.testOrFalse(GlobalPermission.ADMINISTRATE_SERVER)
+ || userPermission.testOrFalse(new PluginPermission(pluginName, RENAME_PROJECT))
+ || (userPermission.testOrFalse(new PluginPermission(pluginName, RENAME_OWN_PROJECT))
+ && rsrc.getControl().isOwner());
}
void assertCanRename(ProjectResource rsrc, Input input, ProgressMonitor pm)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditions.java b/src/main/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditions.java
index e1104dc..2246d50 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditions.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/renameproject/conditions/RenamePreconditions.java
@@ -22,7 +22,9 @@
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MergeOpRepoManager;
+import com.google.gerrit.server.git.SubmoduleException;
import com.google.gerrit.server.git.SubmoduleOp;
+import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.project.ListChildProjects;
import com.google.gerrit.server.project.ProjectResource;
import com.google.inject.Inject;
@@ -87,14 +89,19 @@
}
private void assertHasNoChildProjects(ProjectResource rsrc) throws CannotRenameProjectException {
- List<ProjectInfo> children = listChildProjectsProvider.get().apply(rsrc);
- if (!children.isEmpty()) {
- String childrenString =
- String.join(", ", children.stream().map(info -> info.name).collect(Collectors.toList()));
- String message =
- String.format("Cannot rename project because it has children: %s", childrenString);
- log.error(message);
- throw new CannotRenameProjectException(message);
+ try {
+ List<ProjectInfo> children = listChildProjectsProvider.get().apply(rsrc);
+ if (!children.isEmpty()) {
+ String childrenString =
+ String.join(
+ ", ", children.stream().map(info -> info.name).collect(Collectors.toList()));
+ String message =
+ String.format("Cannot rename project because it has children: %s", childrenString);
+ log.error(message);
+ throw new CannotRenameProjectException(message);
+ }
+ } catch (PermissionBackendException e) {
+ throw new CannotRenameProjectException(e);
}
}
@@ -113,7 +120,7 @@
throw new CannotRenameProjectException(message);
}
}
- } catch (IOException e) {
+ } catch (IOException | SubmoduleException e) {
throw new CannotRenameProjectException(e);
}
}
