Skip to content

The Unified and Autonomous Development Platform

Authorize project owners with project management permission

Robin Shenef2e261fdef9
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 60ac44beb3..a304a09284 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -106,6 +106,9 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
private Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings = new ArrayList<>();
+ @OneToMany(mappedBy="owner")
+ private Collection<Project> projects = new ArrayList<>();
+
@Lob
@Column(nullable=false, length=65535)
private ArrayList<NamedIssueQuery> userIssueQueries = new ArrayList<>();
@@ -321,7 +324,15 @@ public class User extends AbstractEntity implements AuthenticationInfo {
return User.asSubject(0L);
}
- @Editable(name="Login Name", order=100)
+ public Collection<Project> getProjects() {
+ return projects;
+ }
+
+ public void setProjects(Collection<Project> projects) {
+ this.projects = projects;
+ }
+
+ @Editable(name="Login Name", order=100)
@UserName
@NotEmpty
public String getName() {
diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
index a796a11a37..a981b102e6 100644
--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
@@ -32,12 +32,14 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Membership;
+import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.security.permission.CreateProjects;
+import io.onedev.server.security.permission.ManageProject;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.SystemAdministration;
import io.onedev.server.security.permission.UserAdministration;
@@ -88,6 +90,17 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
return new HashSet<>();
}
+ private Collection<Permission> getGroupPermissions(Group group) {
+ Collection<Permission> permissions = new ArrayList<>();
+ if (group.isAdministrator())
+ permissions.add(new SystemAdministration());
+ if (group.isCreateProjects())
+ permissions.add(new CreateProjects());
+ for (GroupAuthorization authorization: group.getProjectAuthorizations())
+ permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));
+ return permissions;
+ }
+
@Override
public Collection<Permission> getObjectPermissions() {
return transactionManager.getSessionManager().call(new Callable<Collection<Permission>>() {
@@ -102,22 +115,16 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
if (user.isRoot())
permissions.add(new SystemAdministration());
permissions.add(new UserAdministration(user));
- for (Group group: user.getGroups()) {
- if (group.isAdministrator())
- permissions.add(new SystemAdministration());
- if (group.isCreateProjects())
- permissions.add(new CreateProjects());
- for (GroupAuthorization authorization: group.getProjectAuthorizations())
- permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));
- }
+ for (Group group: user.getGroups())
+ permissions.addAll(getGroupPermissions(group));
for (UserAuthorization authorization: user.getProjectAuthorizations())
permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));
+ for (Project project: user.getProjects())
+ permissions.add(new ProjectPermission(project, new ManageProject()));
}
Group group = groupManager.findAnonymous();
- if (group != null) {
- for (GroupAuthorization authorization: group.getProjectAuthorizations())
- permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));
- }
+ if (group != null)
+ permissions.addAll(getGroupPermissions(group));
return permissions;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
index 0d8119cd59..01d87b0b50 100644
--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
@@ -52,7 +52,8 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static Collection<User> getAuthorizedUsers(Project project, Permission permission) {
Collection<User> authorizedUsers = new HashSet<>();
authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot());
-
+ if (project.getOwner() != null)
+ authorizedUsers.add(project.getOwner());
Group anonymousGroup = OneDev.getInstance(GroupManager.class).findAnonymous();
for (GroupAuthorization authorization: project.getGroupAuthorizations()) {
Group group = authorization.getGroup();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
index c092e31baa..e96d2b1449 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
@@ -15,6 +15,7 @@
<a wicket:id="forkNow">fork now</a>
</div>
<div wicket:id="description" class="description"></div>
+ <wicket:enclosure child="cloneUrl">
<div class="clone form-inline">
<div class="input-group">
<div class="input-group-addon">Clone URL</div>
@@ -22,5 +23,6 @@
<a wicket:id="copyUrl" class="input-group-addon"><i class="fa fa-clipboard"></i></a>
</div>
</div>
+ </wicket:enclosure>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
index e7b68833a5..5623818470 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
@@ -73,7 +73,8 @@ public abstract class ProjectInfoPanel extends Panel {
UrlManager urlManager = OneDev.getInstance(UrlManager.class);
Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));
- add(new TextField<String>("cloneUrl", cloneUrlModel));
+ add(new TextField<String>("cloneUrl", cloneUrlModel)
+ .setVisible(SecurityUtils.canReadCode(getProject())));
add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
if (getProject().getDescription() != null) {
@@ -154,7 +155,9 @@ public abstract class ProjectInfoPanel extends Panel {
};
}
- }.setVisible(SecurityUtils.canCreateProjects()));
+ }.setVisible(SecurityUtils.canCreateProjects()
+ && SecurityUtils.getUser() != null
+ && SecurityUtils.canReadCode(getProject())));
}
private Project getProject() {