Skip to content

The Unified and Autonomous Development Platform

feat: [API] Able to manage group authorizations as project owner (OD-2261)

Robin Shen72169095ca02
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java
index c13b6ec33a..07b65deb43 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java
@@ -13,6 +13,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import io.onedev.server.model.UserAuthorization;
import org.apache.shiro.authz.UnauthorizedException;
import io.onedev.server.entitymanager.GroupAuthorizationManager;
@@ -38,37 +39,29 @@ public class GroupAuthorizationResource {
@Path("/{authorizationId}")
@GET
public GroupAuthorization get(@PathParam("authorizationId") Long authorizationId) {
- if (!SecurityUtils.isAdministrator())
+ var authorization = authorizationManager.load(authorizationId);
+ if (!SecurityUtils.canManageProject(authorization.getProject()))
throw new UnauthorizedException();
- return authorizationManager.load(authorizationId);
+ return authorization;
}
@Api(order=200, description="Create new group authorization")
@POST
public Long create(@NotNull GroupAuthorization authorization) {
- if (!SecurityUtils.isAdministrator())
+ if (!SecurityUtils.canManageProject(authorization.getProject()))
throw new UnauthorizedException();
authorizationManager.createOrUpdate(authorization);
return authorization.getId();
}
- @Api(order=250, description="Update group authorization of specified id")
- @Path("/{authorizationId}")
- @POST
- public Response update(@PathParam("authorizationId") Long authorizationId, @NotNull GroupAuthorization authorization) {
- if (!SecurityUtils.isAdministrator())
- throw new UnauthorizedException();
- authorizationManager.createOrUpdate(authorization);
- return Response.ok().build();
- }
-
@Api(order=300, description = "Delete group authorization of specified id")
@Path("/{authorizationId}")
@DELETE
public Response delete(@PathParam("authorizationId") Long authorizationId) {
- if (!SecurityUtils.isAdministrator())
+ var authorization = authorizationManager.load(authorizationId);
+ if (!SecurityUtils.canManageProject(authorization.getProject()))
throw new UnauthorizedException();
- authorizationManager.delete(authorizationManager.load(authorizationId));
+ authorizationManager.delete(authorization);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java
index 0b450d2562..e8850ec4a3 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java
@@ -6,14 +6,7 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
+import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -84,7 +77,18 @@ public class GroupResource {
return groupManager.query(criteria, offset, count);
}
-
+
+ @Api(order=450)
+ @Path("/ids/{name}")
+ @GET
+ public Long getId(@PathParam("name") @Api(description = "Group name") String name) {
+ var group = groupManager.find(name);
+ if (group != null)
+ return group.getId();
+ else
+ throw new NotFoundException();
+ }
+
@Api(order=500, description="Create new group")
@POST
public Long create(@NotNull Group group) {
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
index 9b39a53db4..3290014fa4 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java
@@ -127,9 +127,10 @@ public class ProjectResource {
@Path("/{projectId}/group-authorizations")
@GET
public Collection<GroupAuthorization> getGroupAuthorizations(@PathParam("projectId") Long projectId) {
- if (!SecurityUtils.isAdministrator())
+ var project = projectManager.load(projectId);
+ if (!SecurityUtils.canManageProject(project))
throw new UnauthorizedException();
- return projectManager.load(projectId).getGroupAuthorizations();
+ return project.getGroupAuthorizations();
}
@Api(order=500)
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java
index bb1b33b4f5..58d2564ff6 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java
@@ -1,25 +1,18 @@
package io.onedev.server.rest.resource;
+import io.onedev.server.entitymanager.UserAuthorizationManager;
+import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.shiro.authz.UnauthorizedException;
-
-import io.onedev.server.entitymanager.UserAuthorizationManager;
-import io.onedev.server.model.UserAuthorization;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
-
@Api(order=8000)
@Path("/user-authorizations")
@Consumes(MediaType.APPLICATION_JSON)
@@ -53,16 +46,6 @@ public class UserAuthorizationResource {
return authorization.getId();
}
- @Api(order=250, description="Update user authorization of specified id")
- @Path("/{authorizationId}")
- @POST
- public Response update(@PathParam("authorizationId") Long authorizationId, @NotNull UserAuthorization authorization) {
- if (!SecurityUtils.canManageProject(authorization.getProject()))
- throw new UnauthorizedException();
- authorizationManager.createOrUpdate(authorization);
- return Response.ok().build();
- }
-
@Api(order=300, description = "Delete user authorization of specified id")
@Path("/{authorizationId}")
@DELETE
diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.md
index ef3a91ab6d..883445c0bc 100644
--- a/server-product/system/incompatibilities/incompatibilities.md
+++ b/server-product/system/incompatibilities/incompatibilities.md
@@ -1,3 +1,10 @@
+# 11.6.12
+
+### RESTful API
+
+The ability to edit existing user authorization is removed as any project owner can use it to remove authorization of
+other projects
+
# 11.6.10
### RESTful API