Skip to content

The Unified and Autonomous Development Platform

feat: Separate job permission to access pipeline panel (#1771)

Robin Shend035e8e10218
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 44772ff5b2..f29ebaec34 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -6261,4 +6261,25 @@ public class DataMigrator {
}
}
+ private void migrate158(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Roles.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ for (var jobPrivilegeElement: element.element("jobPrivileges").elements()) {
+ if (jobPrivilegeElement.elementTextTrim("accessLog").equals("true")) {
+ jobPrivilegeElement.addElement("accessPipeline").setText("true");
+ var accessibleReportsElement = jobPrivilegeElement.element("accessibleReports");
+ if (accessibleReportsElement == null)
+ accessibleReportsElement = jobPrivilegeElement.addElement("accessibleReports");
+ accessibleReportsElement.setText("*");
+ } else {
+ jobPrivilegeElement.addElement("accessPipeline").setText("false");
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
\ No newline at end of file
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 df5fffde22..33f5a38ba0 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
@@ -371,6 +371,8 @@ public class Role extends AbstractEntity implements BasePermission {
permissions.add(new JobPermission(jobPrivilege.getJobNames(), new RunJob()));
if (jobPrivilege.isAccessLog())
permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildLog()));
+ if (jobPrivilege.isAccessPipeline())
+ permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuildPipeline()));
if (jobPrivilege.getAccessibleReports() != null) {
AccessBuildReports accessBuildReports = new AccessBuildReports(jobPrivilege.getAccessibleReports());
permissions.add(new JobPermission(jobPrivilege.getJobNames(), accessBuildReports));
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 49adbba374..d53f7cf84c 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
@@ -1,23 +1,21 @@
package io.onedev.server.model.support.role;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import javax.validation.constraints.NotEmpty;
-
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.util.EditContext;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Patterns;
import io.onedev.server.annotation.ShowCondition;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.util.EditContext;
import io.onedev.server.web.util.SuggestionUtils;
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
@Editable
public class JobPrivilege implements Serializable {
@@ -31,6 +29,8 @@ public class JobPrivilege implements Serializable {
private boolean accessLog;
+ private boolean accessPipeline;
+
private String accessibleReports;
@Editable(order=100, description="Specify space-separated jobs. Use '*' or '?' for wildcard match. "
@@ -69,7 +69,7 @@ public class JobPrivilege implements Serializable {
}
@Editable(order=200, description="The permission to run job manually. It also implies the permission "
- + "to access build log, and all published reports")
+ + "to access build log, build pipeline and all published reports")
@ShowCondition("isManageJobDisabled")
public boolean isRunJob() {
return runJob;
@@ -84,8 +84,7 @@ public class JobPrivilege implements Serializable {
return !(boolean) EditContext.get().getInputValue("runJob");
}
- @Editable(order=300, name="Access Build Log", description="The permission to access build log. "
- + "It also implies the permission to access published reports")
+ @Editable(order=300, name="Access Build Log", description="The permission to access build log")
@ShowCondition("isRunJobDisabled")
public boolean isAccessLog() {
return accessLog;
@@ -95,14 +94,19 @@ public class JobPrivilege implements Serializable {
this.accessLog = accessLog;
}
- @SuppressWarnings("unused")
- private static boolean isAccessLogDisabled() {
- return !(boolean) EditContext.get().getInputValue("accessLog");
+ @Editable(order=350, name="Access Build Pipeline", description="The permission to access build pipeline")
+ @ShowCondition("isRunJobDisabled")
+ public boolean isAccessPipeline() {
+ return accessPipeline;
+ }
+
+ public void setAccessPipeline(boolean accessPipeline) {
+ this.accessPipeline = accessPipeline;
}
@Editable(order=400, name="Access Build Reports", placeholder="No accessible reports", description="Optionally specify space-separated reports. "
+ "Use '*' or '?' for wildcard match. Prefix with '-' to exclude")
- @ShowCondition("isAccessLogDisabled")
+ @ShowCondition("isRunJobDisabled")
@Patterns
@Nullable
public String getAccessibleReports() {
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 c8d3ac39c7..723977966f 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
@@ -239,6 +239,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return getSubject().isPermitted(new ProjectPermission(build.getProject(),
new JobPermission(build.getJobName(), new AccessBuildLog())));
}
+
+ public static boolean canAccessPipeline(Build build) {
+ return getSubject().isPermitted(new ProjectPermission(build.getProject(),
+ new JobPermission(build.getJobName(), new AccessBuildPipeline())));
+ }
public static boolean canAccessBuild(Build build) {
return canAccessJob(build.getProject(), build.getJobName());
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildLog.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildLog.java
index 4fa0355d40..a51486212c 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildLog.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildLog.java
@@ -8,7 +8,7 @@ public class AccessBuildLog implements BasePermission {
@Override
public boolean implies(Permission p) {
- return p instanceof AccessBuildLog || new AccessBuildReports("*").implies(p);
+ return p instanceof AccessBuildLog;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildPipeline.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildPipeline.java
new file mode 100644
index 0000000000..ff4683db6b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildPipeline.java
@@ -0,0 +1,18 @@
+package io.onedev.server.security.permission;
+
+import io.onedev.server.util.facade.UserFacade;
+import org.apache.shiro.authz.Permission;
+import org.jetbrains.annotations.Nullable;
+
+public class AccessBuildPipeline implements BasePermission {
+
+ @Override
+ public boolean implies(Permission p) {
+ return p instanceof AccessBuildPipeline;
+ }
+
+ @Override
+ public boolean isApplicable(@Nullable UserFacade user) {
+ return true;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java b/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java
index cbd96f82ca..4ebba4d746 100644
--- a/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java
+++ b/server-core/src/main/java/io/onedev/server/security/permission/RunJob.java
@@ -8,7 +8,10 @@ public class RunJob implements BasePermission {
@Override
public boolean implies(Permission p) {
- return p instanceof RunJob || new AccessBuildLog().implies(p);
+ return p instanceof RunJob
+ || new AccessBuildLog().implies(p)
+ || new AccessBuildPipeline().implies(p)
+ || new AccessBuildReports("*").implies(p);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
index 0d90140f43..9021dc3100 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/jobprivilege/JobPrivilegeListEditPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.editable.jobprivilege;
+import com.google.common.base.Joiner;
import io.onedev.server.model.support.role.JobPrivilege;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -76,7 +77,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
List<IColumn<JobPrivilege, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
@@ -88,18 +89,18 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
tag.setName("svg");
tag.put("class", "icon drag-indicator");
}
-
+
});
}
-
+
@Override
public String getCssClass() {
return "minimum actions";
}
-
+
});
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("Job Names")) {
+ columns.add(new AbstractColumn<>(Model.of("Job Names")) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
@@ -107,25 +108,30 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
}
});
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("Privilege")) {
+ columns.add(new AbstractColumn<>(Model.of("Privilege")) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
JobPrivilege privilege = rowModel.getObject();
- if (privilege.isManageJob())
- cellItem.add(new Label(componentId, "Manage Job"));
- else if (privilege.isRunJob())
- cellItem.add(new Label(componentId, "Run Job"));
- else if (privilege.isAccessLog())
- cellItem.add(new Label(componentId, "Access Log"));
- else if (privilege.getAccessibleReports() != null)
- cellItem.add(new Label(componentId, "Access Reports: " + privilege.getAccessibleReports()));
- else
- cellItem.add(new Label(componentId, "Access Artifacts"));
+ if (privilege.isManageJob()) {
+ cellItem.add(new Label(componentId, "manage job"));
+ } else if (privilege.isRunJob()) {
+ cellItem.add(new Label(componentId, "run job"));
+ } else {
+ var accessibles = new ArrayList<>();
+ if (privilege.isAccessLog())
+ accessibles.add("log");
+ if (privilege.isAccessPipeline())
+ accessibles.add("pipeline");
+ accessibles.add("artifacts");
+ if (privilege.getAccessibleReports() != null)
+ accessibles.add("reports:" + privilege.getAccessibleReports());
+ cellItem.add(new Label(componentId, "access [" + Joiner.on(", ").join(accessibles) + "]"));
+ }
}
});
- columns.add(new AbstractColumn<JobPrivilege, Void>(Model.of("")) {
+ columns.add(new AbstractColumn<>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {
@@ -151,7 +157,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
};
}
-
+
});
fragment.add(new AjaxLink<Void>("delete") {
@@ -168,7 +174,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
onPropertyUpdating(target);
target.add(JobPrivilegeListEditPanel.this);
}
-
+
});
cellItem.add(fragment);
}
@@ -177,21 +183,21 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {
public String getCssClass() {
return "actions";
}
-
+
});
- IDataProvider<JobPrivilege> dataProvider = new ListDataProvider<JobPrivilege>() {
+ IDataProvider<JobPrivilege> dataProvider = new ListDataProvider<>() {
@Override
protected List<JobPrivilege> getData() {
- return privileges;
+ return privileges;
}
};
DataTable<JobPrivilege, Void> dataTable;
- add(dataTable = new DataTable<JobPrivilege, Void>("privileges", columns, dataProvider, Integer.MAX_VALUE));
- dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ add(dataTable = new DataTable<>("privileges", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<>(dataTable, null));
dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
dataTable.add(new NoRecordsBehavior());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 42e726b889..b85b60ece2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -460,9 +460,9 @@ public abstract class BuildDetailPage extends ProjectPage
});
}
- if (SecurityUtils.canReadCode(getProject()))
+ if (SecurityUtils.canAccessPipeline(getBuild()))
tabs.add(new BuildTab("Pipeline", BuildPipelinePage.class));
-
+
if (SecurityUtils.canManageBuild(getBuild()) || getBuild().getRootArtifacts().size() != 0) {
tabs.add(new BuildTab("Artifacts", BuildArtifactsPage.class));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java
index c0c9e82d8f..69418c5b14 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java
@@ -26,7 +26,7 @@ public class BuildDashboardPage extends BuildDetailPage {
PageProvider pageProvider;
if (SecurityUtils.canAccessLog(getBuild())) {
pageProvider = new PageProvider(BuildLogPage.class, BuildLogPage.paramsOf(getBuild()));
- } else if (SecurityUtils.canReadCode(getProject())) {
+ } else if (SecurityUtils.canAccessPipeline(getBuild())) {
pageProvider = new PageProvider(BuildPipelinePage.class, BuildPipelinePage.paramsOf(getBuild()));
} else {
Long projectId = getBuild().getProject().getId();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java
index d76abc56f4..d5fb5db2b5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java
@@ -1,11 +1,5 @@
package io.onedev.server.web.page.project.builds.detail.pipeline;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
-
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
@@ -13,6 +7,11 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.job.jobinfo.JobInfoButton;
import io.onedev.server.web.component.pipeline.PipelinePanel;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
+
+import java.util.List;
@SuppressWarnings("serial")
public class BuildPipelinePage extends BuildDetailPage {
@@ -23,7 +22,7 @@ public class BuildPipelinePage extends BuildDetailPage {
@Override
protected boolean isPermitted() {
- return SecurityUtils.canReadCode(getBuild().getProject());
+ return SecurityUtils.canAccessPipeline(getBuild());
}
@Override