Skip to content

The Unified and Autonomous Development Platform

fix: A user without project owner role can still able to grant user access to the project (OD-2472)

Robin Shenc2c0dc75671c
diff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
index 14abc3c6d8..5e4a754b93 100644
--- a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java
@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
import org.apache.shiro.authz.Permission;
+import org.apache.shiro.authz.UnauthorizedException;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.SimplePrincipalCollection;
import org.apache.shiro.subject.Subject;
@@ -93,6 +94,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static final PrincipalCollection PRINCIPALS_ANONYMOUS =
new SimplePrincipalCollection(PRINCIPAL_ANONYMOUS, "");
+ public static void checkPermission(Permission permission) {
+ if (!getSubject().isPermitted(permission))
+ throw new UnauthorizedException();
+ }
+
public static PrincipalCollection asPrincipals(String principal) {
return new SimplePrincipalCollection(principal, "");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java
index bdd371a6ac..c0a61a5d06 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java
@@ -24,6 +24,8 @@ import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.ManageProject;
+import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@@ -57,6 +59,8 @@ public class GroupAuthorizationsPage extends ProjectSettingPage {
protected void onSubmit() {
super.onSubmit();
+ SecurityUtils.checkPermission(new ProjectPermission(getProject(), new ManageProject()));
+
if (getProject().getParent() == null
|| !SecurityUtils.canManageProject(getProject().getParent())) {
boolean canManageProject = false;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java
index 2f47ba5193..2b0d1d56c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java
@@ -26,6 +26,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.ManageProject;
+import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@@ -59,6 +61,8 @@ public class UserAuthorizationsPage extends ProjectSettingPage {
protected void onSubmit() {
super.onSubmit();
+ SecurityUtils.checkPermission(new ProjectPermission(getProject(), new ManageProject()));
+
if (getProject().getParent() == null
|| !SecurityUtils.canManageProject(getProject().getParent())) {
boolean canManageProject = false;