The Unified and Autonomous Development Platform
feat: Make all jobs accessible if a project is authorized (OD-2861)
Robin Shena6ddd0c811f6
diff --git a/server-core/src/main/java/io/onedev/server/ai/PullRequestHelper.java b/server-core/src/main/java/io/onedev/server/ai/PullRequestHelper.javaindex 1c194b5899..ec93b0549f 100644--- a/server-core/src/main/java/io/onedev/server/ai/PullRequestHelper.java+++ b/server-core/src/main/java/io/onedev/server/ai/PullRequestHelper.java@@ -35,7 +35,6 @@ import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.CodeCommentService;import io.onedev.server.service.PullRequestService;import io.onedev.server.service.UrlService;@@ -116,7 +115,6 @@ public class PullRequestHelper {public static List<Map<String, Object>> getBuilds(Project currentProject, PullRequest pullRequest) {var builds = new ArrayList<Map<String, Object>>();pullRequest.getCurrentBuilds().stream()- .filter(it -> SecurityUtils.canAccessJob(pullRequest.getTargetProject(), it.getJobName())).forEach(it -> {var summary = BuildHelper.getSummary(currentProject, it);summary.put("link", getUrlService().urlFor(it, true));diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.javaindex 7802141161..21ac3a34b8 100644--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java@@ -1873,7 +1873,7 @@ public class TodResource {var buildReference = BuildReference.of(referenceString, currentProject);var build = buildService.find(buildReference.getProject(), buildReference.getNumber());if (build != null) {- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException("No permission to access build: " + referenceString);return build;} else {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.javaindex 62a1d42f29..1518c8f598 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunProjectJobAction.java@@ -154,7 +154,7 @@ public class RunProjectJobAction extends PostBuildAction implements ValidatableProject project = getInputProject();List<String> jobNames = new ArrayList<>();if (project != null) {- jobNames.addAll(getBuildService().getAccessibleJobNames(SecurityUtils.getSubject(), project));+ jobNames.addAll(getBuildService().getJobNames(project));Collections.sort(jobNames);}return jobNames;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.javaindex d7c66b9649..bcb1518ac9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java@@ -11,7 +11,6 @@ import io.onedev.server.annotation.ChoiceProvider;import io.onedev.server.annotation.Editable;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.BuildService;import io.onedev.server.util.EditContext;@@ -50,7 +49,7 @@ public class LastFinishedBuild implements BuildProvider {Project project = ProjectDependency.getInputProject(EditContext.get(1));List<String> jobNames = new ArrayList<>();if (project != null) {- jobNames.addAll(OneDev.getInstance(BuildService.class).getAccessibleJobNames(SecurityUtils.getSubject(), project));+ jobNames.addAll(OneDev.getInstance(BuildService.class).getJobNames(project));Collections.sort(jobNames);}return jobNames;diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.javaindex 9957df7e07..7d51cbfb27 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java@@ -139,8 +139,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.CodePullAuthorizationSource;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.security.permission.AccessBuild;-import io.onedev.server.security.permission.JobPermission;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.service.AccessTokenService;import io.onedev.server.service.BuildService;@@ -420,9 +419,9 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthorizthrow new ExplicitException(errorMessage);}- JobPermission jobPermission = new JobPermission(dependencyBuild.getJobName(), new AccessBuild());- if (!dependencyProject.isPermittedByLoginUser(jobPermission)- && !subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {+ AccessProject projectPermission = new AccessProject();+ if (!dependencyProject.isPermittedByLoginUser(projectPermission)+ && !subject.isPermitted(new ProjectPermission(dependencyProject, projectPermission))) {throw new ExplicitException("Unable to access dependency build '"+ dependencyBuild.getReference().toString(null) + "': permission denied");}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex a186c49053..a97efd2649 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -2021,14 +2021,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelpublic Collection<Long> parseFixedIssueIds(String commitMessage) {return OneDev.getInstance(IssueService.class).parseFixedIssueIds(this, commitMessage);}-- public Collection<Project> getTree() {- List<Project> projects = Lists.newArrayList(this);- projects.addAll(getDescendants());- projects.addAll(getAncestors());- return projects;- }-+public MediaType detectMediaType(BlobIdent blobIdent) {Blob blob = getBlob(blobIdent, true);if (blob.getLfsPointer() != null) {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.javaindex dc01cbdb57..92101b65d8 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@@ -36,7 +36,6 @@ import io.onedev.server.model.support.role.CodePrivilege;import io.onedev.server.model.support.role.IssueFieldSet;import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.model.support.role.PackPrivilege;-import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.AccessBuildPipeline;import io.onedev.server.security.permission.AccessBuildReports;@@ -389,7 +388,9 @@ public class Role extends AbstractEntity implements BasePermission {this.uploadCache = uploadCache;}- @Editable(order=700)+ @Editable(order=700, name="Additional Job Privileges", description="""+ By default, users can access artifacts from all jobs. To assign additional privileges to specific jobs, \+ specify them here.""")@DependsOn(property="manageBuilds", value="false")public List<JobPrivilege> getJobPrivileges() {return jobPrivileges;@@ -465,7 +466,6 @@ public class Role extends AbstractEntity implements BasePermission {if (uploadCache)permissions.add(new UploadCache());for (var jobPrivilege: jobPrivileges) {- permissions.add(new JobPermission(jobPrivilege.getJobNames(), new AccessBuild()));if (jobPrivilege.isManageJob())permissions.add(new JobPermission(jobPrivilege.getJobNames(), new ManageJob()));if (jobPrivilege.isRunJob())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.javaindex 1ec06c421b..de4d9e8fbe 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@@ -33,8 +33,7 @@ public class JobPrivilege implements Serializable {private String accessibleReports;@Editable(order=100, description="Specify space-separated jobs. Use '*' or '?' for wildcard match. "- + "Prefix with '-' to exclude. <b class='text-danger'>NOTE: </b> Permission to access build artifacts "- + "will be granted implicitly in matched jobs even if no other permissions are specified here")+ + "Prefix with '-' to exclude")@Patterns(suggester = "suggestJobNames")@NotEmptypublic String getJobNames() {diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex bbe7caee53..d9b01bafc5 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -35,8 +35,7 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.search.entity.build.BuildQuery;-import io.onedev.server.security.permission.AccessBuild;-import io.onedev.server.security.permission.JobPermission;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.service.SettingService;import io.onedev.server.service.UrlService;@@ -148,8 +147,7 @@ public class BuildNotificationManager implements Serializable {}for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {User user = entry.getKey();- Permission permission = new ProjectPermission(build.getProject(),- new JobPermission(build.getJobName(), new AccessBuild()));+ Permission permission = new ProjectPermission(build.getProject(), new AccessProject());if (user.asSubject().isPermitted(permission)) {for (String queryString: entry.getValue()) {User.push(user);@@ -192,8 +190,7 @@ public class BuildNotificationManager implements Serializable {for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {User user = entry.getKey();- Permission permission = new ProjectPermission(build.getProject(),- new JobPermission(build.getJobName(), new AccessBuild()));+ Permission permission = new ProjectPermission(build.getProject(), new AccessProject());if (user.asSubject().isPermitted(permission)) {for (String queryString: entry.getValue()) {User.push(user);diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.javaindex 32af18e34f..31a6609b97 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java@@ -76,7 +76,7 @@ public class ArtifactResource {public ArtifactInfo getArtifactInfo(@PathParam("buildId") Long buildId,@PathParam("artifactPath") @Api(example = "/path/to/directoryOrFile") String artifactPath) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();return buildService.getArtifactInfo(build, normalizeArtifactPath(artifactPath));}@@ -88,7 +88,7 @@ public class ArtifactResource {public StreamingOutput downloadArtifact(@PathParam("buildId") Long buildId,@PathParam("artifactPath") @Api(example = "path/to/file") String artifactPath) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();var projectId = build.getProject().getId();diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.javaindex c757213abe..397c802e3d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java@@ -61,7 +61,7 @@ public class BuildResource {@GETpublic Build getBuild(@PathParam("buildId") Long buildId) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();return build;}@@ -71,7 +71,7 @@ public class BuildResource {@GETpublic Collection<BuildLabel> getLabels(@PathParam("buildId") Long buildId) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();return build.getLabels();}@@ -81,7 +81,7 @@ public class BuildResource {@GETpublic Collection<BuildParam> getParams(@PathParam("buildId") Long buildId) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();List<BuildParam> params = SerializationUtils.clone(new ArrayList<>(build.getParams()));@@ -98,7 +98,7 @@ public class BuildResource {@GETpublic Collection<BuildDependence> getDependencies(@PathParam("buildId") Long buildId) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();return build.getDependencies();}@@ -108,7 +108,7 @@ public class BuildResource {@GETpublic Collection<BuildDependence> getDependents(@PathParam("buildId") Long buildId) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();return build.getDependents();}@@ -118,7 +118,7 @@ public class BuildResource {@GETpublic Collection<Long> getFixedIssueIds(@PathParam("buildId") Long buildId) {Build build = buildService.load(buildId);- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();return build.getFixedIssueIds();}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 27003afe65..fa9586b286 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -52,16 +52,16 @@ public class FixedIssueCriteria extends Criteria<Build> {BuildService buildService = OneDev.getInstance(BuildService.class);Path<Long> attribute = from.get(Build.PROP_NUMBER);List<Predicate> predicates = new ArrayList<>();- issue.getProject().getTree().stream().filter(it->it.isCodeManagement()).forEach(it-> {- Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(it.getId(), issue.getId(), true);- Collection<String> descendants = new HashSet<>();- for (ObjectId each: getCommitInfoManager().getDescendants(it.getId(), fixCommits))- descendants.add(each.name());- Collection<Long> inBuildNumbers = buildService.filterNumbers(it.getId(), descendants);- predicates.add(builder.and(- builder.equal(from.get(Build.PROP_PROJECT), it),- forManyValues(builder, attribute, inBuildNumbers, buildService.getNumbers(it.getId()))));- });++ Project project = issue.getProject();+ Collection<ObjectId> fixCommits = getCommitInfoManager().getFixCommits(project.getId(), issue.getId(), true);+ Collection<String> descendants = new HashSet<>();+ for (ObjectId each: getCommitInfoManager().getDescendants(project.getId(), fixCommits))+ descendants.add(each.name());+ Collection<Long> inBuildNumbers = buildService.filterNumbers(project.getId(), descendants);+ predicates.add(builder.and(+ builder.equal(from.get(Build.PROP_PROJECT), project),+ forManyValues(builder, attribute, inBuildNumbers, buildService.getNumbers(project.getId()))));if (!predicates.isEmpty())return builder.or(predicates.toArray(new Predicate[0]));else@@ -71,7 +71,7 @@ public class FixedIssueCriteria extends Criteria<Build> {@Overridepublic boolean matches(Build build) {Collection<ObjectId> fixCommits = getCommitInfoManager()- .getFixCommits(build.getProject().getId(), issue.getId(), true);+ .getFixCommits(build.getProject().getId(), issue.getId(), true);GitService gitService = OneDev.getInstance(GitService.class);for (ObjectId commit: fixCommits) {ObjectId buildCommit = ObjectId.fromString(build.getCommitHash());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex 5aebc7f141..0a752d43da 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java@@ -43,9 +43,7 @@ public class IncludesIssueCriteria extends Criteria<PullRequest> {public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from,CriteriaBuilder builder) {Collection<Long> pullRequestIds = new HashSet<>();- issue.getProject().getTree().stream().filter(it->it.isCodeManagement()).forEach(it-> {- pullRequestIds.addAll(getPullRequestIds(it));- });+ pullRequestIds.addAll(getPullRequestIds(issue.getProject()));if (!pullRequestIds.isEmpty())return from.get(PullRequest.PROP_ID).in(pullRequestIds);elsediff --git a/server-core/src/main/java/io/onedev/server/security/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex e729475778..50f2a8cc4a 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@@ -48,7 +48,6 @@ import io.onedev.server.model.Role;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.Workspace;-import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.AccessBuildPipeline;import io.onedev.server.security.permission.AccessBuildReports;@@ -60,9 +59,9 @@ import io.onedev.server.security.permission.ConfidentialIssuePermission;import io.onedev.server.security.permission.CreateChildren;import io.onedev.server.security.permission.CreateRootProjects;import io.onedev.server.security.permission.CreateWorkspaces;+import io.onedev.server.security.permission.EditFieldsOfOtherIssues;import io.onedev.server.security.permission.EditIssueField;import io.onedev.server.security.permission.EditIssueLink;-import io.onedev.server.security.permission.EditFieldsOfOtherIssues;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.security.permission.ManageBuilds;import io.onedev.server.security.permission.ManageCodeComments;@@ -541,16 +540,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {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());- }-- public static boolean canAccessJob(Project project, String jobName) {- return getSubject().isPermitted(new ProjectPermission(project,- new JobPermission(jobName, new AccessBuild())));- }-+public static boolean canReadPack(Project project) {return getSubject().isPermitted(new ProjectPermission(project, new ReadPack()));}@@ -842,66 +832,6 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {return filterApplicableUsers(authorizedUsers, permission);}- private static void populateAccessibleJobNames(Collection<String> accessibleJobNames,- Collection<String> availableJobNames, Role role) {- for (String jobName: availableJobNames) {- if (role.implies(new JobPermission(jobName, new AccessBuild())))- accessibleJobNames.add(jobName);- }- }-- public static Collection<String> getAccessibleJobNames(Project project, Collection<String> availableJobNames) {- return getAccessibleJobNames(getSubject(), project, availableJobNames);- }-- public static Collection<String> getAccessibleJobNames(Subject subject, Project project, Collection<String> availableJobNames) {- Collection<String> accessibleJobNames = new HashSet<>();- if (subject.isPermitted(new SystemAdministration())) {- accessibleJobNames.addAll(availableJobNames);- } else {- String principal = (String) subject.getPrincipal();- var user = getAuthUser(principal);- if (user != null) {- for (UserAuthorization authorization: user.getProjectAuthorizations()) {- if (authorization.getProject().isSelfOrAncestorOf(project)) {- populateAccessibleJobNames(accessibleJobNames, availableJobNames,- authorization.getRole());- }- }-- for (Group group: user.getGroups()) {- for (GroupAuthorization authorization: group.getAuthorizations()) {- if (authorization.getProject().isSelfOrAncestorOf(project)) {- populateAccessibleJobNames(accessibleJobNames, availableJobNames,- authorization.getRole());- }- }- }- }-- var accessToken = getAccessToken(principal);- if (accessToken != null) {- for (var authorization: accessToken.getAuthorizations()) {- if (authorization.getProject().isSelfOrAncestorOf(project)) {- populateAccessibleJobNames(accessibleJobNames, availableJobNames,- authorization.getRole());- }- }- }-- if (!isAnonymous(principal) || getSettingService().getSecuritySetting().isEnableAnonymousAccess()) {- Project current = project;- do {- for (var authorization: current.getBaseAuthorizations()) {- populateAccessibleJobNames(accessibleJobNames, availableJobNames, authorization.getRole());- }- current = current.getParent();- } while (current != null);- }- }- return accessibleJobNames;- }-private static void populateAccessibleReportNames(Map<String, Collection<String>> accessibleReportNames,Map<String, Collection<String>> availableReportNames, Project project, Role role) {for (Map.Entry<String, Collection<String>> entry: availableReportNames.entrySet()) {diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuild.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuild.javadeleted file mode 100644index f2d8e449e7..0000000000--- a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuild.java+++ /dev/null@@ -1,19 +0,0 @@-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 AccessBuild implements BasePermission {-- @Override- public boolean implies(Permission p) {- return p instanceof AccessBuild;- }-- @Override- public boolean isApplicable(@Nullable UserFacade user) {- return true;- }--}diff --git a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.javaindex e215b7c3b9..6f18d09ea7 100644--- a/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java+++ b/server-core/src/main/java/io/onedev/server/security/permission/AccessBuildReports.java@@ -27,7 +27,7 @@ public class AccessBuildReports implements BasePermission {AccessBuildReports accessBuildReports = (AccessBuildReports) p;return getReportPatterns().matches(new StringMatcher(), accessBuildReports.reportNames);} else {- return new AccessBuild().implies(p);+ return new AccessProject().implies(p);}}diff --git a/server-core/src/main/java/io/onedev/server/service/BuildService.java b/server-core/src/main/java/io/onedev/server/service/BuildService.javaindex 31a7739c59..1fa1fbc055 100644--- a/server-core/src/main/java/io/onedev/server/service/BuildService.java+++ b/server-core/src/main/java/io/onedev/server/service/BuildService.java@@ -85,11 +85,7 @@ public interface BuildService extends EntityService<Build> {Map<Integer, Integer> queryFrequencyStats(Subject subject, Project project, @Nullable Criteria<Build> buildCriteria,@Nullable Date startDate, @Nullable Date endDate, StatsGroup group);-- Collection<String> getAccessibleJobNames(Subject subject, Project project);-- Map<Project, Collection<String>> getAccessibleJobNames(Subject subject);-+void populateBuilds(Collection<PullRequest> requests);void delete(Collection<Build> builds);diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.javaindex 8ae258649c..0de09c31b2 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildService.java@@ -44,6 +44,7 @@ import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;+import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import javax.persistence.criteria.Selection;@@ -54,7 +55,6 @@ import org.apache.commons.lang3.tuple.Pair;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;import org.hibernate.Session;-import org.hibernate.criterion.Criterion;import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;@@ -104,6 +104,7 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.service.BuildLabelService;import io.onedev.server.service.BuildParamService;import io.onedev.server.service.BuildService;@@ -464,43 +465,22 @@ public class DefaultBuildService extends BaseEntityService<Build> implements BuiList<Build> builds = new ArrayList<>();EntityCriteria<Build> criteria = newCriteria();-- List<Criterion> projectCriterions = new ArrayList<>();- Collection<String> availableJobNames = jobNames.get(project.getId());- if (availableJobNames != null && !availableJobNames.isEmpty()) {- Collection<String> accessibleJobNames = getAccessibleJobNames(subject, project);- if (accessibleJobNames.containsAll(availableJobNames)) {- projectCriterions.add(Restrictions.eq(Build.PROP_PROJECT, project));- } else {- List<Criterion> jobCriterions = new ArrayList<>();- for (String jobName: accessibleJobNames)- jobCriterions.add(Restrictions.eq(Build.PROP_JOB_NAME, jobName));- if (!jobCriterions.isEmpty()) {- projectCriterions.add(Restrictions.and(- Restrictions.eq(Build.PROP_PROJECT, project),- Restrictions.or(jobCriterions.toArray(new Criterion[0]))));- }- }- }+ criteria.add(Restrictions.eq(Build.PROP_PROJECT, project));- if (!projectCriterions.isEmpty()) {- criteria.add(Restrictions.or(projectCriterions.toArray(new Criterion[0])));-- if (fuzzyQuery.length() != 0) {- try {- long buildNumber = Long.parseLong(fuzzyQuery);- criteria.add(Restrictions.eq(Build.PROP_NUMBER, buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike(Build.PROP_VERSION, fuzzyQuery, MatchMode.ANYWHERE),- Restrictions.ilike(Build.PROP_JOB_NAME, fuzzyQuery, MatchMode.ANYWHERE)));- }+ if (fuzzyQuery.length() != 0) {+ try {+ long buildNumber = Long.parseLong(fuzzyQuery);+ criteria.add(Restrictions.eq(Build.PROP_NUMBER, buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike(Build.PROP_VERSION, fuzzyQuery, MatchMode.ANYWHERE),+ Restrictions.ilike(Build.PROP_JOB_NAME, fuzzyQuery, MatchMode.ANYWHERE)));}+ }- criteria.addOrder(Order.desc(Build.PROP_PROJECT));- criteria.addOrder(Order.desc(Build.PROP_NUMBER));- builds.addAll(query(criteria, 0, count));- }+ criteria.addOrder(Order.desc(Build.PROP_PROJECT));+ criteria.addOrder(Order.desc(Build.PROP_NUMBER));+ builds.addAll(query(criteria, 0, count));return builds;}@@ -608,46 +588,16 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Buiif (project != null) {predicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));- if (!SecurityUtils.canManageBuilds(subject, project)) {- Collection<String> accessibleJobNames = getAccessibleJobNames(subject, project);- Collection<String> availableJobNames = jobNames.get(project.getId());- if (availableJobNames != null && !accessibleJobNames.containsAll(availableJobNames)) {- List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: accessibleJobNames)- jobPredicates.add(builder.equal(root.get(Build.PROP_JOB_NAME), jobName));- predicates.add(builder.or(jobPredicates.toArray(new Predicate[0])));- }- }} else if (!SecurityUtils.isAdministrator(subject)) {- List<Predicate> projectPredicates = new ArrayList<>();- Collection<Long> projectsWithAllJobs = new HashSet<>();- for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(subject).entrySet()) {- project = entry.getKey();- if (SecurityUtils.canManageBuilds(subject, project)) {- projectPredicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));- projectsWithAllJobs.add(project.getId());- } else {- Collection<String> availableJobNamesOfProject = jobNames.get(project.getId());- if (availableJobNamesOfProject != null) {- Collection<String> accessibleJobNamesOfProject = entry.getValue();- if (accessibleJobNamesOfProject.containsAll(availableJobNamesOfProject)) {- projectsWithAllJobs.add(project.getId());- projectPredicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));- } else {- List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: accessibleJobNamesOfProject)- jobPredicates.add(builder.equal(root.get(Build.PROP_JOB_NAME), jobName));- projectPredicates.add(builder.and(- builder.equal(root.get(Build.PROP_PROJECT), project),- builder.or(jobPredicates.toArray(new Predicate[0]))));- }- } else {- projectsWithAllJobs.add(project.getId());- }- }+ Collection<Project> projects = SecurityUtils.getAuthorizedProjects(subject, new AccessProject());+ if (!projects.isEmpty()) {+ Path<Long> projectIdPath = root.get(Build.PROP_PROJECT).get(Project.PROP_ID);+ predicates.add(Criteria.forManyValues(builder, projectIdPath,+ projects.stream().map(it -> it.getId()).collect(Collectors.toSet()),+ projectService.getIds()));+ } else {+ predicates.add(builder.disjunction());}- if (!projectsWithAllJobs.containsAll(jobNames.keySet()))- predicates.add(builder.or(projectPredicates.toArray(new Predicate[0])));}return predicates;@@ -1013,27 +963,6 @@ public class DefaultBuildService extends BaseEntityService<Build> implements Buireturn jobNames;}- @Override- public Map<Project, Collection<String>> getAccessibleJobNames(Subject subject) {- Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();- for (Long projectId: jobNames.keySet()) {- Project project = projectService.load(projectId);- Collection<String> accessibleJobNamsOfProject = getAccessibleJobNames(subject, project);- if (!accessibleJobNamsOfProject.isEmpty())- accessibleJobNames.put(project, accessibleJobNamsOfProject);- }- return accessibleJobNames;- }-- @Override- public Collection<String> getAccessibleJobNames(Subject subject, Project project) {- Collection<String> availableJobNames = jobNames.get(project.getId());- if (availableJobNames != null)- return SecurityUtils.getAccessibleJobNames(subject, project, availableJobNames);- else- return new HashSet<>();- }-@Overridepublic void populateBuilds(Collection<PullRequest> requests) {CriteriaBuilder builder = getSession().getCriteriaBuilder();diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.javaindex aba76f0ec2..d2b72b1606 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueService.java@@ -1273,10 +1273,10 @@ public class DefaultIssueService extends BaseEntityService<Issue> implements Isspublic Collection<Long> parseFixedIssueIds(Project project, String commitMessage) {Collection<Long> issueIds = new HashSet<>();- for (var reference: getIssueSetting().getCommitMessageFixSetting().parseFixedIssues(commitMessage, project)) {- var referenceProject = reference.getProject();- if (referenceProject.isSelfOrAncestorOf(project) || project.isSelfOrAncestorOf(referenceProject)) {- Long issueId = getIssueId(referenceProject.getId(), reference.getNumber());+ for (var issueReference: getIssueSetting().getCommitMessageFixSetting().parseFixedIssues(commitMessage, project)) {+ var referenceProject = issueReference.getProject();+ if (referenceProject.equals(project)) {+ Long issueId = getIssueId(referenceProject.getId(), issueReference.getNumber());if (issueId != null)issueIds.add(issueId);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.javaindex 9ed7465e34..d69780a6b8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java@@ -42,7 +42,6 @@ import io.onedev.server.search.entity.build.SubmittedByUserCriteria;import io.onedev.server.search.entity.build.SuccessfulCriteria;import io.onedev.server.search.entity.build.TimedOutCriteria;import io.onedev.server.search.entity.build.WaitingCriteria;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.AgentService;import io.onedev.server.service.BuildService;import io.onedev.server.service.LabelSpecService;@@ -143,8 +142,7 @@ abstract class BuildFilterPanel extends FilterEditPanel<Build> {@Overrideprotected List<String> load() {- var subject = SecurityUtils.getSubject();- var jobNames = new ArrayList<>(getBuildService().getAccessibleJobNames(subject, getProject()));+ var jobNames = new ArrayList<>(getBuildService().getJobNames(getProject()));Collections.sort(jobNames);return jobNames;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.htmlindex 88931c4d69..d661dc4117 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html@@ -10,6 +10,5 @@<div wicket:id="detail"></div></div></div>- <div wicket:id="note" class="small text-warning m-3"><wicket:svg href="info-circle" class="icon mr-1"/> <wicket:t>Some jobs are hidden due to permission policy</wicket:t></div></div></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.javaindex 50f5c36b96..42a24c0124 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java@@ -30,7 +30,6 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.BuildService;import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.util.ProjectScopedCommitAware;@@ -50,21 +49,7 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitAprivate final String refName;private final List<Job> jobs;-- private final IModel<List<Job>> accessibleJobsModel = new LoadableDetachableModel<List<Job>>() {-- @Override- protected List<Job> load() {- List<Job> accessibleJobs = new ArrayList<>();- for (Job job: jobs) {- if (SecurityUtils.canAccessJob(getProject(), job.getName()))- accessibleJobs.add(job);- }- return accessibleJobs;- }- };-public JobListPanel(String id, ObjectId commitId, @Nullable String refName, List<Job> jobs) {super(id);this.commitId = commitId;@@ -82,20 +67,10 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitA@Overrideprotected void onInitialize() {super.onInitialize();-- add(new WebMarkupContainer("note") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(accessibleJobsModel.getObject().size() != jobs.size());- }-- });-+RepeatingView jobsView = new RepeatingView("jobs");add(jobsView);- for (Job job: accessibleJobsModel.getObject()) {+ for (Job job: jobs) {WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());Status status = getProject().getCommitStatuses(commitId, getPullRequest(), refName).get(job.getName());@@ -173,12 +148,6 @@ public abstract class JobListPanel extends Panel implements ProjectScopedCommitAreturn Sets.newHashSet(Build.getCommitStatusChangeObservable(getProject().getId(), commitId.name()));}- @Override- protected void onDetach() {- accessibleJobsModel.detach();- super.onDetach();- }-@Overrideprotected void onConfigure() {super.onConfigure();diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 6c466f5ac5..65e8e441f3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -260,7 +260,7 @@ public class MarkdownViewer extends GenericPanel<String> {reference = BuildReference.of(referenceId, null);var build = buildService.find(reference.getProject(), reference.getNumber());// check permission here as build project may not be the same as current project- if (build != null && SecurityUtils.canAccessBuild(build)) {+ if (build != null && SecurityUtils.canAccessProject(build.getProject())) {String iconHref = SpriteImage.getVersionedHref(BuildStatusIcon.getIconHref(build.getStatus()));String iconCss = BuildStatusIcon.getIconClass(build.getStatus());diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.javaindex 4ee89a9397..57b59c84e4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java@@ -84,7 +84,7 @@ public abstract class PackSidePanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(SecurityUtils.canAccessBuild(build));+ setEnabled(SecurityUtils.canAccessProject(build.getProject()));}};add(buildLink);diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.javaindex 37009ddd5a..573a0b3cc4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java@@ -1,17 +1,20 @@package io.onedev.server.web.component.pullrequest.build;-import com.google.common.collect.Sets;-import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.model.Build;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.behavior.ChangeObserver;-import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;-import io.onedev.server.web.component.build.status.BuildStatusIcon;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import static io.onedev.server.model.Build.NAME_COMMIT;+import static io.onedev.server.model.Build.NAME_JOB;+import static io.onedev.server.model.Build.NAME_PULL_REQUEST;+import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;+import static io.onedev.server.search.entity.build.BuildQueryLexer.And;+import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;+import static io.onedev.server.util.criteria.Criteria.quote;+import static java.util.Comparator.comparing;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.List;+import java.util.stream.Collectors;+import org.apache.wicket.Component;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -26,15 +29,19 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;-import java.util.*;-import java.util.stream.Collectors;+import com.google.common.collect.Sets;-import static io.onedev.server.model.Build.*;-import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;-import static io.onedev.server.search.entity.build.BuildQueryLexer.And;-import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;-import static io.onedev.server.util.criteria.Criteria.quote;-import static java.util.Comparator.*;+import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.model.Build;+import io.onedev.server.model.Build.Status;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.web.behavior.ChangeObserver;+import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;+import io.onedev.server.web.component.build.status.BuildStatusIcon;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInfo>> {@@ -52,12 +59,10 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInfmap.computeIfAbsent(build.getJobName(), k -> new ArrayList<>()).add(build);for (var entry : map.entrySet()) {var jobName = entry.getKey();- if (SecurityUtils.canAccessJob(getPullRequest().getTargetProject(), jobName)) {- var builds = new ArrayList<>(entry.getValue());- Collections.sort(builds);- var required = getPullRequest().getBuildRequirement().getRequiredJobs().contains(jobName);- listOfJobBuildInfo.add(new JobBuildInfo(jobName, required, builds));- }+ var builds = new ArrayList<>(entry.getValue());+ Collections.sort(builds);+ var required = getPullRequest().getBuildRequirement().getRequiredJobs().contains(jobName);+ listOfJobBuildInfo.add(new JobBuildInfo(jobName, required, builds));}Collections.sort(listOfJobBuildInfo, comparing((JobBuildInfo o) -> o.getBuilds().iterator().next().getId()));return listOfJobBuildInfo;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.javaindex cee6c79efe..9473fd85fc 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@@ -116,7 +116,7 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {}});- columns.add(new AbstractColumn<>(Model.of(_T("Privilege"))) {+ columns.add(new AbstractColumn<>(Model.of(_T("Additional Privileges"))) {@Overridepublic void populateItem(Item<ICellPopulator<JobPrivilege>> cellItem, String componentId, IModel<JobPrivilege> rowModel) {@@ -131,10 +131,12 @@ class JobPrivilegeListEditPanel extends PropertyEditor<List<Serializable>> {accessibles.add(_T("log"));if (privilege.isAccessPipeline())accessibles.add(_T("pipeline"));- accessibles.add(_T("artifacts"));if (privilege.getAccessibleReports() != null)accessibles.add(_T("reports") + ":" + privilege.getAccessibleReports());- cellItem.add(new Label(componentId, MessageFormat.format(_T("access [{0}]"), Joiner.on(", ").join(accessibles))));+ if (accessibles.isEmpty())+ cellItem.add(new Label(componentId, _T("<i>None</i>")).setEscapeModelStrings(false));+ else+ cellItem.add(new Label(componentId, MessageFormat.format(_T("access [{0}]"), Joiner.on(", ").join(accessibles))));}}});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.javaindex f3fe424103..bfab091dc5 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@@ -176,7 +176,7 @@ public abstract class BuildDetailPage extends ProjectPage@Overrideprotected boolean isPermitted() {- return SecurityUtils.canAccessBuild(getBuild());+ return SecurityUtils.canAccessProject(getBuild().getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.javaindex c7ebb91832..9801633fdd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java@@ -105,7 +105,7 @@ public class InvalidBuildPage extends ProjectPage {@Overrideprotected boolean isPermitted() {- return SecurityUtils.canAccessBuild(getBuild());+ return SecurityUtils.canAccessProject(getBuild().getProject());}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 9fd2c546a7..c01aa8a7ca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -464,10 +464,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationStry {BuildSpec buildSpec = getProject().getBuildSpec(getCommit().copy());if (buildSpec != null) {- for (Job job : buildSpec.getJobMap().values()) {- if (SecurityUtils.canAccessJob(getProject(), job.getName()))- jobs.add(job);- }+ jobs.addAll(buildSpec.getJobMap().values());}} catch (Exception e) {logger.error("Error retrieving build spec (project: {}, commit: {})",diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 176d0978f0..cf5e1d76c9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -171,9 +171,6 @@<div class="jobs"><div class="head"><wicket:t>Jobs</wicket:t>- <span wicket:id="hiddenJobsNote" class="warning ml-2" t:data-tippy-content="Some jobs are hidden due to permission policy">- <wicket:svg href="exclamation-circle-o" class="icon"/>- </span></div><div wicket:id="jobs" class="body"></div><div wicket:id="jobsHelp" class="font-size-sm text-muted form-text"><wicket:t>Jobs marked with <span class="text-danger">*</span> are required to be successful</wicket:t></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 90a4aa208b..511caef4ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -21,7 +21,6 @@ import java.util.HashMap;import java.util.List;import java.util.Set;import java.util.concurrent.atomic.AtomicBoolean;-import java.util.stream.Collectors;import javax.inject.Inject;import javax.persistence.EntityNotFoundException;@@ -74,8 +73,8 @@ import io.onedev.server.ai.ChatTool;import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.TaskTool;import io.onedev.server.ai.ToolUtils;-import io.onedev.server.ai.tools.pullrequest.GetPullRequestComments;import io.onedev.server.ai.tools.pullrequest.GetPullRequest;+import io.onedev.server.ai.tools.pullrequest.GetPullRequestComments;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.data.migration.VersionedXmlDoc;@@ -1071,24 +1070,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsetVisible(getPullRequest().isOpen() && SecurityUtils.canModifyPullRequest(getPullRequest()));}- });- fragment.add(new WebMarkupContainer("hiddenJobsNote") {-- @Override- protected void onConfigure() {- super.onConfigure();-- boolean hasHiddenJobs = false;- for (String jobName: getPullRequest().getCurrentBuilds().stream()- .map(it->it.getJobName()).collect(Collectors.toSet())) {- if (!SecurityUtils.canAccessJob(getProject(), jobName)) {- hasHiddenJobs = true;- break;- }- }- setVisible(hasHiddenJobs);- }-});fragment.add(new PullRequestJobsPanel("jobs") {@@ -1104,15 +1085,14 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();- boolean hasVisibleRequiredJobs = false;+ boolean hasRequiredJobs = false;for (Build build: getPullRequest().getCurrentBuilds()) {- if (getPullRequest().getBuildRequirement().getRequiredJobs().contains(build.getJobName())- && SecurityUtils.canAccessJob(getProject(), build.getJobName())) {- hasVisibleRequiredJobs = true;+ if (getPullRequest().getBuildRequirement().getRequiredJobs().contains(build.getJobName())) {+ hasRequiredJobs = true;break;}}- setVisible(hasVisibleRequiredJobs);+ setVisible(hasRequiredJobs);}});diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.javaindex 8a2952dc09..41cb0f87e4 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java@@ -88,7 +88,7 @@ public class ArtifactResource extends AbstractResource {throw new EntityNotFoundException(message);}- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();fileInfo = (FileInfo) getBuildService().getArtifactInfo(build, artifactPath);diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.javaindex e836e35972..f6a48d5a72 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java@@ -83,7 +83,7 @@ public class AttachmentResource extends AbstractResource {if (!SecurityUtils.canAccessIssue(issue))throw new UnauthorizedException();} else if ((build = OneDev.getInstance(BuildService.class).find(attachmentGroup)) != null) {- if (!SecurityUtils.canAccessBuild(build))+ if (!SecurityUtils.canAccessProject(build.getProject()))throw new UnauthorizedException();} else if (!SecurityUtils.canAccessProject(project)) {throw new UnauthorizedException();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.javaindex 888bce98c8..40c5e01bd7 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@@ -498,8 +498,7 @@ public class SuggestionUtils {}public static List<InputSuggestion> suggestJobs(Project project, String matchWith) {- List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildService.class)- .getAccessibleJobNames(SecurityUtils.getSubject(), project));+ List<String> jobNames = new ArrayList<>(OneDev.getInstance(BuildService.class).getJobNames(project));Collections.sort(jobNames);return suggest(jobNames, matchWith);}