The Unified and Autonomous Development Platform
Fix issue #1037 - Improve job executor authorization to check job name
Robin Shenffb27a8153c7
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 22c448e7c4..fdf20331ed 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -44,11 +44,12 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.git.GitUtils;import io.onedev.server.job.authorization.JobAuthorization;+import io.onedev.server.job.authorization.JobAuthorization.Context;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.util.EditContext;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;@@ -155,14 +156,17 @@ public class Job implements NamedElement, Serializable, Validatable {private static List<InputSuggestion> suggestJobExecutors(String matchWith) {List<String> applicableJobExecutors = new ArrayList<>();ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- ProjectAndBranch projectAndBranch = new ProjectAndBranch(page.getProject(), page.getBlobIdent().revision);- for (JobExecutor executor: OneDev.getInstance(SettingManager.class).getJobExecutors()) {- if (executor.isEnabled()) {- if (executor.getJobAuthorization() == null) {- applicableJobExecutors.add(executor.getName());- } else {- if (JobAuthorization.parse(executor.getJobAuthorization()).matches(projectAndBranch))+ String jobName = (String) EditContext.get().getInputValue(PROP_NAME);+ if (jobName != null) {+ Context context = new Context(page.getProject(), page.getBlobIdent().revision, jobName);+ for (JobExecutor executor: OneDev.getInstance(SettingManager.class).getJobExecutors()) {+ if (executor.isEnabled()) {+ if (executor.getJobAuthorization() == null) {applicableJobExecutors.add(executor.getName());+ } else {+ if (JobAuthorization.parse(executor.getJobAuthorization()).matches(context))+ applicableJobExecutors.add(executor.getName());+ }}}}diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 55f27ae772..81ab6133c2 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -124,6 +124,7 @@ import io.onedev.server.git.service.GitService;import io.onedev.server.git.service.RefFacade;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.job.authorization.JobAuthorization;+import io.onedev.server.job.authorization.JobAuthorization.Context;import io.onedev.server.job.log.LogManager;import io.onedev.server.job.log.LogTask;import io.onedev.server.model.Build;@@ -151,7 +152,6 @@ import io.onedev.server.terminal.WebShell;import io.onedev.server.util.CommitAware;import io.onedev.server.util.JobSecretAuthorizationContext;import io.onedev.server.util.MatrixRunner;-import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.util.schedule.SchedulableTask;@@ -489,16 +489,16 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizfor (RefFacade ref: build.getProject().getBranchRefs()) {if (descendants.contains(ref.getPeeledObj())) {- String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getName()));- if (authorization.matches(new ProjectAndBranch(build.getProject(), branchName)))+ String branch = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getName()));+ if (authorization.matches(new Context(build.getProject(), branch, build.getJobName())))return true;}}PullRequest request = build.getRequest();return request != null&& request.getSource() != null- && authorization.matches(request.getTarget())- && authorization.matches(request.getSource());+ && authorization.matches(new Context(request.getTargetProject(), request.getTargetBranch(), build.getJobName()))+ && authorization.matches(new Context(request.getSourceProject(), request.getSourceBranch(), build.getJobName()));} else {return true;}diff --git a/server-core/src/main/java/io/onedev/server/job/authorization/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/authorization/BranchCriteria.javaindex c6f97b8a47..d7f6bd554e 100644--- a/server-core/src/main/java/io/onedev/server/job/authorization/BranchCriteria.java+++ b/server-core/src/main/java/io/onedev/server/job/authorization/BranchCriteria.java@@ -8,11 +8,11 @@ import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;-import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.job.authorization.JobAuthorization.Context;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.match.WildcardUtils;-public class BranchCriteria extends Criteria<ProjectAndBranch> {+public class BranchCriteria extends Criteria<Context> {private static final long serialVersionUID = 1L;@@ -23,8 +23,8 @@ public class BranchCriteria extends Criteria<ProjectAndBranch> {}@Override- public boolean matches(ProjectAndBranch projectAndBranch) {- return WildcardUtils.matchPath(branch, projectAndBranch.getBranch());+ public boolean matches(Context context) {+ return WildcardUtils.matchPath(branch, context.getBranch());}@Override@@ -33,7 +33,7 @@ public class BranchCriteria extends Criteria<ProjectAndBranch> {}@Override- public Predicate getPredicate(CriteriaQuery<?> query, From<ProjectAndBranch, ProjectAndBranch> from,+ public Predicate getPredicate(CriteriaQuery<?> query, From<Context, Context> from,CriteriaBuilder builder) {throw new UnsupportedOperationException();}diff --git a/server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.java b/server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.javaindex bda165d4b4..d3e339a8d1 100644--- a/server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.java+++ b/server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.java@@ -20,6 +20,7 @@ import io.onedev.commons.codeassist.AntlrUtils;import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.job.authorization.JobAuthorization.Context;import io.onedev.server.job.authorization.JobAuthorizationParser.AndCriteriaContext;import io.onedev.server.job.authorization.JobAuthorizationParser.CriteriaContext;import io.onedev.server.job.authorization.JobAuthorizationParser.FieldOperatorValueCriteriaContext;@@ -29,19 +30,19 @@ import io.onedev.server.job.authorization.JobAuthorizationParser.OperatorValueCrimport io.onedev.server.job.authorization.JobAuthorizationParser.OrCriteriaContext;import io.onedev.server.job.authorization.JobAuthorizationParser.ParensCriteriaContext;import io.onedev.server.model.Build;-import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.model.Project;import io.onedev.server.util.criteria.AndCriteria;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.criteria.NotCriteria;import io.onedev.server.util.criteria.OrCriteria;-public class JobAuthorization extends Criteria<ProjectAndBranch> {+public class JobAuthorization extends Criteria<Context> {private static final long serialVersionUID = 1L;- private final Criteria<ProjectAndBranch> criteria;+ private final Criteria<Context> criteria;- public JobAuthorization(Criteria<ProjectAndBranch> criteria) {+ public JobAuthorization(Criteria<Context> criteria) {this.criteria = criteria;}@@ -68,15 +69,15 @@ public class JobAuthorization extends Criteria<ProjectAndBranch> {parser.setErrorHandler(new BailErrorStrategy());JobAuthorizationContext jobAuthorizationContext = parser.jobAuthorization();- Criteria<ProjectAndBranch> criteria = new JobAuthorizationBaseVisitor<Criteria<ProjectAndBranch>>() {+ Criteria<Context> criteria = new JobAuthorizationBaseVisitor<Criteria<Context>>() {@Override- public Criteria<ProjectAndBranch> visitParensCriteria(ParensCriteriaContext ctx) {+ public Criteria<Context> visitParensCriteria(ParensCriteriaContext ctx) {return visit(ctx.criteria()).withParens(true);}@Override- public Criteria<ProjectAndBranch> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {+ public Criteria<Context> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted(0).getText());String fieldValue = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();@@ -85,36 +86,38 @@ public class JobAuthorization extends Criteria<ProjectAndBranch> {switch (fieldName) {case Build.NAME_PROJECT:return new ProjectCriteria(fieldValue);+ case Build.NAME_JOB:+ return new JobCriteria(fieldValue);default:throw new RuntimeException("Unknown job authorization field: " + fieldName);}}@Override- public Criteria<ProjectAndBranch> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {+ public Criteria<Context> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String fieldValue = getValue(ctx.Quoted().getText());return new BranchCriteria(fieldValue);}@Override- public Criteria<ProjectAndBranch> visitOrCriteria(OrCriteriaContext ctx) {- List<Criteria<ProjectAndBranch>> childCriterias = new ArrayList<>();+ public Criteria<Context> visitOrCriteria(OrCriteriaContext ctx) {+ List<Criteria<Context>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new OrCriteria<ProjectAndBranch>(childCriterias);+ return new OrCriteria<Context>(childCriterias);}@Override- public Criteria<ProjectAndBranch> visitAndCriteria(AndCriteriaContext ctx) {- List<Criteria<ProjectAndBranch>> childCriterias = new ArrayList<>();+ public Criteria<Context> visitAndCriteria(AndCriteriaContext ctx) {+ List<Criteria<Context>> childCriterias = new ArrayList<>();for (CriteriaContext childCtx: ctx.criteria())childCriterias.add(visit(childCtx));- return new AndCriteria<ProjectAndBranch>(childCriterias);+ return new AndCriteria<Context>(childCriterias);}@Override- public Criteria<ProjectAndBranch> visitNotCriteria(NotCriteriaContext ctx) {- return new NotCriteria<ProjectAndBranch>(visit(ctx.criteria()));+ public Criteria<Context> visitNotCriteria(NotCriteriaContext ctx) {+ return new NotCriteria<Context>(visit(ctx.criteria()));}}.visit(jobAuthorizationContext.criteria());@@ -137,12 +140,12 @@ public class JobAuthorization extends Criteria<ProjectAndBranch> {}@Override- public boolean matches(ProjectAndBranch projectAndBranch) {- return criteria.matches(projectAndBranch);+ public boolean matches(Context context) {+ return criteria.matches(context);}@Override- public Predicate getPredicate(CriteriaQuery<?> query, From<ProjectAndBranch, ProjectAndBranch> from,+ public Predicate getPredicate(CriteriaQuery<?> query, From<Context, Context> from,CriteriaBuilder builder) {throw new UnsupportedOperationException();}@@ -176,4 +179,31 @@ public class JobAuthorization extends Criteria<ProjectAndBranch> {return criteria.toString();}+ public static class Context {++ private final Project project;++ private final String branch;++ private final String jobName;++ public Context(Project project, String branch, String jobName) {+ this.project = project;+ this.branch = branch;+ this.jobName = jobName;+ }++ public Project getProject() {+ return project;+ }++ public String getBranch() {+ return branch;+ }++ public String getJobName() {+ return jobName;+ }++ }}diff --git a/server-core/src/main/java/io/onedev/server/job/authorization/JobCriteria.java b/server-core/src/main/java/io/onedev/server/job/authorization/JobCriteria.javanew file mode 100644index 0000000000..cb4b119997--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/job/authorization/JobCriteria.java@@ -0,0 +1,42 @@+package io.onedev.server.job.authorization;++import static io.onedev.server.job.authorization.JobAuthorization.getRuleName;+import static io.onedev.server.job.authorization.JobAuthorizationLexer.Is;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.server.job.authorization.JobAuthorization.Context;+import io.onedev.server.model.Build;+import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.util.match.WildcardUtils;++public class JobCriteria extends Criteria<Context> {++ private static final long serialVersionUID = 1L;++ private String jobName;++ public JobCriteria(String jobName) {+ this.jobName = jobName;+ }++ @Override+ public boolean matches(Context context) {+ return WildcardUtils.matchString(jobName, context.getJobName());+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Context, Context> from,+ CriteriaBuilder builder) {+ throw new UnsupportedOperationException();+ }++ @Override+ public String toStringWithoutParens() {+ return quote(Build.NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/job/authorization/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/job/authorization/ProjectCriteria.javaindex 65f9c03446..a6427df4b0 100644--- a/server-core/src/main/java/io/onedev/server/job/authorization/ProjectCriteria.java+++ b/server-core/src/main/java/io/onedev/server/job/authorization/ProjectCriteria.java@@ -10,11 +10,11 @@ import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.commons.utils.PathUtils;-import io.onedev.server.util.ProjectAndBranch;+import io.onedev.server.job.authorization.JobAuthorization.Context;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.match.WildcardUtils;-public class ProjectCriteria extends Criteria<ProjectAndBranch> {+public class ProjectCriteria extends Criteria<Context> {private static final long serialVersionUID = 1L;@@ -25,8 +25,8 @@ public class ProjectCriteria extends Criteria<ProjectAndBranch> {}@Override- public boolean matches(ProjectAndBranch projectAndBranch) {- return WildcardUtils.matchPath(projectPath, projectAndBranch.getProject().getPath());+ public boolean matches(Context context) {+ return WildcardUtils.matchPath(projectPath, context.getProject().getPath());}@Override@@ -45,7 +45,7 @@ public class ProjectCriteria extends Criteria<ProjectAndBranch> {}@Override- public Predicate getPredicate(CriteriaQuery<?> query, From<ProjectAndBranch, ProjectAndBranch> from,+ public Predicate getPredicate(CriteriaQuery<?> query, From<Context, Context> from,CriteriaBuilder builder) {throw new UnsupportedOperationException();}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobAuthorizationBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobAuthorizationBehavior.javaindex 443484740a..f08bc29ced 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobAuthorizationBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobAuthorizationBehavior.java@@ -42,7 +42,7 @@ public class JobAuthorizationBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> match(String matchWith) {if ("criteriaField".equals(spec.getLabel())) {- List<String> fields = Lists.newArrayList(Build.NAME_PROJECT);+ List<String> fields = Lists.newArrayList(Build.NAME_PROJECT, Build.NAME_JOB);return SuggestionUtils.suggest(fields, matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);diff --git a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.javaindex 12eb786bd2..26ff5a8be2 100644--- a/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java+++ b/server-plugin/server-plugin-import-url/src/main/java/io/onedev/server/plugin/imports/url/ImportServer.java@@ -58,7 +58,7 @@ public class ImportServer implements Serializable, Validatable {}@Editable(order=200, placeholderProvider="getProjectPlaceholder",- description="Specify project to be created at OneDev side")+ description="Specify project to import into at OneDev side")public String getProject() {return project;}