The Unified and Autonomous Development Platform
feat: able to assign group permission in project setting (#1375)
Robin Shena75f2bd0d8f9
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.javaindex 7c1303abb2..f986b1dc4d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java@@ -1,15 +1,18 @@package io.onedev.server.entitymanager;-import java.util.Collection;-import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;+import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;+import java.util.Collection;+public interface GroupAuthorizationManager extends EntityManager<GroupAuthorization> {void syncAuthorizations(Group group, Collection<GroupAuthorization> authorizations);+ void syncAuthorizations(Project project, Collection<GroupAuthorization> authorizations);+void create(GroupAuthorization authorization);void update(GroupAuthorization authorization);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.javaindex 430be2d2d9..463978bd1b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java@@ -11,6 +11,8 @@ import com.google.common.base.Preconditions;import io.onedev.server.entitymanager.GroupAuthorizationManager;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;+import io.onedev.server.model.Project;+import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -58,6 +60,40 @@ public class DefaultGroupAuthorizationManager extends BaseEntityManager<GroupAut}}+ @Transactional+ @Override+ public void syncAuthorizations(Project project, Collection<GroupAuthorization> authorizations) {+ for (Iterator<GroupAuthorization> it = project.getGroupAuthorizations().iterator(); it.hasNext();) {+ GroupAuthorization authorization = it.next();+ boolean found = false;+ for (GroupAuthorization newAuthorization: authorizations) {+ if (newAuthorization.getGroup().equals(authorization.getGroup())) {+ found = true;+ authorization.setRole(newAuthorization.getRole());+ dao.persist(authorization);+ }+ }+ if (!found) {+ it.remove();+ delete(authorization);+ }+ }++ for (GroupAuthorization newAuthorization: authorizations) {+ boolean found = false;+ for (GroupAuthorization authorization: project.getGroupAuthorizations()) {+ if (authorization.getGroup().equals(newAuthorization.getGroup())) {+ found = true;+ break;+ }+ }+ if (!found) {+ project.getGroupAuthorizations().add(newAuthorization);+ dao.persist(newAuthorization);+ }+ }+ }+@Transactional@Overridepublic void create(GroupAuthorization authorization) {diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 2642c726a6..15de3f81af 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -50,7 +50,6 @@ import io.onedev.server.web.page.admin.usermanagement.NewInvitationPage;import io.onedev.server.web.page.admin.usermanagement.NewUserPage;import io.onedev.server.web.page.admin.usermanagement.UserListPage;import io.onedev.server.web.page.admin.usermanagement.accesstoken.UserAccessTokensPage;-import io.onedev.server.web.page.admin.usermanagement.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.admin.usermanagement.avatar.UserAvatarPage;import io.onedev.server.web.page.admin.usermanagement.emailaddresses.UserEmailAddressesPage;import io.onedev.server.web.page.admin.usermanagement.gpgkeys.UserGpgKeysPage;@@ -106,7 +105,7 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import io.onedev.server.web.page.project.setting.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;@@ -349,7 +348,8 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new ProjectPageMapper("${project}/~children", ProjectChildrenPage.class));add(new ProjectPageMapper("${project}/~settings/general", GeneralProjectSettingPage.class));- add(new ProjectPageMapper("${project}/~settings/authorizations", ProjectAuthorizationsPage.class));+ add(new ProjectPageMapper("${project}/~settings/user-authorizations", io.onedev.server.web.page.project.setting.authorization.UserAuthorizationsPage.class));+ add(new ProjectPageMapper("${project}/~settings/group-authorizations", io.onedev.server.web.page.project.setting.authorization.GroupAuthorizationsPage.class));add(new ProjectPageMapper("${project}/~settings/avatar-edit", AvatarEditPage.class));add(new ProjectPageMapper("${project}/~settings/branch-protection", BranchProtectionsPage.class));add(new ProjectPageMapper("${project}/~settings/tag-protection", TagProtectionsPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.javaindex cb822fec9d..111c6a53b7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserListPage.java@@ -26,6 +26,7 @@ import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -672,7 +673,7 @@ public class UserListPage extends AdministrationPage {@Overridepublic void onClick() {SecurityUtils.getSubject().runAs(rowModel.getObject().getPrincipals());- setResponsePage(HomePage.class);+ throw new RestartResponseException(HomePage.class);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 177e06523b..66b0e24002 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -51,9 +51,13 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.project.setting.ProjectSettingPage;-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;+import io.onedev.server.web.page.project.setting.authorization.GroupAuthorizationsPage;+import io.onedev.server.web.page.project.setting.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;-import io.onedev.server.web.page.project.setting.build.*;+import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;+import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPage;+import io.onedev.server.web.page.project.setting.build.JobPropertiesPage;+import io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.code.analysis.CodeAnalysisSettingPage;import io.onedev.server.web.page.project.setting.code.branchprotection.BranchProtectionsPage;import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;@@ -254,8 +258,13 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {GeneralProjectSettingPage.class, GeneralProjectSettingPage.paramsOf(getProject())));settingMenuItems.add(new SidebarMenuItem.Page(null, "Edit Avatar",AvatarEditPage.class, AvatarEditPage.paramsOf(getProject())));- settingMenuItems.add(new SidebarMenuItem.Page(null, "Authorizations",- ProjectAuthorizationsPage.class, ProjectAuthorizationsPage.paramsOf(getProject())));++ List<SidebarMenuItem> authorizationMenuItems = new ArrayList<>();+ authorizationMenuItems.add(new SidebarMenuItem.Page(null, "By User",+ UserAuthorizationsPage.class, UserAuthorizationsPage.paramsOf(getProject())));+ authorizationMenuItems.add(new SidebarMenuItem.Page(null, "By Group",+ GroupAuthorizationsPage.class, GroupAuthorizationsPage.paramsOf(getProject())));+ settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Authorization", authorizationMenuItems));List<SidebarMenuItem> codeSettingMenuItems = new ArrayList<>();codeSettingMenuItems.add(new SidebarMenuItem.Page(null, "Branch Protection",diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.javanew file mode 100644index 0000000000..401fe51ded--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationBean.java@@ -0,0 +1,41 @@+package io.onedev.server.web.page.project.setting.authorization;++import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.GroupChoice;+import io.onedev.server.annotation.RoleChoice;++import javax.validation.constraints.NotEmpty;+import java.io.Serializable;++@Editable+public class GroupAuthorizationBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private String groupName;++ private String roleName;++ @Editable(order=100, name="Group")+ @GroupChoice+ @NotEmpty+ public String getGroupName() {+ return groupName;+ }++ public void setGroupName(String groupName) {+ this.groupName = groupName;+ }++ @Editable(order=200, name="Role")+ @RoleChoice+ @NotEmpty+ public String getRoleName() {+ return roleName;+ }++ public void setRoleName(String roleName) {+ this.roleName = roleName;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsBean.javanew file mode 100644index 0000000000..71fcaae278--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsBean.java@@ -0,0 +1,25 @@+package io.onedev.server.web.page.project.setting.authorization;++import io.onedev.server.annotation.Editable;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++@Editable+public class GroupAuthorizationsBean implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<GroupAuthorizationBean> authorizations = new ArrayList<>();++ @Editable+ public List<GroupAuthorizationBean> getAuthorizations() {+ return authorizations;+ }++ public void setAuthorizations(List<GroupAuthorizationBean> authorizations) {+ this.authorizations = authorizations;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.htmlnew file mode 100644index 0000000000..d6ee60fa65--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.html@@ -0,0 +1,15 @@+<wicket:extend>+ <div class="alert alert-notice bg-white text-gray mb-4">+ <wicket:svg href="bulb" class="icon mr-2"></wicket:svg>+ When authorize a group, the group will also be authorized with the role for all child projects+ </div>+ <div class="card group-authorizations">+ <div class="card-body">+ <form wicket:id="form" class="authorization-list leave-confirm">+ <div wicket:id="feedback" class="mb-4"></div>+ <div wicket:id="editor"></div>+ <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">+ </form>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..b0d2c1bf3c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java@@ -0,0 +1,114 @@+package io.onedev.server.web.page.project.setting.authorization;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.GroupAuthorizationManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.RoleManager;+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.web.editable.PropertyContext;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import org.apache.wicket.Component;+import org.apache.wicket.Session;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Set;++@SuppressWarnings("serial")+public class GroupAuthorizationsPage extends ProjectSettingPage {++ public GroupAuthorizationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ GroupAuthorizationsBean authorizationsBean = new GroupAuthorizationsBean();+ for (GroupAuthorization authorization: getProject().getGroupAuthorizations()) {+ GroupAuthorizationBean authorizationBean = new GroupAuthorizationBean();+ authorizationBean.setGroupName(authorization.getGroup().getName());+ authorizationBean.setRoleName(authorization.getRole().getName());+ authorizationsBean.getAuthorizations().add(authorizationBean);+ }++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();++ if (getProject().getParent() == null+ || !SecurityUtils.canManage(getProject().getParent())) {+ boolean canManageProject = false;+ Project project = getProject();+ User user = SecurityUtils.getUser();+ if (user.isRoot()) {+ canManageProject = true;+ } else {+ for (var authorization: project.getUserAuthorizations()) {+ if (authorization.getUser().equals(user)+ && authorization.getRole().isManageProject()) {+ canManageProject = true;+ break;+ }+ }+ if (!canManageProject && user.getGroups().stream().anyMatch(it->it.isAdministrator()))+ canManageProject = true;+ if (!canManageProject) {+ for (GroupAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ if (user.getGroups().stream().anyMatch(it->it.getName().equals(authorizationBean.getGroupName()))+ && OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()).isManageProject()) {+ canManageProject = true;+ break;+ }+ }+ }+ }+ if (!canManageProject) {+ error("Unable to apply change as otherwise you will not be able to manage this project");+ return;+ }+ }++ Set<String> groupNames = new HashSet<>();+ Collection<GroupAuthorization> authorizations = new ArrayList<>();+ for (GroupAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ if (groupNames.contains(authorizationBean.getGroupName())) {+ error("Duplicate authorizations found: " + authorizationBean.getGroupName());+ return;+ } else {+ groupNames.add(authorizationBean.getGroupName());+ GroupAuthorization authorization = new GroupAuthorization();+ authorization.setProject(getProject());+ authorization.setGroup(OneDev.getInstance(GroupManager.class).find(authorizationBean.getGroupName()));+ authorization.setRole(OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()));+ authorizations.add(authorization);+ }+ }++ OneDev.getInstance(GroupAuthorizationManager.class).syncAuthorizations(getProject(), authorizations);+ Session.get().success("Group authorizations updated");+ }++ };+ form.add(new FencedFeedbackPanel("feedback", form));+ form.add(PropertyContext.edit("editor", authorizationsBean, "authorizations"));+ add(form);+ }++ @Override+ protected Component newProjectTitle(String componentId) {+ return new Label(componentId, "Group Authorizations");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.javasimilarity index 82%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.javaindex c8d6d9714b..6d9b2c84ea 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationBean.java@@ -1,17 +1,14 @@package io.onedev.server.web.page.project.setting.authorization;-import java.io.Serializable;--import javax.validation.constraints.Size;--import javax.validation.constraints.NotEmpty;-import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.RoleChoice;import io.onedev.server.annotation.UserChoice;+import javax.validation.constraints.NotEmpty;+import java.io.Serializable;+@Editable-public class AuthorizationBean implements Serializable {+public class UserAuthorizationBean implements Serializable {private static final long serialVersionUID = 1L;@@ -32,7 +29,7 @@ public class AuthorizationBean implements Serializable {@Editable(order=200, name="Role")@RoleChoice- @Size(min=1, message="At least one role needs to be specified")+ @NotEmptypublic String getRoleName() {return roleName;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsBean.javasimilarity index 55%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationsBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsBean.javaindex 74f97a84b0..bcc7e830d2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/AuthorizationsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsBean.java@@ -7,18 +7,18 @@ import java.util.List;import io.onedev.server.annotation.Editable;@Editable-public class AuthorizationsBean implements Serializable {+public class UserAuthorizationsBean implements Serializable {private static final long serialVersionUID = 1L;- private List<AuthorizationBean> authorizations = new ArrayList<>();+ private List<UserAuthorizationBean> authorizations = new ArrayList<>();@Editable- public List<AuthorizationBean> getAuthorizations() {+ public List<UserAuthorizationBean> getAuthorizations() {return authorizations;}- public void setAuthorizations(List<AuthorizationBean> authorizations) {+ public void setAuthorizations(List<UserAuthorizationBean> authorizations) {this.authorizations = authorizations;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.htmlsimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.htmlindex 3e7bd60ae4..795bbb1675 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.html@@ -3,7 +3,7 @@<wicket:svg href="bulb" class="icon mr-2"></wicket:svg>When authorize a user, the user will also be authorized with the role for all child projects</div>- <div class="card project-authorizations">+ <div class="card user-authorizations"><div class="card-body"><form wicket:id="form" class="authorization-list leave-confirm"><div wicket:id="feedback" class="mb-4"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.javasimilarity index 65%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.javaindex b55cf7fd79..16938438a7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java@@ -26,9 +26,9 @@ import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public class ProjectAuthorizationsPage extends ProjectSettingPage {+public class UserAuthorizationsPage extends ProjectSettingPage {- public ProjectAuthorizationsPage(PageParameters params) {+ public UserAuthorizationsPage(PageParameters params) {super(params);}@@ -36,9 +36,9 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {protected void onInitialize() {super.onInitialize();- AuthorizationsBean authorizationsBean = new AuthorizationsBean();+ UserAuthorizationsBean authorizationsBean = new UserAuthorizationsBean();for (UserAuthorization authorization: getProject().getUserAuthorizations()) {- AuthorizationBean authorizationBean = new AuthorizationBean();+ UserAuthorizationBean authorizationBean = new UserAuthorizationBean();authorizationBean.setUserName(authorization.getUser().getName());authorizationBean.setRoleName(authorization.getRole().getName());authorizationsBean.getAuthorizations().add(authorizationBean);@@ -50,43 +50,46 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {protected void onSubmit() {super.onSubmit();- boolean canManageProject = false;- Project project = getProject();- User user = SecurityUtils.getUser();- if (user.isRoot()) {- canManageProject = true;- } else {- for (Membership membership: user.getMemberships()) {- if (membership.getGroup().isAdministrator()) {- canManageProject = true;- } else {- for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {- if (authorization.getProject().equals(project) && authorization.getRole().isManageProject()) {+ if (getProject().getParent() == null+ || !SecurityUtils.canManage(getProject().getParent())) {+ boolean canManageProject = false;+ Project project = getProject();+ User user = SecurityUtils.getUser();+ if (user.isRoot()) {+ canManageProject = true;+ } else {+ for (Membership membership: user.getMemberships()) {+ if (membership.getGroup().isAdministrator()) {+ canManageProject = true;+ } else {+ for (GroupAuthorization authorization: membership.getGroup().getAuthorizations()) {+ if (authorization.getProject().equals(project) && authorization.getRole().isManageProject()) {+ canManageProject = true;+ break;+ }+ }+ }+ if (canManageProject)+ break;+ }+ if (!canManageProject) {+ for (UserAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ if (authorizationBean.getUserName().equals(user.getName())+ && OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()).isManageProject()) {canManageProject = true;break;}}}- if (canManageProject)- break;}if (!canManageProject) {- for (AuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {- if (authorizationBean.getUserName().equals(user.getName())- && OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()).isManageProject()) {- canManageProject = true;- break;- }- }+ error("Unable to apply change as otherwise you will not be able to manage this project");+ return;}}- if (!canManageProject) {- error("You can not unauthorize yourself as a manager");- return;- }Set<String> userNames = new HashSet<>();Collection<UserAuthorization> authorizations = new ArrayList<>();- for (AuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ for (UserAuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {if (userNames.contains(authorizationBean.getUserName())) {error("Duplicate authorizations found: " + authorizationBean.getUserName());return;@@ -112,7 +115,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "Project Authorizations");+ return new Label(componentId, "User Authorizations");}}