Skip to content

The Unified and Autonomous Development Platform

Add manage builds privilege

Robin Shen267691899d94
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 45f2111976..0723705c31 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -51,8 +51,6 @@ public interface BuildManager extends EntityManager<Build> {
Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes);
- Collection<String> getJobNames();
-
- Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user);
+ Collection<String> getJobNames(@Nullable Project project);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 64a51bf70d..e3a1f7d097 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -696,12 +696,14 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
}
@Override
- public Collection<String> getJobNames() {
+ public Collection<String> getJobNames(@Nullable Project project) {
jobNamesLock.readLock().lock();
try {
Collection<String> jobNames = new HashSet<>();
- for (Collection<String> each: this.jobNames.values())
- jobNames.addAll(each);
+ for (Map.Entry<Long, Collection<String>> entry: this.jobNames.entrySet()) {
+ if (project == null || project.getId().equals(entry.getKey()))
+ jobNames.addAll(entry.getValue());
+ }
return jobNames;
} finally {
jobNamesLock.readLock().unlock();
@@ -722,8 +724,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
}
}
- @Override
- public Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user) {
+ private Map<Project, Collection<String>> getAccessibleJobNames(@Nullable Project project, @Nullable User user) {
jobNamesLock.readLock().lock();
try {
Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index c190fbc172..dc9a505c47 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -30,6 +30,7 @@ import io.onedev.server.security.permission.AccessBuildReports;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.EditIssueField;
import io.onedev.server.security.permission.JobPermission;
+import io.onedev.server.security.permission.ManageBuilds;
import io.onedev.server.security.permission.ManageCodeComments;
import io.onedev.server.security.permission.ManageIssues;
import io.onedev.server.security.permission.ManageJob;
@@ -76,6 +77,8 @@ public class Role extends AbstractEntity implements Permission {
@Column(length=65535, nullable=false)
private ArrayList<String> editableIssueFields = new ArrayList<>();
+ private boolean manageBuilds;
+
@Lob
@Column(length=65535, nullable=false)
private ArrayList<JobPrivilege> jobPrivileges = new ArrayList<>();
@@ -190,8 +193,23 @@ public class Role extends AbstractEntity implements Permission {
return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldNames();
}
- @Editable(order=700)
+ @Editable(order=650)
@ShowCondition("isManageProjectDisabled")
+ public boolean isManageBuilds() {
+ return manageBuilds;
+ }
+
+ public void setManageBuilds(boolean manageBuilds) {
+ this.manageBuilds = manageBuilds;
+ }
+
+ @SuppressWarnings("unused")
+ private static boolean isManageBuildsDisabled() {
+ return !(boolean)EditContext.get().getInputValue("manageBuilds");
+ }
+
+ @Editable(order=700)
+ @ShowCondition("isManageBuildsDisabled")
public List<JobPrivilege> getJobPrivileges() {
return jobPrivileges;
}
@@ -245,6 +263,8 @@ public class Role extends AbstractEntity implements Permission {
permissions.add(new ScheduleIssues());
for (String issueField: editableIssueFields)
permissions.add(new EditIssueField(issueField));
+ if (manageBuilds)
+ permissions.add(new ManageBuilds());
for (JobPrivilege jobPrivilege: jobPrivileges) {
permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));
if (jobPrivilege.isManageJob())
@@ -261,7 +281,7 @@ public class Role extends AbstractEntity implements Permission {
} else {
if (manageProject || managePullRequests || manageCodeComments || codePrivilege != CodePrivilege.NONE)
permissions.add(new ReadCode());
- if (manageProject)
+ if (manageProject || manageBuilds)
permissions.add(new JobPermission("*", new AccessBuildLog()));
for (JobPrivilege jobPrivilege: jobPrivileges) {
permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
index 8f686578b2..daf935196f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
@@ -109,7 +109,7 @@ public abstract class JobExecutor implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestJobNames(String matchWith) {
- List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames());
+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));
Collections.sort(jobNames);
return SuggestionUtils.suggest(jobNames, matchWith);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
index c85b4e2bdd..3413d5810e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
@@ -48,7 +48,7 @@ public class JobPrivilege implements Serializable {
@SuppressWarnings("unused")
private static List<InputSuggestion> suggestJobNames(String matchWith) {
- List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames());
+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildManager.class).getJobNames(null));
Collections.sort(jobNames);
return SuggestionUtils.suggest(jobNames, matchWith);
}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java b/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
new file mode 100644
index 0000000000..98c6b1f7e7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/ManageBuilds.java
@@ -0,0 +1,12 @@
+package io.onedev.server.security.permission;
+
+import org.apache.shiro.authz.Permission;
+
+public class ManageBuilds implements Permission {
+
+ @Override
+ public boolean implies(Permission p) {
+ return p instanceof ManageBuilds || new JobPermission("*", new ManageJob()).implies(p);
+ }
+
+}
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 0945b031ba..92bdcc2a40 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
@@ -36,6 +36,7 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.CreateProjects;
import io.onedev.server.security.permission.EditIssueField;
import io.onedev.server.security.permission.JobPermission;
+import io.onedev.server.security.permission.ManageBuilds;
import io.onedev.server.security.permission.ManageCodeComments;
import io.onedev.server.security.permission.ManageIssues;
import io.onedev.server.security.permission.ManageJob;
@@ -183,6 +184,10 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return getSubject().isPermitted(new ProjectPermission(project, new ManageIssues()));
}
+ public static boolean canManageBuilds(Project project) {
+ return getSubject().isPermitted(new ProjectPermission(project, new ManageBuilds()));
+ }
+
public static boolean canManagePullRequests(Project project) {
return getSubject().isPermitted(new ProjectPermission(project, new ManagePullRequests()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index 7e0b2c2c45..7ed39aba5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -319,7 +319,8 @@ public abstract class BuildListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.isAdministrator() || getProject() != null && SecurityUtils.canManage(getProject()));
+ setVisible(SecurityUtils.isAdministrator()
+ || getProject() != null && SecurityUtils.canManageBuilds(getProject()));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 5de7d16027..22dc1286c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -318,13 +318,7 @@ public class SuggestionUtils {
}
public static List<InputSuggestion> suggestJobs(@Nullable Project project, String matchWith) {
- Collection<String> jobNames;
- BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- if (project != null)
- jobNames = buildManager.getAccessibleJobNames(project, SecurityUtils.getUser()).get(project);
- else
- jobNames = buildManager.getJobNames();
-
+ Collection<String> jobNames = OneDev.getInstance(BuildManager.class).getJobNames(project);
List<InputSuggestion> suggestions = new ArrayList<>();
for (String jobName: jobNames) {
LinearRange match = LinearRange.match(jobName, matchWith);