Skip to content

The Unified and Autonomous Development Platform

Improvements and bugfixes:

Robin Shen558dffe4850e
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index d311fdc249..7c3af32582 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -209,7 +209,7 @@ import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;
import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;
import io.onedev.server.util.schedule.DefaultTaskScheduler;
import io.onedev.server.util.schedule.TaskScheduler;
-import io.onedev.server.util.script.ScriptContribution;
+import io.onedev.server.util.ScriptContribution;
import io.onedev.server.util.validation.ValidatorProvider;
import io.onedev.server.util.xstream.CollectionConverter;
import io.onedev.server.util.xstream.HibernateProxyConverter;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index ada696e9e1..40f3c9d163 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -20,12 +20,13 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.step.Step;
import io.onedev.server.buildspec.step.StepTemplate;
import io.onedev.server.buildspec.step.UseTemplateStep;
+import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.migration.VersionedYamlDoc;
import io.onedev.server.migration.XmlBuildSpecMigrator;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.build.JobProperty;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
@@ -164,11 +165,12 @@ public class BuildSpec implements Serializable, Validatable {
try {
BuildSpec importedBuildSpec = aImport.getBuildSpec();
RevCommit commit = aImport.getProject().getRevCommit(aImport.getRevision(), true);
- JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(aImport.getProject(), commit, null));
+ JobAuthorizationContext.push(new JobAuthorizationContext(
+ aImport.getProject(), commit, SecurityUtils.getUser(), null));
try {
importedBuildSpecs.addAll(importedBuildSpec.getImportedBuildSpecs(newProjectChain));
} finally {
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
importedBuildSpecs.add(importedBuildSpec);
} catch (Exception e) {
@@ -1456,5 +1458,6 @@ public class BuildSpec implements Serializable, Validatable {
}
}
}
- }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
index 52e14a1fef..2cf947c45a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
@@ -1,31 +1,14 @@
package io.onedev.server.buildspec;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Stack;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-
-import org.apache.shiro.subject.Subject;
-import org.eclipse.jgit.revwalk.RevCommit;
-import javax.validation.constraints.NotEmpty;
-
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
-
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
@@ -33,7 +16,6 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
@@ -41,10 +23,23 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
+import org.apache.shiro.subject.Subject;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import javax.annotation.Nullable;
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.ConstraintViolation;
+import javax.validation.ValidationException;
+import javax.validation.Validator;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Stack;
+import java.util.stream.Collectors;
@Editable
@ClassValidating
@@ -160,23 +155,8 @@ public class Import implements Serializable, Validatable {
Subject subject;
if (getAccessTokenSecret() != null) {
- JobSecretAuthorizationContext context = Preconditions.checkNotNull(JobSecretAuthorizationContext.get());
- String accessToken;
-
- if (WicketUtils.getPage() instanceof ProjectBlobPage) {
- ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();
- if (context.getProject().equals(page.getProject())
- && (page.getMode() == Mode.ADD || page.getMode() == Mode.EDIT)) {
- String branchName = page.getBlobIdent().revision;
- if (branchName == null)
- branchName = "main";
- accessToken = context.getSecretValue(branchName, accessTokenSecret);
- } else {
- accessToken = context.getSecretValue(accessTokenSecret);
- }
- } else {
- accessToken = context.getSecretValue(accessTokenSecret);
- }
+ JobAuthorizationContext context = Preconditions.checkNotNull(JobAuthorizationContext.get());
+ String accessToken = context.getSecretValue(accessTokenSecret);
User user = OneDev.getInstance(UserManager.class).findByAccessToken(accessToken);
if (user == null) {
throw new ExplicitException(String.format(
@@ -227,7 +207,8 @@ public class Import implements Serializable, Validatable {
try {
Validator validator = OneDev.getInstance(Validator.class);
BuildSpec buildSpec = getBuildSpec();
- JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(getProject(), getCommit(), null));
+ JobAuthorizationContext.push(new JobAuthorizationContext(
+ getProject(), getCommit(), SecurityUtils.getUser(), null));
try {
for (int i=0; i<buildSpec.getImports().size(); i++) {
Import aImport = buildSpec.getImports().get(i);
@@ -242,7 +223,7 @@ public class Import implements Serializable, Validatable {
}
return true;
} finally {
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
} catch (Exception e) {
context.disableDefaultConstraintViolation();
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.java
index fc024b680f..e1ad1ace97 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
@@ -16,11 +16,12 @@ import io.onedev.server.buildspec.step.Step;
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.job.match.JobMatch;
+import io.onedev.server.job.match.JobMatchContext;
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.security.SecurityUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.criteria.Criteria;
@@ -138,13 +139,16 @@ public class Job implements NamedElement, Serializable, Validatable {
ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();
String jobName = (String) EditContext.get().getInputValue(PROP_NAME);
if (jobName != null) {
- Context context = new Context(page.getProject(), page.getBlobIdent().revision, jobName);
+ String branch = page.getBlobIdent().revision;
+ if (branch == null)
+ branch = "main";
+ JobMatchContext context = new JobMatchContext(page.getProject(), branch, null, SecurityUtils.getUser(), jobName);
for (JobExecutor executor: OneDev.getInstance(SettingManager.class).getJobExecutors()) {
if (executor.isEnabled()) {
- if (executor.getJobAuthorization() == null) {
+ if (executor.getJobRequirement() == null) {
applicableJobExecutors.add(executor.getName());
} else {
- if (JobAuthorization.parse(executor.getJobAuthorization()).matches(context))
+ if (JobMatch.parse(executor.getJobRequirement(), true, true).matches(context))
applicableJobExecutors.add(executor.getName());
}
}
@@ -302,11 +306,11 @@ public class Job implements NamedElement, Serializable, Validatable {
}
@Nullable
- public JobTriggerMatch getTriggerMatch(ProjectEvent event) {
+ public TriggerMatch getTriggerMatch(ProjectEvent event) {
for (JobTrigger trigger: getTriggers()) {
- SubmitReason reason = trigger.matches(event, this);
- if (reason != null)
- return new JobTriggerMatch(trigger, reason);
+ TriggerMatch match = trigger.matches(event, this);
+ if (match != null)
+ return match;
}
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobTriggerMatch.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobTriggerMatch.java
deleted file mode 100644
index 1cedfbb7f0..0000000000
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobTriggerMatch.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.onedev.server.buildspec.job;
-
-import io.onedev.server.buildspec.job.trigger.JobTrigger;
-
-public class JobTriggerMatch {
-
- private final JobTrigger trigger;
-
- private final SubmitReason reason;
-
- public JobTriggerMatch(JobTrigger trigger, SubmitReason reason) {
- this.trigger = trigger;
- this.reason = reason;
- }
-
- public JobTrigger getTrigger() {
- return trigger;
- }
-
- public SubmitReason getReason() {
- return reason;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/SubmitReason.java b/server-core/src/main/java/io/onedev/server/buildspec/job/SubmitReason.java
deleted file mode 100644
index fc5ad391e6..0000000000
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/SubmitReason.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.onedev.server.buildspec.job;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.PullRequest;
-
-public interface SubmitReason {
-
- String getRefName();
-
- @Nullable
- PullRequest getPullRequest();
-
- String getDescription();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
new file mode 100644
index 0000000000..f73a2c4442
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/TriggerMatch.java
@@ -0,0 +1,47 @@
+package io.onedev.server.buildspec.job;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.param.supply.ParamSupply;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.model.PullRequest;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class TriggerMatch {
+
+ private final String refName;
+
+ private final Long requestId;
+
+ private final List<ParamSupply> params;
+
+ private final String reason;
+
+ public TriggerMatch(String refName, @Nullable PullRequest request, List<ParamSupply> params, String reason) {
+ this.refName = refName;
+ requestId = PullRequest.idOf(request);
+ this.params = params;
+ this.reason = reason;
+ }
+
+ public String getRefName() {
+ return refName;
+ }
+
+ @Nullable
+ public PullRequest getRequest() {
+ if (requestId != null)
+ return OneDev.getInstance(PullRequestManager.class).load(requestId);
+ else
+ return null;
+ }
+
+ public List<ParamSupply> getParams() {
+ return params;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
index ddab8860da..242ae1e09a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java
@@ -1,35 +1,27 @@
package io.onedev.server.buildspec.job.action;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-import javax.validation.ValidationException;
-
-import org.apache.wicket.Component;
-import javax.validation.constraints.NotEmpty;
-
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.BuildSpecAware;
import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
import io.onedev.server.buildspec.param.ParamUtils;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.param.supply.ParamSupply;
import io.onedev.server.job.JobManager;
import io.onedev.server.model.Build;
-import io.onedev.server.model.PullRequest;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.MatrixRunner;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.OmitName;
-import io.onedev.server.web.editable.annotation.ParamSpecProvider;
-import io.onedev.server.web.editable.annotation.VariableOption;
+import io.onedev.server.web.editable.annotation.*;
import io.onedev.server.web.util.WicketUtils;
+import org.apache.wicket.Component;
+
+import javax.validation.Valid;
+import javax.validation.ValidationException;
+import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
@Editable(name="Run job", order=100)
public class RunJobAction extends PostBuildAction {
@@ -94,28 +86,10 @@ public class RunJobAction extends PostBuildAction {
@Override
public void run(Map<String, List<String>> paramMap) {
-
- SubmitReason reason = new SubmitReason() {
-
- @Override
- public String getRefName() {
- return build.getRefName();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return build.getRequest();
- }
-
- @Override
- public String getDescription() {
- return "Post build action of job '" + build.getJobName() + "'";
- }
-
- };
JobManager jobManager = OneDev.getInstance(JobManager.class);
jobManager.submit(build.getProject(), build.getCommitId(), getJobName(),
- paramMap, build.getPipeline(), reason);
+ paramMap, build.getPipeline(), build.getRefName(),
+ build.getSubmitter(), build.getRequest(), "Post build action of job '" + build.getJobName() + "'");
}
}.run();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
index 75d3415a21..e399b45165 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java
@@ -25,7 +25,7 @@ public class OnBranchCriteria extends Criteria<Build> {
@Override
public boolean matches(Build build) {
- return build.getProject().isCommitOnBranches(build.getCommitId(), branch);
+ return build.getProject().isCommitOnBranch(build.getCommitId(), branch);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java
index 2a985a4e4b..c64855bdfa 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java
@@ -46,7 +46,7 @@ public class HttpCredential implements GitCredential, Validatable {
@Override
public CloneInfo newCloneInfo(Build build, String jobToken) {
return new HttpCloneInfo(OneDev.getInstance(UrlManager.class).cloneUrlFor(build.getProject(), false),
- build.getJobSecretAuthorizationContext().getSecretValue(accessTokenSecret));
+ build.getJobAuthorizationContext().getSecretValue(accessTokenSecret));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java
index 0b70eef81a..e0046301da 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java
@@ -66,7 +66,7 @@ public class SshCredential implements GitCredential, Validatable {
knownHosts.append("\n");
- String privateKey = build.getJobSecretAuthorizationContext().getSecretValue(keySecret);
+ String privateKey = build.getJobAuthorizationContext().getSecretValue(keySecret);
if (!privateKey.endsWith("\n"))
privateKey = privateKey + "\n";
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
index 9699ec0e09..83ba25588f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
@@ -1,145 +1,127 @@
-package io.onedev.server.buildspec.job.trigger;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.event.project.RefUpdated;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.util.SuggestionUtils;
-
-@Editable(order=100, name="Branch update", description=""
- + "Job will run when code is committed. <b class='text-info'>NOTE:</b> This trigger will ignore commits "
- + "with message containing <code>[skip ci]</code>, <code>[ci skip]</code>, <code>[no ci]</code>, "
- + "<code>[skip job]</code>, <code>[job skip]</code>, or <code>[no job]</code>")
-
-public class BranchUpdateTrigger extends JobTrigger {
-
- private static final long serialVersionUID = 1L;
-
- private String branches;
-
- private String paths;
-
- @Editable(name="Branches", order=100, placeholder="Any branch", description="Optionally specify space-separated branches "
- + "to check. Use '**' or '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to match all branches")
- @Patterns(suggester = "suggestBranches", path=true)
- public String getBranches() {
- return branches;
- }
-
- public void setBranches(String branches) {
- this.branches = branches;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestBranches(String matchWith) {
- return SuggestionUtils.suggestBranches(Project.get(), matchWith);
- }
-
- @Editable(name="Touched Files", order=200, placeholder="Any file",
- description="Optionally specify space-separated files to check. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to match all files")
- @Patterns(suggester = "getPathSuggestions", path=true)
- public String getPaths() {
- return paths;
- }
-
- public void setPaths(String paths) {
- this.paths = paths;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> getPathSuggestions(String matchWith) {
- return SuggestionUtils.suggestBlobs(Project.get(), matchWith);
- }
-
- private boolean touchedFile(RefUpdated refUpdated) {
- if (getPaths() != null) {
- if (refUpdated.getOldCommitId().equals(ObjectId.zeroId())) {
- return true;
- } else if (refUpdated.getNewCommitId().equals(ObjectId.zeroId())) {
- return false;
- } else {
- Repository repository = OneDev.getInstance(ProjectManager.class)
- .getRepository(refUpdated.getProject().getId());
- Collection<String> changedFiles = GitUtils.getChangedFiles(
- repository,
- refUpdated.getOldCommitId(), refUpdated.getNewCommitId());
- PatternSet patternSet = PatternSet.parse(getPaths());
- Matcher matcher = new PathMatcher();
- for (String changedFile: changedFiles) {
- if (patternSet.matches(matcher, changedFile))
- return true;
- }
- return false;
- }
- } else {
- return true;
- }
- }
-
- @Override
- public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof RefUpdated) {
- RefUpdated refUpdated = (RefUpdated) event;
- String updatedBranch = GitUtils.ref2branch(refUpdated.getRefName());
- Matcher matcher = new PathMatcher();
- if (updatedBranch != null
- && !SKIP_COMMIT.apply(event.getProject().getRevCommit(refUpdated.getNewCommitId(), true))
- && (branches == null || PatternSet.parse(branches).matches(matcher, updatedBranch))
- && touchedFile(refUpdated)) {
- return new SubmitReason() {
-
- @Override
- public String getRefName() {
- return refUpdated.getRefName();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return null;
- }
-
- @Override
- public String getDescription() {
- return "Branch '" + updatedBranch + "' is updated";
- }
-
- };
- }
- }
- return null;
- }
-
- @Override
- public String getTriggerDescription() {
- String description;
- if (getBranches() != null && getPaths() != null)
- description = String.format("When update branches '%s' and touch files '%s'", getBranches(), getPaths());
- else if (getBranches() != null)
- description = String.format("When update branches '%s'", getBranches());
- else if (getPaths() != null)
- description = String.format("When touch files '%s'", getPaths());
- else
- description = "When update branches";
- return description;
- }
-
-}
+package io.onedev.server.buildspec.job.trigger;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.TriggerMatch;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.event.project.RefUpdated;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.match.Matcher;
+import io.onedev.server.util.match.PathMatcher;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.util.SuggestionUtils;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+
+import java.util.Collection;
+import java.util.List;
+
+@Editable(order=100, name="Branch update", description=""
+ + "Job will run when code is committed. <b class='text-info'>NOTE:</b> This trigger will ignore commits "
+ + "with message containing <code>[skip ci]</code>, <code>[ci skip]</code>, <code>[no ci]</code>, "
+ + "<code>[skip job]</code>, <code>[job skip]</code>, or <code>[no job]</code>")
+
+public class BranchUpdateTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private String branches;
+
+ private String paths;
+
+ @Editable(name="Branches", order=100, placeholder="Any branch", description="Optionally specify space-separated branches "
+ + "to check. Use '**' or '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all branches")
+ @Patterns(suggester = "suggestBranches", path=true)
+ public String getBranches() {
+ return branches;
+ }
+
+ public void setBranches(String branches) {
+ this.branches = branches;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestBranches(String matchWith) {
+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);
+ }
+
+ @Editable(name="Touched Files", order=200, placeholder="Any file",
+ description="Optionally specify space-separated files to check. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all files")
+ @Patterns(suggester = "getPathSuggestions", path=true)
+ public String getPaths() {
+ return paths;
+ }
+
+ public void setPaths(String paths) {
+ this.paths = paths;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> getPathSuggestions(String matchWith) {
+ return SuggestionUtils.suggestBlobs(Project.get(), matchWith);
+ }
+
+ private boolean touchedFile(RefUpdated refUpdated) {
+ if (getPaths() != null) {
+ if (refUpdated.getOldCommitId().equals(ObjectId.zeroId())) {
+ return true;
+ } else if (refUpdated.getNewCommitId().equals(ObjectId.zeroId())) {
+ return false;
+ } else {
+ Repository repository = OneDev.getInstance(ProjectManager.class)
+ .getRepository(refUpdated.getProject().getId());
+ Collection<String> changedFiles = GitUtils.getChangedFiles(
+ repository,
+ refUpdated.getOldCommitId(), refUpdated.getNewCommitId());
+ PatternSet patternSet = PatternSet.parse(getPaths());
+ Matcher matcher = new PathMatcher();
+ for (String changedFile: changedFiles) {
+ if (patternSet.matches(matcher, changedFile))
+ return true;
+ }
+ return false;
+ }
+ } else {
+ return true;
+ }
+ }
+
+ @Override
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
+ if (event instanceof RefUpdated) {
+ RefUpdated refUpdated = (RefUpdated) event;
+ String updatedBranch = GitUtils.ref2branch(refUpdated.getRefName());
+ Matcher matcher = new PathMatcher();
+ if (updatedBranch != null
+ && !SKIP_COMMIT.apply(event.getProject().getRevCommit(refUpdated.getNewCommitId(), true))
+ && (branches == null || PatternSet.parse(branches).matches(matcher, updatedBranch))
+ && touchedFile(refUpdated)) {
+ return new TriggerMatch(refUpdated.getRefName(), null,
+ getParams(), "Branch '" + updatedBranch + "' is updated");
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getTriggerDescription() {
+ String description;
+ if (getBranches() != null && getPaths() != null)
+ description = String.format("When update branches '%s' and touch files '%s'", getBranches(), getPaths());
+ else if (getBranches() != null)
+ description = String.format("When update branches '%s'", getBranches());
+ else if (getPaths() != null)
+ description = String.format("When touch files '%s'", getPaths());
+ else
+ description = "When update branches";
+ return description;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
index 5e7b0bac3c..6854a7386a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java
@@ -1,65 +1,49 @@
-package io.onedev.server.buildspec.job.trigger;
-
-import java.util.List;
-
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.JobDependency;
-import io.onedev.server.buildspec.job.SubmitReason;
-import io.onedev.server.buildspec.param.supply.ParamSupply;
-import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.event.project.build.BuildFinished;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Build.Status;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable(order=500, name="Dependency job finished")
-public class DependencyFinishedTrigger extends JobTrigger {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof BuildFinished) {
- BuildFinished buildFinished = (BuildFinished) event;
- Build build = buildFinished.getBuild();
- for (JobDependency dependency: job.getJobDependencies()) {
- if (dependency.getJobName().equals(build.getJobName())
- && (!dependency.isRequireSuccessful() || build.getStatus() == Status.SUCCESSFUL)) {
- for (ParamSupply param: dependency.getJobParams()) {
- if (!param.isSecret()) {
- List<String> paramValue = build.getParamMap().get(param.getName());
- if (!param.getValuesProvider().getValues(null, null).contains(paramValue))
- return null;
- }
- }
- return new SubmitReason() {
-
- @Override
- public String getRefName() {
- return build.getRefName();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return build.getRequest();
- }
-
- @Override
- public String getDescription() {
- return "Dependency job '" + dependency.getJobName() + "' is finished";
- }
-
- };
- }
- }
- }
- return null;
- }
-
- @Override
- public String getTriggerDescription() {
- return "When dependency jobs finished";
- }
-
-}
+package io.onedev.server.buildspec.job.trigger;
+
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobDependency;
+import io.onedev.server.buildspec.job.TriggerMatch;
+import io.onedev.server.buildspec.param.supply.ParamSupply;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.event.project.build.BuildFinished;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.web.editable.annotation.Editable;
+
+import java.util.List;
+
+@Editable(order=500, name="Dependency job finished")
+public class DependencyFinishedTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
+ if (event instanceof BuildFinished) {
+ BuildFinished buildFinished = (BuildFinished) event;
+ Build build = buildFinished.getBuild();
+ for (JobDependency dependency: job.getJobDependencies()) {
+ if (dependency.getJobName().equals(build.getJobName())
+ && (!dependency.isRequireSuccessful() || build.getStatus() == Status.SUCCESSFUL)) {
+ for (ParamSupply param: dependency.getJobParams()) {
+ if (!param.isSecret()) {
+ List<String> paramValue = build.getParamMap().get(param.getName());
+ if (!param.getValuesProvider().getValues(null, null).contains(paramValue))
+ return null;
+ }
+ }
+
+ return new TriggerMatch(build.getRefName(), build.getRequest(), getParams(),
+ "Dependency job '" + dependency.getJobName() + "' is finished");
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getTriggerDescription() {
+ return "When dependency jobs finished";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
index b7a51782c8..079fa41ed3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
@@ -1,119 +1,119 @@
-package io.onedev.server.buildspec.job.trigger;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
-import javax.annotation.Nullable;
-import javax.validation.Valid;
-
-import org.apache.wicket.Component;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.JobAware;
-import io.onedev.server.buildspec.job.SubmitReason;
-import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.buildspec.param.supply.ParamSupply;
-import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.match.Matcher;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.OmitName;
-import io.onedev.server.web.editable.annotation.ParamSpecProvider;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.editable.annotation.VariableOption;
-import io.onedev.server.web.util.SuggestionUtils;
-import io.onedev.server.web.util.WicketUtils;
-
-@Editable
-public abstract class JobTrigger implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static Function<RevCommit, Boolean> SKIP_COMMIT = new Function<RevCommit, Boolean>() {
-
- @Override
- public Boolean apply(RevCommit commit) {
- String message = commit.getFullMessage().toLowerCase();
- return message.contains("[skip ci]") || message.contains("[ci skip]") || message.contains("[no ci]")
- || message.contains("[skip job]") || message.contains("[job skip]") || message.contains("[no job]");
- }
-
- };
-
- private String projects;
-
- private List<ParamSupply> params = new ArrayList<>();
-
- @Editable(name="Applicable Projects", order=900, placeholder="Any project", description=""
- + "Optionally specify space-separated projects applicable for this trigger. "
- + "This is useful for instance when you want to prevent the job from being "
- + "triggered in forked projects. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to match all projects")
- @Patterns(suggester="suggestProjects", path=true)
- public String getProjects() {
- return projects;
- }
-
- public void setProjects(String projects) {
- this.projects = projects;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestProjects(String matchWith) {
- return SuggestionUtils.suggestProjectPaths(matchWith);
- }
-
- @Editable(name="Job Parameters", order=1000)
- @ParamSpecProvider("getParamSpecs")
- @VariableOption(withBuildVersion=false, withDynamicVariables=false)
- @OmitName
- @Valid
- public List<ParamSupply> getParams() {
- return params;
- }
-
- public void setParams(List<ParamSupply> params) {
- this.params = params;
- }
-
- @SuppressWarnings("unused")
- private static List<ParamSpec> getParamSpecs() {
- Component component = ComponentContext.get().getComponent();
- JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);
- if (jobAware != null) {
- Job job = jobAware.getJob();
- if (job != null)
- return job.getParamSpecs();
- }
- return new ArrayList<>();
- }
-
- @Nullable
- public SubmitReason matches(ProjectEvent event, Job job) {
- String projectPath = event.getProject().getPath();
- Matcher matcher = new PathMatcher();
- if (projects == null || PatternSet.parse(projects).matches(matcher, projectPath))
- return triggerMatches(event, job);
- else
- return null;
- }
-
- public String getDescription() {
- String description = getTriggerDescription();
- if (projects != null)
- description += " in projects '" + projects + "'";
- return description;
- }
-
- @Nullable
- public abstract SubmitReason triggerMatches(ProjectEvent event, Job job);
-
- public abstract String getTriggerDescription();
-
-}
+package io.onedev.server.buildspec.job.trigger;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+import javax.validation.Valid;
+
+import io.onedev.server.buildspec.job.TriggerMatch;
+import org.apache.wicket.Component;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobAware;
+import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.buildspec.param.supply.ParamSupply;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.match.Matcher;
+import io.onedev.server.util.match.PathMatcher;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.editable.annotation.ParamSpecProvider;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.editable.annotation.VariableOption;
+import io.onedev.server.web.util.SuggestionUtils;
+import io.onedev.server.web.util.WicketUtils;
+
+@Editable
+public abstract class JobTrigger implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static Function<RevCommit, Boolean> SKIP_COMMIT = new Function<RevCommit, Boolean>() {
+
+ @Override
+ public Boolean apply(RevCommit commit) {
+ String message = commit.getFullMessage().toLowerCase();
+ return message.contains("[skip ci]") || message.contains("[ci skip]") || message.contains("[no ci]")
+ || message.contains("[skip job]") || message.contains("[job skip]") || message.contains("[no job]");
+ }
+
+ };
+
+ private String projects;
+
+ private List<ParamSupply> params = new ArrayList<>();
+
+ @Editable(name="Applicable Projects", order=900, placeholder="Any project", description=""
+ + "Optionally specify space-separated projects applicable for this trigger. "
+ + "This is useful for instance when you want to prevent the job from being "
+ + "triggered in forked projects. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all projects")
+ @Patterns(suggester="suggestProjects", path=true)
+ public String getProjects() {
+ return projects;
+ }
+
+ public void setProjects(String projects) {
+ this.projects = projects;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestProjects(String matchWith) {
+ return SuggestionUtils.suggestProjectPaths(matchWith);
+ }
+
+ @Editable(name="Job Parameters", order=1000)
+ @ParamSpecProvider("getParamSpecs")
+ @VariableOption(withBuildVersion=false, withDynamicVariables=false)
+ @OmitName
+ @Valid
+ public List<ParamSupply> getParams() {
+ return params;
+ }
+
+ public void setParams(List<ParamSupply> params) {
+ this.params = params;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<ParamSpec> getParamSpecs() {
+ Component component = ComponentContext.get().getComponent();
+ JobAware jobAware = WicketUtils.findInnermost(component, JobAware.class);
+ if (jobAware != null) {
+ Job job = jobAware.getJob();
+ if (job != null)
+ return job.getParamSpecs();
+ }
+ return new ArrayList<>();
+ }
+
+ @Nullable
+ public TriggerMatch matches(ProjectEvent event, Job job) {
+ String projectPath = event.getProject().getPath();
+ Matcher matcher = new PathMatcher();
+ if (projects == null || PatternSet.parse(projects).matches(matcher, projectPath))
+ return triggerMatches(event, job);
+ else
+ return null;
+ }
+
+ public String getDescription() {
+ String description = getTriggerDescription();
+ if (projects != null)
+ description += " in projects '" + projects + "'";
+ return description;
+ }
+
+ @Nullable
+ protected abstract TriggerMatch triggerMatches(ProjectEvent event, Job job);
+
+ public abstract String getTriggerDescription();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java
index e4f2544e0d..47873db7b2 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java
@@ -1,30 +1,30 @@
-package io.onedev.server.buildspec.job.trigger;
-
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
-import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.event.project.pullrequest.PullRequestChanged;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable(order=320, name="Pull request discard", description="Job will run on head commit of target branch")
-public class PullRequestDiscardTrigger extends PullRequestTrigger {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof PullRequestChanged) {
- PullRequestChanged pullRequestChangeEvent = (PullRequestChanged) event;
- if (pullRequestChangeEvent.getChange().getData() instanceof PullRequestDiscardData)
- return triggerMatches(pullRequestChangeEvent.getRequest());
- }
- return null;
- }
-
- @Override
- public String getTriggerDescription() {
- return getTriggerDescription("discard");
- }
-
-}
+package io.onedev.server.buildspec.job.trigger;
+
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.TriggerMatch;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.event.project.pullrequest.PullRequestChanged;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable(order=320, name="Pull request discard", description="Job will run on head commit of target branch")
+public class PullRequestDiscardTrigger extends PullRequestTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
+ if (event instanceof PullRequestChanged) {
+ PullRequestChanged pullRequestChangeEvent = (PullRequestChanged) event;
+ if (pullRequestChangeEvent.getChange().getData() instanceof PullRequestDiscardData)
+ return triggerMatches(pullRequestChangeEvent.getRequest());
+ }
+ return null;
+ }
+
+ @Override
+ public String getTriggerDescription() {
+ return getTriggerDescription("discard");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java
index b815111a40..69fee8d5b3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java
@@ -1,30 +1,30 @@
-package io.onedev.server.buildspec.job.trigger;
-
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
-import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.event.project.pullrequest.PullRequestChanged;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable(order=310, name="Pull request merge", description="Job will run on merge commit of target branch and source branch")
-public class PullRequestMergeTrigger extends PullRequestTrigger {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof PullRequestChanged) {
- PullRequestChanged pullRequestChangeEvent = (PullRequestChanged) event;
- if (pullRequestChangeEvent.getChange().getData() instanceof PullRequestMergeData)
- return triggerMatches(pullRequestChangeEvent.getRequest());
- }
- return null;
- }
-
- @Override
- public String getTriggerDescription() {
- return getTriggerDescription("merge");
- }
-
-}
+package io.onedev.server.buildspec.job.trigger;
+
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.TriggerMatch;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.event.project.pullrequest.PullRequestChanged;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable(order=310, name="Pull request merge", description="Job will run on merge commit of target branch and source branch")
+public class PullRequestMergeTrigger extends PullRequestTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
+ if (event instanceof PullRequestChanged) {
+ PullRequestChanged pullRequestChangeEvent = (PullRequestChanged) event;
+ if (pullRequestChangeEvent.getChange().getData() instanceof PullRequestMergeData)
+ return triggerMatches(pullRequestChangeEvent.getRequest());
+ }
+ return null;
+ }
+
+ @Override
+ public String getTriggerDescription() {
+ return getTriggerDescription("merge");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
index e230f44446..63f21d5f53 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
@@ -2,9 +2,8 @@ package io.onedev.server.buildspec.job.trigger;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.SubmitReason;
+import io.onedev.server.buildspec.job.TriggerMatch;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -83,31 +82,14 @@ public abstract class PullRequestTrigger extends JobTrigger {
}
@Nullable
- protected SubmitReason triggerMatches(PullRequest request) {
+ protected TriggerMatch triggerMatches(PullRequest request) {
String targetBranch = request.getTargetBranch();
Matcher matcher = new PathMatcher();
if ((branches == null || PatternSet.parse(branches).matches(matcher, targetBranch))
&& touchedFile(request)) {
- Long requestId = request.getId();
- return new SubmitReason() {
-
- @Override
- public String getRefName() {
- return request.getMergeRef();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return OneDev.getInstance(PullRequestManager.class).load(requestId);
- }
-
- @Override
- public String getDescription() {
- return "Pull request #" + request.getNumber() + " is opened/updated";
- }
-
- };
+ return new TriggerMatch(request.getMergeRef(), request, getParams(),
+ "Pull request #" + request.getNumber() + " is opened/updated");
}
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.java
index cea83b812f..eca0956274 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestUpdateTrigger.java
@@ -1,7 +1,7 @@
package io.onedev.server.buildspec.job.trigger;
import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
+import io.onedev.server.buildspec.job.TriggerMatch;
import io.onedev.server.event.project.ProjectEvent;
import io.onedev.server.event.project.pullrequest.PullRequestBuildCommitUpdated;
import io.onedev.server.model.PullRequest;
@@ -17,7 +17,7 @@ public class PullRequestUpdateTrigger extends PullRequestTrigger {
private static final long serialVersionUID = 1L;
@Override
- public SubmitReason triggerMatches(ProjectEvent event, Job job) {
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
if (event instanceof PullRequestBuildCommitUpdated) {
PullRequestBuildCommitUpdated pullRequestBuildCommitUpdated = (PullRequestBuildCommitUpdated) event;
PullRequest request = pullRequestBuildCommitUpdated.getRequest();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
index ff1bf5fb99..cd3db9195f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/ScheduleTrigger.java
@@ -1,64 +1,47 @@
-package io.onedev.server.buildspec.job.trigger;
-
-import javax.validation.constraints.NotEmpty;
-
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
-import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.event.project.ScheduledTimeReaches;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.validation.annotation.CronExpression;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable(order=600, name="Cron schedule")
-public class ScheduleTrigger extends JobTrigger {
-
- private static final long serialVersionUID = 1L;
-
- private String cronExpression;
-
- @Editable(order=100, description="Specify a <a target='_blank' href='http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html#format'>cron schedule</a> to "
- + "fire the job automatically. <b>Note:</b> this is only applicable to default branch")
- @CronExpression
- @NotEmpty
- public String getCronExpression() {
- return cronExpression;
- }
-
- public void setCronExpression(String cronExpression) {
- this.cronExpression = cronExpression;
- }
-
- @Override
- public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof ScheduledTimeReaches) {
- return new SubmitReason() {
-
- @Override
- public String getRefName() {
- return GitUtils.branch2ref(event.getProject().getDefaultBranch());
- }
-
- @Override
- public PullRequest getPullRequest() {
- return null;
- }
-
- @Override
- public String getDescription() {
- return "Scheduled time reaches";
- }
-
- };
- } else {
- return null;
- }
- }
-
- @Override
- public String getTriggerDescription() {
- return "Schedule at " + cronExpression;
- }
-
-}
+package io.onedev.server.buildspec.job.trigger;
+
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.TriggerMatch;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.event.project.ScheduledTimeReaches;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.util.validation.annotation.CronExpression;
+import io.onedev.server.web.editable.annotation.Editable;
+
+import javax.validation.constraints.NotEmpty;
+
+@Editable(order=600, name="Cron schedule")
+public class ScheduleTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private String cronExpression;
+
+ @Editable(order=100, description="Specify a <a target='_blank' href='http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html#format'>cron schedule</a> to "
+ + "fire the job automatically. <b>Note:</b> this is only applicable to default branch")
+ @CronExpression
+ @NotEmpty
+ public String getCronExpression() {
+ return cronExpression;
+ }
+
+ public void setCronExpression(String cronExpression) {
+ this.cronExpression = cronExpression;
+ }
+
+ @Override
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
+ if (event instanceof ScheduledTimeReaches) {
+ return new TriggerMatch(GitUtils.branch2ref(event.getProject().getDefaultBranch()),
+ null, getParams(), "Scheduled");
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public String getTriggerDescription() {
+ return "Schedule at " + cronExpression;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
index 7326479d70..b3fafe6081 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
@@ -1,110 +1,92 @@
-package io.onedev.server.buildspec.job.trigger;
-
-import java.util.List;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
-import io.onedev.server.event.project.ProjectEvent;
-import io.onedev.server.event.project.RefUpdated;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.util.SuggestionUtils;
-
-@Editable(order=200, name="Tag creation")
-public class TagCreateTrigger extends JobTrigger {
-
- private static final long serialVersionUID = 1L;
-
- private String tags;
-
- private String branches;
-
- @Editable(name="Tags", order=100, placeholder="Any tag", description=""
- + "Optionally specify space-separated tags to check. Use '**', '*' or '?' for "
- + "<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to match all tags")
- @Patterns(suggester="suggestTags", path=true)
- public String getTags() {
- return tags;
- }
-
- public void setTags(String tags) {
- this.tags = tags;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestTags(String matchWith) {
- return SuggestionUtils.suggestTags(Project.get(), matchWith);
- }
-
- @Editable(name="On Branches", order=200, placeholder="Any branch", description=""
- + "This trigger will only be applicable if tagged commit is on branches specified here. "
- + "Multiple branches should be separated with spaces. Use '**', '*' or '?' for "
- + "<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to match all branches")
- @Patterns(suggester="suggestBranches", path=true)
- public String getBranches() {
- return branches;
- }
-
- public void setBranches(String branches) {
- this.branches = branches;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestBranches(String matchWith) {
- return SuggestionUtils.suggestBranches(Project.get(), matchWith);
- }
-
- @Override
- public SubmitReason triggerMatches(ProjectEvent event, Job job) {
- if (event instanceof RefUpdated) {
- RefUpdated refUpdated = (RefUpdated) event;
- String updatedTag = GitUtils.ref2tag(refUpdated.getRefName());
- ObjectId commitId = refUpdated.getNewCommitId();
- Project project = event.getProject();
- if (updatedTag != null && !commitId.equals(ObjectId.zeroId())
- && (tags == null || PatternSet.parse(tags).matches(new PathMatcher(), updatedTag))
- && (branches == null || project.isCommitOnBranches(commitId, branches))) {
- return new SubmitReason() {
-
- @Override
- public String getRefName() {
- return refUpdated.getRefName();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return null;
- }
-
- @Override
- public String getDescription() {
- return "Tag '" + updatedTag + "' is created";
- }
-
- };
- }
- }
- return null;
- }
-
- @Override
- public String getTriggerDescription() {
- String description = "When create tags";
- if (tags != null)
- description += " '" + tags + "'";
- if (branches != null)
- description += " on branches '" + branches + "'";
- return description;
- }
-
-}
+package io.onedev.server.buildspec.job.trigger;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.TriggerMatch;
+import io.onedev.server.event.project.ProjectEvent;
+import io.onedev.server.event.project.RefUpdated;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.match.PathMatcher;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.util.SuggestionUtils;
+import org.eclipse.jgit.lib.ObjectId;
+
+import java.util.List;
+
+@Editable(order=200, name="Tag creation")
+public class TagCreateTrigger extends JobTrigger {
+
+ private static final long serialVersionUID = 1L;
+
+ private String tags;
+
+ private String branches;
+
+ @Editable(name="Tags", order=100, placeholder="Any tag", description=""
+ + "Optionally specify space-separated tags to check. Use '**', '*' or '?' for "
+ + "<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all tags")
+ @Patterns(suggester="suggestTags", path=true)
+ public String getTags() {
+ return tags;
+ }
+
+ public void setTags(String tags) {
+ this.tags = tags;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestTags(String matchWith) {
+ return SuggestionUtils.suggestTags(Project.get(), matchWith);
+ }
+
+ @Editable(name="On Branches", order=200, placeholder="Any branch", description=""
+ + "This trigger will only be applicable if tagged commit is reachable from branches specified here. "
+ + "Multiple branches should be separated with spaces. Use '**', '*' or '?' for "
+ + "<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all branches")
+ @Patterns(suggester="suggestBranches", path=true)
+ public String getBranches() {
+ return branches;
+ }
+
+ public void setBranches(String branches) {
+ this.branches = branches;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestBranches(String matchWith) {
+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);
+ }
+
+ @Override
+ protected TriggerMatch triggerMatches(ProjectEvent event, Job job) {
+ if (event instanceof RefUpdated) {
+ RefUpdated refUpdated = (RefUpdated) event;
+ String updatedTag = GitUtils.ref2tag(refUpdated.getRefName());
+ ObjectId commitId = refUpdated.getNewCommitId();
+ Project project = event.getProject();
+ if (updatedTag != null && !commitId.equals(ObjectId.zeroId())
+ && (tags == null || PatternSet.parse(tags).matches(new PathMatcher(), updatedTag))
+ && (branches == null || project.isCommitOnBranches(commitId, PatternSet.parse(branches)))) {
+ return new TriggerMatch(refUpdated.getRefName(), null, getParams(),
+ "Tag '" + updatedTag + "' is created");
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getTriggerDescription() {
+ String description = "When create tags";
+ if (tags != null)
+ description += " '" + tags + "'";
+ if (branches != null)
+ description += " on branches '" + branches + "'";
+ return description;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
index fa38e6ddb1..a07ef127b3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/ParamUtils.java
@@ -28,7 +28,7 @@ import io.onedev.server.buildspec.param.supply.ParamSupply;
import io.onedev.server.buildspec.param.supply.SpecifiedValues;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -217,7 +217,7 @@ public class ParamUtils {
for (List<String> value: param.getValuesProvider().getValues(build, paramCombination)) {
List<String> resolvedValue = new ArrayList<>();
for (String each: value)
- resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getJobSecretAuthorizationContext().getSecretValue(each));
+ resolvedValue.add(SecretInput.LITERAL_VALUE_PREFIX + build.getJobAuthorizationContext().getSecretValue(each));
resolvedValues.add(resolvedValue);
}
paramMatrix.put(param.getName(), resolvedValues);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java
index c860b5f56a..cabc9d9d98 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BooleanParam.java
@@ -6,9 +6,9 @@ import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.inputspec.booleaninput.BooleanInput;
-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;
+import io.onedev.server.buildspecmodel.inputspec.booleaninput.BooleanInput;
+import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=300, name=ParamSpec.BOOLEAN)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java
index 411bd35393..e3613e16b0 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/BuildChoiceParam.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.BuildChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.BuildChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1200, name=ParamSpec.BUILD)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java
index 61cbeb71c2..93a077a44a 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/CommitParam.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.CommitInput;
+import io.onedev.server.buildspecmodel.inputspec.CommitInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1400, name=ParamSpec.COMMIT)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java
index 7263d4bc19..707da5bdd0 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.dateinput.DateInput;
-import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.dateinput.DateInput;
+import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.Constants;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java
index 63aff3aac5..26eb8f0034 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.datetimeinput.DateTimeInput;
-import io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.datetimeinput.DateTimeInput;
+import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.Constants;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java
index 8ffd8831bb..2e4350d8dd 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/FloatParam.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.floatinput.FloatInput;
-import io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.floatinput.FloatInput;
+import io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=450, name=ParamSpec.FLOAT)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java
index 46dfd438f6..4a575e6b94 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/GroupChoiceParam.java
@@ -6,10 +6,10 @@ import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.GroupChoiceInput;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.AllGroups;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.GroupChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider.AllGroups;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=160, name=ParamSpec.GROUP)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java
index 974be0a4f3..6ede34e3bb 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IntegerParam.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.integerinput.IntegerInput;
-import io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.integerinput.IntegerInput;
+import io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=400, name=ParamSpec.INTEGER)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java
index e32ffdfe70..33b6a4cf2b 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/IssueChoiceParam.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.IssueChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.IssueChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1100, name=ParamSpec.ISSUE)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/MilestoneChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/MilestoneChoiceParam.java
index 5e2f849941..f50e8f487a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/MilestoneChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/MilestoneChoiceParam.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.MilestoneChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.MilestoneChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1110, name=ParamSpec.MILESTONE)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
index ab51808348..caeef8c8e5 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/ParamSpec.java
@@ -1,98 +1,98 @@
-package io.onedev.server.buildspec.param.spec;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.validation.Valid;
-
-import org.apache.wicket.Component;
-import javax.validation.constraints.NotEmpty;
-
-import io.onedev.server.buildspec.ParamSpecAware;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.validation.annotation.ParamName;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.util.WicketUtils;
-
-@Editable
-public abstract class ParamSpec extends InputSpec {
-
- private static final long serialVersionUID = 1L;
-
- @Editable(order=10)
- @ParamName
- @NotEmpty
- @Override
- public String getName() {
- return super.getName();
- }
-
- @Override
- public void setName(String name) {
- super.setName(name);
- }
-
- @Editable(order=30, placeholder="No description", description="Optionally describes the param")
- @Override
- public String getDescription() {
- return super.getDescription();
- }
-
- @Override
- public void setDescription(String description) {
- super.setDescription(description);
- }
-
- @Editable(order=35, description="Whether or not multiple values can be specified for this param")
- @Override
- public boolean isAllowMultiple() {
- return super.isAllowMultiple();
- }
-
- @Override
- public void setAllowMultiple(boolean allowMultiple) {
- super.setAllowMultiple(allowMultiple);
- }
-
- @Editable(order=40, name="Show Conditionally", placeholder="Always",
- description="Enable if visibility of this param depends on other params")
- @Valid
- @Override
- public ShowCondition getShowCondition() {
- return super.getShowCondition();
- }
-
- @Override
- public void setShowCondition(ShowCondition showCondition) {
- super.setShowCondition(showCondition);
- }
-
- @Editable(order=50, name="Allow Empty Value", description="Whether or not this param accepts empty value")
- @Override
- public boolean isAllowEmpty() {
- return super.isAllowEmpty();
- }
-
- @Override
- public void setAllowEmpty(boolean allowEmpty) {
- super.setAllowEmpty(allowEmpty);
- }
-
- @Override
- public String getNameOfEmptyValue() {
- return null;
- }
-
- @Nullable
- public static List<ParamSpec> list() {
- Component component = ComponentContext.get().getComponent();
- ParamSpecAware paramSpecAware = WicketUtils.findInnermost(component, ParamSpecAware.class);
- if (paramSpecAware != null)
- return paramSpecAware.getParamSpecs();
- else
- return null;
- }
-
-}
+package io.onedev.server.buildspec.param.spec;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.validation.Valid;
+
+import org.apache.wicket.Component;
+import javax.validation.constraints.NotEmpty;
+
+import io.onedev.server.buildspec.ParamSpecAware;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
+import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.validation.annotation.ParamName;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.util.WicketUtils;
+
+@Editable
+public abstract class ParamSpec extends InputSpec {
+
+ private static final long serialVersionUID = 1L;
+
+ @Editable(order=10)
+ @ParamName
+ @NotEmpty
+ @Override
+ public String getName() {
+ return super.getName();
+ }
+
+ @Override
+ public void setName(String name) {
+ super.setName(name);
+ }
+
+ @Editable(order=30, placeholder="No description", description="Optionally describes the param")
+ @Override
+ public String getDescription() {
+ return super.getDescription();
+ }
+
+ @Override
+ public void setDescription(String description) {
+ super.setDescription(description);
+ }
+
+ @Editable(order=35, description="Whether or not multiple values can be specified for this param")
+ @Override
+ public boolean isAllowMultiple() {
+ return super.isAllowMultiple();
+ }
+
+ @Override
+ public void setAllowMultiple(boolean allowMultiple) {
+ super.setAllowMultiple(allowMultiple);
+ }
+
+ @Editable(order=40, name="Show Conditionally", placeholder="Always",
+ description="Enable if visibility of this param depends on other params")
+ @Valid
+ @Override
+ public ShowCondition getShowCondition() {
+ return super.getShowCondition();
+ }
+
+ @Override
+ public void setShowCondition(ShowCondition showCondition) {
+ super.setShowCondition(showCondition);
+ }
+
+ @Editable(order=50, name="Allow Empty Value", description="Whether or not this param accepts empty value")
+ @Override
+ public boolean isAllowEmpty() {
+ return super.isAllowEmpty();
+ }
+
+ @Override
+ public void setAllowEmpty(boolean allowEmpty) {
+ super.setAllowEmpty(allowEmpty);
+ }
+
+ @Override
+ public String getNameOfEmptyValue() {
+ return null;
+ }
+
+ @Nullable
+ public static List<ParamSpec> list() {
+ Component component = ComponentContext.get().getComponent();
+ ParamSpecAware paramSpecAware = WicketUtils.findInnermost(component, ParamSpecAware.class);
+ if (paramSpecAware != null)
+ return paramSpecAware.getParamSpecs();
+ else
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java
index 790e62f6fd..02b57738a9 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/PullRequestChoiceParam.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.PullRequestChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.PullRequestChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1000, name=ParamSpec.PULL_REQUEST)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java
index 947c5a9360..6a7350b274 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/SecretParam.java
@@ -3,7 +3,7 @@ package io.onedev.server.buildspec.param.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=500, name=ParamSpec.SECRET)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java
index 8905d1b0c3..44f480f050 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/TextParam.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.textinput.TextInput;
-import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;
+import io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=100, name=ParamSpec.TEXT)
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java
index 1ba15abf7a..da052c90f2 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/UserChoiceParam.java
@@ -6,11 +6,11 @@ import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;
-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;
-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;
-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.AllUsers;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.ShowCondition;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java
index e5e7eefad2..867280004f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.workingperiodinput.WorkingPeriodInput;
-import io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.WorkingPeriodInput;
+import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java
index 3bf92f3876..3c450958bc 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/ChoiceParam.java
@@ -10,9 +10,9 @@ import javax.validation.constraints.NotNull;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.param.spec.choiceparam.defaultmultivalueprovider.DefaultMultiValueProvider;
import io.onedev.server.buildspec.param.spec.choiceparam.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.model.support.inputspec.choiceinput.ChoiceInput;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.ShowCondition;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/DefaultMultiValueProvider.java
index cdac0c2bb1..c4ef8cc666 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/DefaultMultiValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/DefaultMultiValueProvider.java
@@ -3,6 +3,6 @@ package io.onedev.server.buildspec.param.spec.choiceparam.defaultmultivalueprovi
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-public interface DefaultMultiValueProvider extends io.onedev.server.model.support.inputspec.choiceinput.DefaultMultiValueProvider {
+public interface DefaultMultiValueProvider extends io.onedev.server.buildspecmodel.inputspec.choiceinput.DefaultMultiValueProvider {
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
index 600b10b9d6..c6e92f7285 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty;
import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/DefaultValueProvider.java
index fa610bd54b..30b395e5ae 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/DefaultValueProvider.java
@@ -3,6 +3,6 @@ package io.onedev.server.buildspec.param.spec.choiceparam.defaultvalueprovider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-public interface DefaultValueProvider extends io.onedev.server.model.support.inputspec.choiceinput.DefaultValueProvider {
+public interface DefaultValueProvider extends io.onedev.server.buildspecmodel.inputspec.choiceinput.DefaultValueProvider {
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.java
index 65dcd0c397..45459efadc 100755
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/choiceparam/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,7 +1,7 @@
package io.onedev.server.buildspec.param.spec.choiceparam.defaultvalueprovider;
import io.onedev.server.OneDev;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
index 8434aed100..ae16279c23 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
@@ -3,6 +3,7 @@ package io.onedev.server.buildspec.step;
import java.io.File;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.validation.constraints.NotEmpty;
@@ -16,6 +17,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -26,6 +28,8 @@ public class CloseMilestoneStep extends ServerSideStep {
private String milestoneName;
+ private String accessTokenSecret;
+
@Editable(order=1000, description="Specify name of the milestone")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty
@@ -42,6 +46,24 @@ public class CloseMilestoneStep extends ServerSideStep {
return BuildSpec.suggestVariables(matchWith, true, true, false);
}
+ @Editable(order=1060, description="Specify a secret to be used as access token. This access token " +
+ "should have permission to manage issues in the project")
+ @ChoiceProvider("getAccessTokenSecretChoices")
+ @NotEmpty
+ public String getAccessTokenSecret() {
+ return accessTokenSecret;
+ }
+
+ public void setAccessTokenSecret(String accessTokenSecret) {
+ this.accessTokenSecret = accessTokenSecret;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getAccessTokenSecretChoices() {
+ return Project.get().getHierarchyJobSecrets()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ }
+
@Override
public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {
OneDev.getInstance(TransactionManager.class).run(new Runnable() {
@@ -53,14 +75,18 @@ public class CloseMilestoneStep extends ServerSideStep {
MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);
Milestone milestone = milestoneManager.findInHierarchy(project, milestoneName);
if (milestone != null) {
- if (build.canCloseMilestone(milestoneName)) {
+ // Access token is left empty if we migrate from old version
+ if (getAccessTokenSecret() == null)
+ throw new ExplicitException("Access token secret not specified");
+
+ if (build.canCloseMilestone(getAccessTokenSecret(), milestoneName)) {
milestone.setClosed(true);
milestoneManager.save(milestone);
} else {
throw new ExplicitException("This build is not authorized to close milestone '" + milestoneName + "'");
}
} else {
- logger.log("WARNING: Unable to find milestone '" + milestoneName + "'");
+ logger.warning("Unable to find milestone '" + milestoneName + "' to close. Ignored.");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
index c052eb1272..214325dcf4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
@@ -3,9 +3,11 @@ package io.onedev.server.buildspec.step;
import java.io.File;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.validation.constraints.NotEmpty;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
import org.eclipse.jgit.lib.PersonIdent;
import io.onedev.commons.codeassist.InputSuggestion;
@@ -32,6 +34,8 @@ public class CreateTagStep extends ServerSideStep {
private String tagMessage;
+ private String accessTokenSecret;
+
@Editable(order=1000, description="Specify name of the tag")
@Interpolative(variableSuggester="suggestVariables")
@NotEmpty
@@ -59,13 +63,35 @@ public class CreateTagStep extends ServerSideStep {
return BuildSpec.suggestVariables(matchWith, true, true, false);
}
+ @Editable(order=1060, description="Specify a secret to be used as access token. This access token " +
+ "should have permission to create above tag in the project")
+ @ChoiceProvider("getAccessTokenSecretChoices")
+ @NotEmpty
+ public String getAccessTokenSecret() {
+ return accessTokenSecret;
+ }
+
+ public void setAccessTokenSecret(String accessTokenSecret) {
+ this.accessTokenSecret = accessTokenSecret;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getAccessTokenSecretChoices() {
+ return Project.get().getHierarchyJobSecrets()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ }
+
@Override
public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {
PersonIdent taggerIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();
Project project = build.getProject();
String tagName = getTagName();
- if (build.canCreateTag(tagName)) {
+ // Access token is left empty if we migrate from old version
+ if (getAccessTokenSecret() == null)
+ throw new ExplicitException("Access token secret not specified");
+
+ if (build.canCreateTag(getAccessTokenSecret(), tagName)) {
RefFacade tagRef = project.getTagRef(tagName);
if (tagRef != null)
OneDev.getInstance(ProjectManager.class).deleteTag(project, tagName);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
index bafed1cdeb..08e16e64f5 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
@@ -113,7 +113,7 @@ public class PullRepository extends SyncRepository {
@Override
public Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {
Project buildProject = build.getProject();
- if (!buildProject.isCommitOnBranches(build.getCommitId(), buildProject.getDefaultBranch()))
+ if (!buildProject.isCommitOnBranch(build.getCommitId(), buildProject.getDefaultBranch()))
throw new ExplicitException("For security reason, this step is only allowed to run from default branch");
String remoteUrl = getRemoteUrlWithCredential(build);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
index a2f0e9ca87..de63db17a4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SyncRepository.java
@@ -117,7 +117,7 @@ public abstract class SyncRepository extends ServerSideStep implements Validatab
String encodedPassword = null;
if (getPasswordSecret() != null) {
try {
- String password = build.getJobSecretAuthorizationContext().getSecretValue(getPasswordSecret());
+ String password = build.getJobAuthorizationContext().getSecretValue(getPasswordSecret());
encodedPassword = URLEncoder.encode(password, StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/BuildChoiceInput.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/BuildChoiceInput.java
index ab76a061d2..d62b98d4d3 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/BuildChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/BuildChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec;
+package io.onedev.server.buildspecmodel.inputspec;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/CommitInput.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/CommitInput.java
index 335f6ca221..08f991efb3 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/CommitInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/CommitInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec;
+package io.onedev.server.buildspecmodel.inputspec;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
index 5fb8aa1841..82c08cadba 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputContext.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputContext.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec;
+package io.onedev.server.buildspecmodel.inputspec;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
index 338b2cf0b6..d306d0ec08 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/InputSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/InputSpec.java
@@ -1,295 +1,296 @@
-package io.onedev.server.model.support.inputspec;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang.SerializationUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.unbescape.java.JavaEscape;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;
-import io.onedev.server.util.GroovyUtils;
-import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-public abstract class InputSpec implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private static final Logger logger = LoggerFactory.getLogger(InputSpec.class);
-
- public static final String BOOLEAN = "Checkbox";
-
- public static final String TEXT = "Text";
-
- public static final String DATE = "Date";
-
- public static final String DATE_TIME = "Date Time";
-
- public static final String SECRET = "Secret";
-
- public static final String INTEGER = "Integer";
-
- public static final String FLOAT = "Float";
-
- public static final String WORKING_PERIOD = "Working Period";
-
- public static final String COMMIT = "Commit";
-
- public static final String ENUMERATION = "Enumeration";
-
- public static final String USER = "User";
-
- public static final String GROUP = "Group";
-
- public static final String ISSUE = "Issue";
-
- public static final String MILESTONE = "Milestone";
-
- public static final String BUILD = "Build";
-
- public static final String PULL_REQUEST = "Pull Request";
-
- private String name;
-
- private String description;
-
- private boolean allowMultiple;
-
- private boolean allowEmpty;
-
- private ShowCondition showCondition;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public boolean isAllowMultiple() {
- return allowMultiple;
- }
-
- public void setAllowMultiple(boolean allowMultiple) {
- this.allowMultiple = allowMultiple;
- }
-
- public ShowCondition getShowCondition() {
- return showCondition;
- }
-
- public void setShowCondition(ShowCondition showCondition) {
- this.showCondition = showCondition;
- }
-
- public boolean isAllowEmpty() {
- return allowEmpty;
- }
-
- public void setAllowEmpty(boolean allowEmpty) {
- this.allowEmpty = allowEmpty;
- }
-
- public abstract String getNameOfEmptyValue();
-
- public List<String> getPossibleValues() {
- return Lists.newArrayList();
- }
-
- public static String escape(String string) {
- String escaped = JavaEscape.escapeJava(string);
- // escape $ character since it has special meaning in groovy string
- escaped = escaped.replace("$", "\\$");
-
- return escaped;
- }
-
- public abstract String getPropertyDef(Map<String, Integer> indexes);
-
- protected String getLiteral(byte[] bytes) {
- StringBuffer buffer = new StringBuffer("[");
- for (byte eachByte: bytes) {
- buffer.append(String.format("%d", eachByte)).append(",");
- }
- buffer.append("] as byte[]");
- return buffer.toString();
- }
-
- public void appendField(StringBuffer buffer, int index, String type) {
- buffer.append(" private Optional<" + type + "> input" + index + ";\n");
- buffer.append("\n");
- }
-
- public void appendChoiceProvider(StringBuffer buffer, int index, String annotation) {
- buffer.append(" " + annotation + "(\"getInput" + index + "Choices\")\n");
- }
-
- public void appendCommonAnnotations(StringBuffer buffer, int index) {
- if (description != null && getNameOfEmptyValue() != null) {
- buffer.append(" @Editable(name=\"" + escape(name)
- + "\", placeholder=\"" + escape(getNameOfEmptyValue())
- + "\", description=\"" + escape(description)
- + "\", order=" + index + ")\n");
- } else if (description != null) {
- buffer.append(" @Editable(name=\"" + escape(name)
- + "\", description=\"" + escape(description)
- + "\", order=" + index + ")\n");
- } else if (getNameOfEmptyValue() != null) {
- buffer.append(" @Editable(name=\"" + escape(name)
- + "\", placeholder=\"" + escape(getNameOfEmptyValue())
- + "\", order=" + index + ")\n");
- } else {
- buffer.append(" @Editable(name=\"" + escape(name) +
- "\", order=" + index + ")\n");
- }
- if (showCondition != null)
- buffer.append(" @ShowCondition(\"isInput" + index + "Visible\")\n");
- }
-
- private void wrapWithChildContext(StringBuffer buffer, int index, String statement) {
- buffer.append(" ComponentContext context = ComponentContext.get();\n");
- buffer.append(" if (context != null) {\n");
- buffer.append(" ComponentContext childContext = context.getChildContext(\"input" + index + "\");\n");
- buffer.append(" if (childContext != null) {\n");
- buffer.append(" ComponentContext.push(childContext);\n");
- buffer.append(" try {\n");
- buffer.append(" " + statement + "\n");
- buffer.append(" } finally {\n");
- buffer.append(" ComponentContext.pop();\n");
- buffer.append(" }\n");
- buffer.append(" } else {\n");
- buffer.append(" " + statement + "\n");
- buffer.append(" }\n");
- buffer.append(" } else {\n");
- buffer.append(" " + statement + "\n");
- buffer.append(" }\n");
- }
-
- public void appendMethods(StringBuffer buffer, int index, String type,
- @Nullable Serializable choiceProvider, @Nullable Serializable defaultValueProvider) {
- String literalBytes = getLiteral(SerializationUtils.serialize(defaultValueProvider));
- buffer.append(" public " + type + " getInput" + index + "() {\n");
- buffer.append(" if (input" + index + "!=null) {\n");
- buffer.append(" return input" + index + ".orNull();\n");
- buffer.append(" } else {\n");
- if (defaultValueProvider != null) {
- wrapWithChildContext(buffer, index, "return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();");
- } else {
- buffer.append(" return null;\n");
- }
- buffer.append(" }\n");
- buffer.append(" }\n");
- buffer.append("\n");
-
- buffer.append(" public void setInput" + index + "(" + type + " value) {\n");
- buffer.append(" this.input" + index + "=Optional.fromNullable(value);\n");
- buffer.append(" }\n");
- buffer.append("\n");
-
- if (showCondition != null) {
- buffer.append(" private static boolean isInput" + index + "Visible() {\n");
- literalBytes = getLiteral(SerializationUtils.serialize(showCondition));
- buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").isVisible();\n");
- buffer.append(" }\n");
- buffer.append("\n");
- }
-
- if (choiceProvider != null) {
- buffer.append(" private static List getInput" + index + "Choices() {\n");
- literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));
- if (choiceProvider instanceof io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider) {
- buffer.append(" return new ArrayList(SerializationUtils.deserialize(" + literalBytes + ").getChoices(false).keySet());\n");
- } else {
- buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getChoices(false);\n");
- }
- buffer.append(" }\n");
- buffer.append("\n");
- }
- }
-
- public static Class<?> defineClass(String className, String description, Collection<? extends InputSpec> inputs) {
- StringBuffer buffer = new StringBuffer();
- buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");
- buffer.append("import com.google.common.base.Optional;\n");
- buffer.append("import io.onedev.server.web.editable.annotation.*;\n");
- buffer.append("import io.onedev.server.util.validation.annotation.*;\n");
- buffer.append("import io.onedev.util.*;\n");
- buffer.append("import io.onedev.server.util.*;\n");
- buffer.append("import io.onedev.server.util.facade.*;\n");
- buffer.append("import java.util.*;\n");
- buffer.append("import javax.validation.constraints.*;\n");
- buffer.append("import org.hibernate.validator.constraints.*;\n");
- buffer.append("\n");
- buffer.append("@Editable(name=").append("\"").append(description).append("\")\n");
- buffer.append("class " + className + " implements java.io.Serializable {\n");
- buffer.append("\n");
- buffer.append(" private static final long serialVersionUID = 1L;\n");
- buffer.append("\n");
- Map<String, Integer> indexes = new HashMap<>();
- int index = 1;
- for (InputSpec input: inputs)
- indexes.put(input.getName(), index++);
- for (InputSpec input: inputs)
- buffer.append(input.getPropertyDef(indexes));
-
- buffer.append("}\n");
- buffer.append("return " + className + ";\n");
-
- logger.trace("Class definition script:\n" + buffer.toString());
-
- return (Class<?>) GroovyUtils.evalScript(buffer.toString(), new HashMap<>());
- }
-
- public abstract List<String> convertToStrings(@Nullable Object object);
-
- /**
- * Convert list of strings to object
- *
- * @param strings
- * list of strings
- * @return
- * converted object
- */
- @Nullable
- public abstract Object convertToObject(List<String> strings);
-
- public long getOrdinal(String fieldValue) {
- return -1;
- }
-
- public String getType() {
- return EditableUtils.getDisplayName(getClass());
- }
-
- public boolean checkListElements(Object value, Class<?> elementClass) {
- if (value instanceof List) {
- for (Object element: (List<?>)value) {
- if (element == null || element.getClass() != elementClass)
- return false;
- }
- return true;
- } else {
- return false;
- }
- }
-
-}
+package io.onedev.server.buildspecmodel.inputspec;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
+import org.apache.commons.lang.SerializationUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.unbescape.java.JavaEscape;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.util.GroovyUtils;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public abstract class InputSpec implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(InputSpec.class);
+
+ public static final String BOOLEAN = "Checkbox";
+
+ public static final String TEXT = "Text";
+
+ public static final String DATE = "Date";
+
+ public static final String DATE_TIME = "Date Time";
+
+ public static final String SECRET = "Secret";
+
+ public static final String INTEGER = "Integer";
+
+ public static final String FLOAT = "Float";
+
+ public static final String WORKING_PERIOD = "Working Period";
+
+ public static final String COMMIT = "Commit";
+
+ public static final String ENUMERATION = "Enumeration";
+
+ public static final String USER = "User";
+
+ public static final String GROUP = "Group";
+
+ public static final String ISSUE = "Issue";
+
+ public static final String MILESTONE = "Milestone";
+
+ public static final String BUILD = "Build";
+
+ public static final String PULL_REQUEST = "Pull Request";
+
+ private String name;
+
+ private String description;
+
+ private boolean allowMultiple;
+
+ private boolean allowEmpty;
+
+ private ShowCondition showCondition;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public boolean isAllowMultiple() {
+ return allowMultiple;
+ }
+
+ public void setAllowMultiple(boolean allowMultiple) {
+ this.allowMultiple = allowMultiple;
+ }
+
+ public ShowCondition getShowCondition() {
+ return showCondition;
+ }
+
+ public void setShowCondition(ShowCondition showCondition) {
+ this.showCondition = showCondition;
+ }
+
+ public boolean isAllowEmpty() {
+ return allowEmpty;
+ }
+
+ public void setAllowEmpty(boolean allowEmpty) {
+ this.allowEmpty = allowEmpty;
+ }
+
+ public abstract String getNameOfEmptyValue();
+
+ public List<String> getPossibleValues() {
+ return Lists.newArrayList();
+ }
+
+ public static String escape(String string) {
+ String escaped = JavaEscape.escapeJava(string);
+ // escape $ character since it has special meaning in groovy string
+ escaped = escaped.replace("$", "\\$");
+
+ return escaped;
+ }
+
+ public abstract String getPropertyDef(Map<String, Integer> indexes);
+
+ protected String getLiteral(byte[] bytes) {
+ StringBuffer buffer = new StringBuffer("[");
+ for (byte eachByte: bytes) {
+ buffer.append(String.format("%d", eachByte)).append(",");
+ }
+ buffer.append("] as byte[]");
+ return buffer.toString();
+ }
+
+ public void appendField(StringBuffer buffer, int index, String type) {
+ buffer.append(" private Optional<" + type + "> input" + index + ";\n");
+ buffer.append("\n");
+ }
+
+ public void appendChoiceProvider(StringBuffer buffer, int index, String annotation) {
+ buffer.append(" " + annotation + "(\"getInput" + index + "Choices\")\n");
+ }
+
+ public void appendCommonAnnotations(StringBuffer buffer, int index) {
+ if (description != null && getNameOfEmptyValue() != null) {
+ buffer.append(" @Editable(name=\"" + escape(name)
+ + "\", placeholder=\"" + escape(getNameOfEmptyValue())
+ + "\", description=\"" + escape(description)
+ + "\", order=" + index + ")\n");
+ } else if (description != null) {
+ buffer.append(" @Editable(name=\"" + escape(name)
+ + "\", description=\"" + escape(description)
+ + "\", order=" + index + ")\n");
+ } else if (getNameOfEmptyValue() != null) {
+ buffer.append(" @Editable(name=\"" + escape(name)
+ + "\", placeholder=\"" + escape(getNameOfEmptyValue())
+ + "\", order=" + index + ")\n");
+ } else {
+ buffer.append(" @Editable(name=\"" + escape(name) +
+ "\", order=" + index + ")\n");
+ }
+ if (showCondition != null)
+ buffer.append(" @ShowCondition(\"isInput" + index + "Visible\")\n");
+ }
+
+ private void wrapWithChildContext(StringBuffer buffer, int index, String statement) {
+ buffer.append(" ComponentContext context = ComponentContext.get();\n");
+ buffer.append(" if (context != null) {\n");
+ buffer.append(" ComponentContext childContext = context.getChildContext(\"input" + index + "\");\n");
+ buffer.append(" if (childContext != null) {\n");
+ buffer.append(" ComponentContext.push(childContext);\n");
+ buffer.append(" try {\n");
+ buffer.append(" " + statement + "\n");
+ buffer.append(" } finally {\n");
+ buffer.append(" ComponentContext.pop();\n");
+ buffer.append(" }\n");
+ buffer.append(" } else {\n");
+ buffer.append(" " + statement + "\n");
+ buffer.append(" }\n");
+ buffer.append(" } else {\n");
+ buffer.append(" " + statement + "\n");
+ buffer.append(" }\n");
+ }
+
+ public void appendMethods(StringBuffer buffer, int index, String type,
+ @Nullable Serializable choiceProvider, @Nullable Serializable defaultValueProvider) {
+ String literalBytes = getLiteral(SerializationUtils.serialize(defaultValueProvider));
+ buffer.append(" public " + type + " getInput" + index + "() {\n");
+ buffer.append(" if (input" + index + "!=null) {\n");
+ buffer.append(" return input" + index + ".orNull();\n");
+ buffer.append(" } else {\n");
+ if (defaultValueProvider != null) {
+ wrapWithChildContext(buffer, index, "return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();");
+ } else {
+ buffer.append(" return null;\n");
+ }
+ buffer.append(" }\n");
+ buffer.append(" }\n");
+ buffer.append("\n");
+
+ buffer.append(" public void setInput" + index + "(" + type + " value) {\n");
+ buffer.append(" this.input" + index + "=Optional.fromNullable(value);\n");
+ buffer.append(" }\n");
+ buffer.append("\n");
+
+ if (showCondition != null) {
+ buffer.append(" private static boolean isInput" + index + "Visible() {\n");
+ literalBytes = getLiteral(SerializationUtils.serialize(showCondition));
+ buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").isVisible();\n");
+ buffer.append(" }\n");
+ buffer.append("\n");
+ }
+
+ if (choiceProvider != null) {
+ buffer.append(" private static List getInput" + index + "Choices() {\n");
+ literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));
+ if (choiceProvider instanceof ChoiceProvider) {
+ buffer.append(" return new ArrayList(SerializationUtils.deserialize(" + literalBytes + ").getChoices(false).keySet());\n");
+ } else {
+ buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getChoices(false);\n");
+ }
+ buffer.append(" }\n");
+ buffer.append("\n");
+ }
+ }
+
+ public static Class<?> defineClass(String className, String description, Collection<? extends InputSpec> inputs) {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");
+ buffer.append("import com.google.common.base.Optional;\n");
+ buffer.append("import io.onedev.server.web.editable.annotation.*;\n");
+ buffer.append("import io.onedev.server.util.validation.annotation.*;\n");
+ buffer.append("import io.onedev.util.*;\n");
+ buffer.append("import io.onedev.server.util.*;\n");
+ buffer.append("import io.onedev.server.util.facade.*;\n");
+ buffer.append("import java.util.*;\n");
+ buffer.append("import javax.validation.constraints.*;\n");
+ buffer.append("import org.hibernate.validator.constraints.*;\n");
+ buffer.append("\n");
+ buffer.append("@Editable(name=").append("\"").append(description).append("\")\n");
+ buffer.append("class " + className + " implements java.io.Serializable {\n");
+ buffer.append("\n");
+ buffer.append(" private static final long serialVersionUID = 1L;\n");
+ buffer.append("\n");
+ Map<String, Integer> indexes = new HashMap<>();
+ int index = 1;
+ for (InputSpec input: inputs)
+ indexes.put(input.getName(), index++);
+ for (InputSpec input: inputs)
+ buffer.append(input.getPropertyDef(indexes));
+
+ buffer.append("}\n");
+ buffer.append("return " + className + ";\n");
+
+ logger.trace("Class definition script:\n" + buffer.toString());
+
+ return (Class<?>) GroovyUtils.evalScript(buffer.toString(), new HashMap<>());
+ }
+
+ public abstract List<String> convertToStrings(@Nullable Object object);
+
+ /**
+ * Convert list of strings to object
+ *
+ * @param strings
+ * list of strings
+ * @return
+ * converted object
+ */
+ @Nullable
+ public abstract Object convertToObject(List<String> strings);
+
+ public long getOrdinal(String fieldValue) {
+ return -1;
+ }
+
+ public String getType() {
+ return EditableUtils.getDisplayName(getClass());
+ }
+
+ public boolean checkListElements(Object value, Class<?> elementClass) {
+ if (value instanceof List) {
+ for (Object element: (List<?>)value) {
+ if (element == null || element.getClass() != elementClass)
+ return false;
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IssueChoiceInput.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IssueChoiceInput.java
index 5eda016048..363afb4dd6 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/IssueChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/IssueChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec;
+package io.onedev.server.buildspecmodel.inputspec;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/MilestoneChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/MilestoneChoiceInput.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/MilestoneChoiceInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/MilestoneChoiceInput.java
index 8c9c7137a4..d9f4635042 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/MilestoneChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/MilestoneChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec;
+package io.onedev.server.buildspecmodel.inputspec;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/PullRequestChoiceInput.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/PullRequestChoiceInput.java
index 51888296f8..d800e4003a 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/PullRequestChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/PullRequestChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec;
+package io.onedev.server.buildspecmodel.inputspec;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/SecretInput.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/SecretInput.java
index 292686ead1..449f2494ff 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/SecretInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/SecretInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec;
+package io.onedev.server.buildspecmodel.inputspec;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java
index 5a81ecf216..b1f0358562 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/BooleanInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.booleaninput;
+package io.onedev.server.buildspecmodel.inputspec.booleaninput;
import java.util.List;
import java.util.Map;
@@ -7,8 +7,8 @@ import javax.validation.ValidationException;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.web.util.TextUtils;
public class BooleanInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java
similarity index 69%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java
index 242163023f..f4d4db2c41 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java
similarity index 76%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java
index 11275c06d1..f87efde8f5 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/FalseDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
index a7cd93c61e..9478689655 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java
similarity index 76%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java
index 7dcf76ffaa..030bd93a83 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/booleaninput/defaultvalueprovider/TrueDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java
index 2121a2a95d..8fc3d06e11 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/ChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/ChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.choiceinput;
+package io.onedev.server.buildspecmodel.inputspec.choiceinput;
import java.util.ArrayList;
import java.util.List;
@@ -9,8 +9,8 @@ import javax.validation.Validator;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
public class ChoiceInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/DefaultMultiValueProvider.java
similarity index 78%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/DefaultMultiValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/DefaultMultiValueProvider.java
index 634ad66fbd..5386f5bffb 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/DefaultMultiValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/DefaultMultiValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.choiceinput;
+package io.onedev.server.buildspecmodel.inputspec.choiceinput;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/DefaultValueProvider.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/DefaultValueProvider.java
index 2fba1f7654..5ab9a651c6 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.choiceinput;
+package io.onedev.server.buildspecmodel.inputspec.choiceinput;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/Choice.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/Choice.java
index 8095e2c666..57205c73b6 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/Choice.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/Choice.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ChoiceProvider.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ChoiceProvider.java
index 6fad200474..991503aa83 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ChoiceProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider;
import java.io.Serializable;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
index 8a7b596909..9a1f281c1c 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider;
import java.util.HashMap;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
index 940dae7ad4..2642a60a63 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.choiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider;
import java.util.ArrayList;
import java.util.HashSet;
@@ -14,7 +14,7 @@ import javax.validation.constraints.Size;
import io.onedev.server.buildspec.param.spec.choiceparam.ChoiceParam;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.util.match.Matcher;
import io.onedev.server.util.match.PathMatcher;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java
index f5e7ad3a0e..52c9326388 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/DateInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.dateinput;
+package io.onedev.server.buildspecmodel.inputspec.dateinput;
import java.util.ArrayList;
import java.util.List;
@@ -6,12 +6,12 @@ import java.util.Map;
import javax.validation.ValidationException;
+import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;
import org.joda.time.DateTime;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.util.Constants;
public class DateInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 72%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java
index 3907956cee..12a5aa55bb 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider;
import java.io.Serializable;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
index 6b90000fbf..ac061a0627 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java
index 785b1e616e..58deb2b7ba 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/DateTimeInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java
similarity index 81%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/DateTimeInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java
index 54d2afe499..7a4660cd3d 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/DateTimeInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.datetimeinput;
+package io.onedev.server.buildspecmodel.inputspec.datetimeinput;
import java.util.ArrayList;
import java.util.List;
@@ -6,18 +6,18 @@ import java.util.Map;
import javax.validation.ValidationException;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;
import org.joda.time.DateTime;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.Constants;
public class DateTimeInput {
- public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
- DefaultValueProvider defaultValueProvider) {
+ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
+ DefaultValueProvider defaultValueProvider) {
int index = indexes.get(inputSpec.getName());
StringBuffer buffer = new StringBuffer();
inputSpec.appendField(buffer, index, "Date");
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 71%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/DefaultValueProvider.java
index 23563f5f21..82aee4b763 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider;
import java.io.Serializable;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java
index 2038605ce0..245a489d08 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java
index e82df0db0f..1806794f70 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider;
import java.util.Date;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/FloatInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/FloatInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java
index a36192c741..54ba53e947 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/FloatInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/FloatInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.floatinput;
+package io.onedev.server.buildspecmodel.inputspec.floatinput;
import java.util.ArrayList;
import java.util.List;
@@ -8,8 +8,8 @@ import javax.validation.ValidationException;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
public class FloatInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 69%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/DefaultValueProvider.java
index 8789352e91..8deda92d83 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java
index f6779b9c7b..c36fa459f8 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/SpecifiedDefaultValue.java
index ecac053071..9c65e756ce 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/floatinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/floatinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java
index 484ae61c56..4f3906bb97 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/GroupChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/GroupChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.groupchoiceinput;
+package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput;
import java.util.ArrayList;
import java.util.List;
@@ -10,10 +10,10 @@ import javax.validation.Validator;
import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.model.Group;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
public class GroupChoiceInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
index df43f7b878..2889f8518c 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/AllGroups.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider;
import java.util.Comparator;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
similarity index 76%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
index 58896ee074..28229f1a57 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ChoiceProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
index 9ad1a93e2c..3af8a971c4 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 68%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
index 7ed73b6321..895cb97569 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 1d5a6ce1bf..fbd1abbd4c 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
index c6a8e90934..c9b7320d84 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/groupchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider;
import java.util.List;
@@ -11,7 +11,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.util.EditContext;
import io.onedev.server.model.Group;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.GroupChoice;
import io.onedev.server.web.editable.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/IntegerInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/IntegerInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java
index 593e8b8a7a..7b3070ef3f 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/IntegerInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/IntegerInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.integerinput;
+package io.onedev.server.buildspecmodel.inputspec.integerinput;
import java.util.ArrayList;
import java.util.List;
@@ -8,8 +8,8 @@ import javax.validation.ValidationException;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
public class IntegerInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 69%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/DefaultValueProvider.java
index 797a7378e2..525541eaa7 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java
index 5a363909ae..8ea4def12e 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/SpecifiedDefaultValue.java
index 2675979a6c..c8efebd9dc 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/integerinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/integerinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ShowCondition.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ShowCondition.java
index b8b64d7a58..2c727ee224 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ShowCondition.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ShowCondition.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.showcondition;
+package io.onedev.server.buildspecmodel.inputspec.showcondition;
import java.io.Serializable;
import java.util.ArrayList;
@@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsEmpty.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsEmpty.java
index 75a2c49796..ee830a51cd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsEmpty.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsEmpty.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.showcondition;
+package io.onedev.server.buildspecmodel.inputspec.showcondition;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotAnyOf.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotAnyOf.java
index cc00ea44ae..3b9cc8319e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotAnyOf.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotAnyOf.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.showcondition;
+package io.onedev.server.buildspecmodel.inputspec.showcondition;
import java.util.List;
@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotEmpty.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotEmpty.java
index 25dc5c1c17..57aff58665 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsNotEmpty.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsNotEmpty.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.showcondition;
+package io.onedev.server.buildspecmodel.inputspec.showcondition;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsOneOf.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsOneOf.java
index 1c36914264..7f42e85a73 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueIsOneOf.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueIsOneOf.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.showcondition;
+package io.onedev.server.buildspecmodel.inputspec.showcondition;
import java.util.List;
@@ -11,8 +11,8 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueMatcher.java
similarity index 77%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueMatcher.java
index 97ccfa6d37..cfeb7b6335 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/showcondition/ValueMatcher.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/showcondition/ValueMatcher.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.showcondition;
+package io.onedev.server.buildspecmodel.inputspec.showcondition;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
index 87ae765e65..088a7db77b 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/TextInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/TextInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.textinput;
+package io.onedev.server.buildspecmodel.inputspec.textinput;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -10,8 +10,8 @@ import javax.validation.ValidationException;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
public class TextInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 70%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java
index 63a92618b2..523e14c143 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
index c5b5e1a633..289b49086d 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java
index 147c041121..e78d8cdba2 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/textinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java
index 346267015d..688cdff5a4 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/UserChoiceInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/UserChoiceInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput;
import java.util.ArrayList;
import java.util.List;
@@ -8,11 +8,11 @@ import java.util.stream.Collectors;
import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;
-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;
public class UserChoiceInput {
@@ -23,9 +23,9 @@ public class UserChoiceInput {
.collect(Collectors.toList());
}
- public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
- ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider,
- DefaultMultiValueProvider defaultMultiValueProvider) {
+ public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,
+ ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider,
+ DefaultMultiValueProvider defaultMultiValueProvider) {
int index = indexes.get(inputSpec.getName());
StringBuffer buffer = new StringBuffer();
inputSpec.appendField(buffer, index, inputSpec.isAllowMultiple()? "List<String>": "String");
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/AllUsers.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/AllUsers.java
index 3cf8c51e86..7a466756c8 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/AllUsers.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/AllUsers.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java
similarity index 76%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java
index d896bba494..383bc77f44 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ChoiceProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
index 27db44b47e..a92844b195 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java
similarity index 71%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java
index a7eda8af23..7ebccc0ec9 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider;
import java.io.Serializable;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
index 1578af26db..3aa65c1125 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
index 68a414ad52..b4791e967e 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider;
import java.util.ArrayList;
import java.util.List;
@@ -8,8 +8,8 @@ import javax.validation.Validator;
import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 77%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java
index 6d975c1604..34518b1d02 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/groupchoiceinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 117b4bb1a5..39c8070278 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
index 7f446729cd..70d72f2b06 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/WorkingPeriodInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/WorkingPeriodInput.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/WorkingPeriodInput.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/WorkingPeriodInput.java
index 407e0f1a53..eedd0bd7dc 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/WorkingPeriodInput.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/WorkingPeriodInput.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.workingperiodinput;
+package io.onedev.server.buildspecmodel.inputspec.workingperiodinput;
import java.util.ArrayList;
import java.util.List;
@@ -8,8 +8,8 @@ import javax.validation.ValidationException;
import com.google.common.collect.Lists;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.util.DateUtils;
public class WorkingPeriodInput {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/DefaultValueProvider.java
similarity index 68%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/DefaultValueProvider.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/DefaultValueProvider.java
index 38b2278772..20320884d7 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/DefaultValueProvider.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java
index 374ece5400..c4bc6172a3 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider;
import javax.validation.constraints.NotEmpty;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/SpecifiedDefaultValue.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/SpecifiedDefaultValue.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/SpecifiedDefaultValue.java
rename to server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/SpecifiedDefaultValue.java
index adb9142db7..6d89597052 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/workingperiodinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/defaultvalueprovider/SpecifiedDefaultValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider;
+package io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider;
import javax.validation.constraints.NotNull;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
index 53cf5fe814..784596cba4 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java
@@ -1,17 +1,6 @@
package io.onedev.server.entitymanager.impl;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
import com.hazelcast.core.HazelcastInstance;
-
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueFieldManager;
@@ -34,6 +23,14 @@ import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.util.facade.GroupCache;
import io.onedev.server.util.facade.GroupFacade;
import io.onedev.server.util.usage.Usage;
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.List;
@Singleton
public class DefaultGroupManager extends BaseEntityManager<Group> implements GroupManager {
@@ -91,21 +88,18 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro
@Transactional
@Listen
public void on(EntityPersisted event) {
- if (event.getEntity() instanceof Group)
- cacheAfterCommit((Group) event.getEntity());
- }
-
- private void cacheAfterCommit(Group group) {
- GroupFacade facade = group.getFacade();
- transactionManager.runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- if (cache != null)
- cache.put(facade.getId(), facade);
- }
-
- });
+ if (event.getEntity() instanceof Group) {
+ GroupFacade facade = ((Group)event.getEntity()).getFacade();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ if (cache != null)
+ cache.put(facade.getId(), facade);
+ }
+
+ });
+ }
}
@Transactional
@@ -113,10 +107,15 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro
public void save(Group group, String oldName) {
if (oldName != null && !oldName.equals(group.getName())) {
for (Project project: projectManager.query()) {
- for (BranchProtection protection: project.getBranchProtections())
- protection.onRenameGroup(oldName, group.getName());
- for (TagProtection protection: project.getTagProtections())
- protection.onRenameGroup(oldName, group.getName());
+ try {
+ for (BranchProtection protection : project.getBranchProtections())
+ protection.onRenameGroup(oldName, group.getName());
+ for (TagProtection protection : project.getTagProtections())
+ protection.onRenameGroup(oldName, group.getName());
+ project.getBuildSetting().onRenameGroup(oldName, group.getName());
+ } catch (Exception e) {
+ throw new RuntimeException("Error checking group reference in project '" + project.getPath() + "'", e);
+ }
}
settingManager.onRenameGroup(oldName, group.getName());
@@ -130,13 +129,18 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro
public void delete(Group group) {
Usage usage = new Usage();
for (Project project: projectManager.query()) {
- Usage usedInProject = new Usage();
- for (BranchProtection protection: project.getBranchProtections())
- usedInProject.add(protection.onDeleteGroup(group.getName()));
- for (TagProtection protection: project.getTagProtections())
- usedInProject.add(protection.onDeleteGroup(group.getName()));
- usedInProject.prefix("project '" + project.getPath() + "': settings");
- usage.add(usedInProject);
+ try {
+ Usage usageInProject = new Usage();
+ for (BranchProtection protection : project.getBranchProtections())
+ usageInProject.add(protection.onDeleteGroup(group.getName()));
+ for (TagProtection protection : project.getTagProtections())
+ usageInProject.add(protection.onDeleteGroup(group.getName()));
+ project.getBuildSetting().onDeleteGroup(group.getName());
+ usageInProject.prefix("project '" + project.getPath() + "': settings");
+ usage.add(usageInProject);
+ } catch (Exception e) {
+ throw new RuntimeException("Error checking group reference in project '" + project.getPath() + "'", e);
+ }
}
usage.add(settingManager.onDeleteGroup(group.getName()));
@@ -148,8 +152,8 @@ public class DefaultGroupManager extends BaseEntityManager<Group> implements Gro
@Sessional
@Override
- public Group find(String groupName) {
- GroupFacade facade = cache.find(groupName);
+ public Group find(String name) {
+ GroupFacade facade = cache.find(name);
if (facade != null)
return load(facade.getId());
else
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index b9f5bab3ba..36e6b1d85b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -344,7 +344,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
ObjectId commitId = ObjectId.fromString(build.getCommitHash());
if ((trigger.getJobNames() == null || PatternSet.parse(trigger.getJobNames()).matches(new StringMatcher(), build.getJobName()))
&& build.getStatus() == Build.Status.SUCCESSFUL
- && (branches == null || project.isCommitOnBranches(commitId, branches))) {
+ && (branches == null || project.isCommitOnBranches(commitId, PatternSet.parse(branches)))) {
IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), option, true);
List<Criteria<Issue>> criterias = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 0f24d71906..de462ecd38 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -17,7 +17,7 @@ import io.onedev.server.migration.VersionedXmlDoc;
import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.model.support.issue.changedata.IssueProjectChangeData;
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 687d26df7c..7841f0815d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -678,7 +678,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
checkReviews(branchProtection.getParsedReviewRequirement(),
request, changedFiles, sourceUpdated);
- ReviewRequirement checkedRequirement = ReviewRequirement.parse(null, true);
+ ReviewRequirement checkedRequirement = ReviewRequirement.parse(null);
for (String file: changedFiles) {
FileProtection fileProtection = branchProtection.getFileProtection(file);
@@ -718,8 +718,6 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
private void checkReviews(Collection<User> users, int requiredCount,
PullRequest request, Collection<String> changedFiles, boolean sourceUpdated) {
- if (requiredCount == 0)
- requiredCount = users.size();
for (User user: users) {
PullRequestReview review = request.getReview(user);
if (review != null && review.getStatus() != PullRequestReview.Status.EXCLUDED) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
index 05c2728878..02023b543e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java
@@ -1,44 +1,41 @@
package io.onedev.server.entitymanager.impl;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.ReplicationMode;
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
+import com.hazelcast.core.HazelcastInstance;
+import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.entitymanager.LinkAuthorizationManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.Role;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.role.AllIssueFields;
-import io.onedev.server.model.support.role.CodePrivilege;
-import io.onedev.server.model.support.role.ExcludeIssueFields;
-import io.onedev.server.model.support.role.IncludeIssueFields;
-import io.onedev.server.model.support.role.IssueFieldSet;
-import io.onedev.server.model.support.role.JobPrivilege;
-import io.onedev.server.model.support.role.NoneIssueFields;
+import io.onedev.server.model.support.role.*;
import io.onedev.server.persistence.IdManager;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.util.facade.RoleCache;
+import io.onedev.server.util.facade.RoleFacade;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
+import org.hibernate.ReplicationMode;
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.*;
@Singleton
public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleManager {
@@ -51,14 +48,24 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
private final ProjectManager projectManager;
+ private final ClusterManager clusterManager;
+
+ private final TransactionManager transactionManager;
+
+ private volatile RoleCache cache;
+
@Inject
public DefaultRoleManager(Dao dao, SettingManager settingManager, IdManager idManager,
- LinkAuthorizationManager linkAuthorizationManager, ProjectManager projectManager) {
+ LinkAuthorizationManager linkAuthorizationManager,
+ ProjectManager projectManager, ClusterManager clusterManager,
+ TransactionManager transactionManager) {
super(dao);
this.settingManager = settingManager;
this.idManager = idManager;
this.linkAuthorizationManager = linkAuthorizationManager;
this.projectManager = projectManager;
+ this.clusterManager = clusterManager;
+ this.transactionManager = transactionManager;
}
@Transactional
@@ -67,7 +74,50 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
getSession().replicate(role, ReplicationMode.OVERWRITE);
idManager.useId(Role.class, role.getId());
}
-
+
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ HazelcastInstance hazelcastInstance = clusterManager.getHazelcastInstance();
+ cache = new RoleCache(hazelcastInstance.getReplicatedMap("roleCache"));
+
+ for (var role: query())
+ cache.put(role.getId(), role.getFacade());
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof Role) {
+ Long id = event.getEntity().getId();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ cache.remove(id);
+ }
+
+ });
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof Role) {
+ RoleFacade facade = ((Role)event.getEntity()).getFacade();
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ if (cache != null)
+ cache.put(facade.getId(), facade);
+ }
+
+ });
+ }
+ }
+
@Transactional
@Override
public void save(Role role, Collection<LinkSpec> authorizedLinks, String oldName) {
@@ -84,7 +134,7 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
Usage usage = new Usage();
usage.add(settingManager.onDeleteRole(role.getName()));
-
+
usage.checkInUse("Role '" + role.getName() + "'");
for (Project project: role.getDefaultProjects()) {
@@ -108,10 +158,11 @@ public class DefaultRoleManager extends BaseEntityManager<Role> implements RoleM
@Sessional
@Override
public Role find(String name) {
- EntityCriteria<Role> criteria = newCriteria();
- criteria.add(Restrictions.ilike("name", name));
- criteria.setCacheable(true);
- return dao.find(criteria);
+ RoleFacade facade = cache.find(name);
+ if (facade != null)
+ return load(facade.getId());
+ else
+ return null;
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 8bec3b759f..abf77007f9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -1,508 +1,499 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.Validator;
-
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Setting;
-import io.onedev.server.model.Setting.Key;
-import io.onedev.server.model.support.administration.AgentSetting;
-import io.onedev.server.model.support.administration.BackupSetting;
-import io.onedev.server.model.support.administration.BrandingSetting;
-import io.onedev.server.model.support.administration.GlobalBuildSetting;
-import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.administration.GlobalProjectSetting;
-import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
-import io.onedev.server.model.support.administration.GpgSetting;
-import io.onedev.server.model.support.administration.GroovyScript;
-import io.onedev.server.model.support.administration.PerformanceSetting;
-import io.onedev.server.model.support.administration.SecuritySetting;
-import io.onedev.server.model.support.administration.ServiceDeskSetting;
-import io.onedev.server.model.support.administration.SshSetting;
-import io.onedev.server.model.support.administration.SystemSetting;
-import io.onedev.server.model.support.administration.authenticator.Authenticator;
-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.model.support.administration.mailsetting.MailSetting;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
-import io.onedev.server.model.support.administration.sso.SsoConnector;
-import io.onedev.server.persistence.DataManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.util.usage.Usage;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
-import io.onedev.server.web.page.layout.ContributedAdministrationSetting;
-
-@Singleton
-public class DefaultSettingManager extends BaseEntityManager<Setting> implements SettingManager {
-
- private final ClusterManager clusterManager;
-
- private volatile Map<Key, Serializable> settingValues;
-
- @Inject
- public DefaultSettingManager(Dao dao, DataManager dataManager, ClusterManager clusterManager) {
- super(dao);
- this.clusterManager = clusterManager;
- }
-
- @Override
- @Sessional
- public void init() {
- settingValues = clusterManager.getHazelcastInstance().getReplicatedMap("settingValues");
- for (Setting setting: query()) {
- if (setting.getValue() != null)
- settingValues.put(setting.getKey(), setting.getValue());
- }
- }
-
- @Override
- public SystemSetting getSystemSetting() {
- return (SystemSetting) settingValues.get(Key.SYSTEM);
- }
-
- @Sessional
- @Override
- public Setting findSetting(Key key) {
- return find(EntityCriteria.of(Setting.class).add(Restrictions.eq("key", key)));
- }
-
- private void saveSetting(Key key, Serializable value) {
- Setting setting = findSetting(key);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(key);
- }
- setting.setValue(value);
- dao.persist(setting);
-
- if (value != null)
- settingValues.put(key, value);
- else
- settingValues.remove(key);
- }
-
- @Override
- public MailSetting getMailSetting() {
- return (MailSetting) settingValues.get(Key.MAIL);
- }
-
- @Override
- public BackupSetting getBackupSetting() {
- return (BackupSetting) settingValues.get(Key.BACKUP);
- }
-
- @Override
- public BrandingSetting getBrandingSetting() {
- return (BrandingSetting) settingValues.get(Key.BRANDING);
- }
-
- @Override
- public SecuritySetting getSecuritySetting() {
- return (SecuritySetting) settingValues.get(Key.SECURITY);
- }
-
- @Override
- public GlobalIssueSetting getIssueSetting() {
- return (GlobalIssueSetting) settingValues.get(Key.ISSUE);
- }
-
- @Override
- public Authenticator getAuthenticator() {
- return (Authenticator) settingValues.get(Key.AUTHENTICATOR);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<JobExecutor> getJobExecutors() {
- return (List<JobExecutor>) settingValues.get(Key.JOB_EXECUTORS);
- }
-
- @Override
- public NotificationTemplateSetting getNotificationTemplateSetting() {
- return (NotificationTemplateSetting) settingValues.get(Key.NOTIFICATION_TEMPLATE_SETTING);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<GroovyScript> getGroovyScripts() {
- return (List<GroovyScript>) settingValues.get(Key.GROOVY_SCRIPTS);
- }
-
- @Override
- public GlobalPullRequestSetting getPullRequestSetting() {
- return (GlobalPullRequestSetting) settingValues.get(Key.PULL_REQUEST);
- }
-
- @Override
- public GlobalBuildSetting getBuildSetting() {
- return (GlobalBuildSetting) settingValues.get(Key.BUILD);
- }
-
- @Override
- public GlobalProjectSetting getProjectSetting() {
- return (GlobalProjectSetting) settingValues.get(Key.PROJECT);
- }
-
- @Override
- public AgentSetting getAgentSetting() {
- return (AgentSetting) settingValues.get(Key.AGENT);
- }
-
- @Override
- public SshSetting getSshSetting() {
- return (SshSetting) settingValues.get(Key.SSH);
- }
-
- @Override
- public PerformanceSetting getPerformanceSetting() {
- return (PerformanceSetting) settingValues.get(Key.PERFORMANCE);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<SsoConnector> getSsoConnectors() {
- return (List<SsoConnector>) settingValues.get(Key.SSO_CONNECTORS);
- }
-
- @Override
- public ServiceDeskSetting getServiceDeskSetting() {
- return (ServiceDeskSetting) settingValues.get(Key.SERVICE_DESK_SETTING);
- }
-
- @Override
- public GpgSetting getGpgSetting() {
- return (GpgSetting) settingValues.get(Key.GPG);
- }
-
- @Transactional
- @Override
- public void saveSystemSetting(SystemSetting systemSetting) {
- saveSetting(Key.SYSTEM, systemSetting);
- }
-
- @Transactional
- @Override
- public void saveMailSetting(MailSetting mailSetting) {
- saveSetting(Key.MAIL, mailSetting);
- }
-
- @Transactional
- @Override
- public void saveBackupSetting(BackupSetting backupSetting) {
- saveSetting(Key.BACKUP, backupSetting);
- }
-
- @Transactional
- @Override
- public void saveBrandingSetting(BrandingSetting brandingSetting) {
- saveSetting(Key.BRANDING, brandingSetting);
- }
-
- @Transactional
- @Override
- public void saveSecuritySetting(SecuritySetting securitySetting) {
- saveSetting(Key.SECURITY, securitySetting);
- }
-
- @Transactional
- @Override
- public void saveIssueSetting(GlobalIssueSetting issueSetting) {
- saveSetting(Key.ISSUE, issueSetting);
- }
-
- @Transactional
- @Override
- public void saveAuthenticator(Authenticator authenticator) {
- saveSetting(Key.AUTHENTICATOR, authenticator);
- }
-
- @Transactional
- @Override
- public void saveJobExecutors(List<JobExecutor> jobExecutors) {
- saveSetting(Key.JOB_EXECUTORS, (Serializable) jobExecutors);
- }
-
- @Transactional
- @Override
- public void saveNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting) {
- saveSetting(Key.NOTIFICATION_TEMPLATE_SETTING, notificationTemplateSetting);
- }
-
- @Transactional
- @Override
- public void saveServiceDeskSetting(ServiceDeskSetting serviceDeskSetting) {
- saveSetting(Key.SERVICE_DESK_SETTING, serviceDeskSetting);
- }
-
- @Transactional
- @Override
- public void saveGroovyScripts(List<GroovyScript> groovyScripts) {
- saveSetting(Key.GROOVY_SCRIPTS, (Serializable) groovyScripts);
- }
-
- @Transactional
- @Override
- public void savePullRequestSetting(GlobalPullRequestSetting pullRequestSetting) {
- saveSetting(Key.PULL_REQUEST, pullRequestSetting);
- }
-
- @Transactional
- @Override
- public void saveBuildSetting(GlobalBuildSetting buildSetting) {
- saveSetting(Key.BUILD, buildSetting);
- }
-
- @Transactional
- @Override
- public void saveProjectSetting(GlobalProjectSetting projectSetting) {
- saveSetting(Key.PROJECT, projectSetting);
- }
-
- @Transactional
- @Override
- public void saveAgentSetting(AgentSetting agentSetting) {
- saveSetting(Key.AGENT, agentSetting);
- }
-
- @Transactional
- @Override
- public void savePerformanceSetting(PerformanceSetting performanceSetting) {
- saveSetting(Key.PERFORMANCE, performanceSetting);
- }
-
- @Transactional
- @Override
- public void saveSshSetting(SshSetting sshSetting) {
- saveSetting(Key.SSH, sshSetting);
- }
-
- @Transactional
- @Override
- public void saveGpgSetting(GpgSetting gpgSetting) {
- saveSetting(Key.GPG, gpgSetting);
- }
-
- @Transactional
- @Override
- public void saveSsoConnectors(List<SsoConnector> ssoConnectors) {
- saveSetting(Key.SSO_CONNECTORS, (Serializable) ssoConnectors);
- }
-
- @Transactional
- @Override
- public void saveContributedSettings(Map<String, ContributedAdministrationSetting> contributedSettings) {
- saveSetting(Key.CONTRIBUTED_SETTINGS, (Serializable) contributedSettings);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Map<String, ContributedAdministrationSetting> getContributedSettings() {
- return (Map<String, ContributedAdministrationSetting>) settingValues.get(Key.CONTRIBUTED_SETTINGS);
- }
-
- @Nullable
- @SuppressWarnings("unchecked")
- public <T extends ContributedAdministrationSetting> T getContributedSetting(Class<T> settingClass) {
- T contributedSetting = (T) getContributedSettings().get(settingClass.getName());
- if (contributedSetting == null) {
- try {
- T value = settingClass.getDeclaredConstructor().newInstance();
- if (OneDev.getInstance(Validator.class).validate(value).isEmpty())
- contributedSetting = value;
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException | NoSuchMethodException | SecurityException e) {
- throw new RuntimeException(e);
- }
- }
-
- return contributedSetting;
- }
-
- public void saveContributedSetting(Class<? extends ContributedAdministrationSetting> settingClass,
- @Nullable ContributedAdministrationSetting setting) {
- Map<String, ContributedAdministrationSetting> contributedSettings = getContributedSettings();
- contributedSettings.put(settingClass.getName(), setting);
- saveSetting(Key.CONTRIBUTED_SETTINGS, (Serializable) contributedSettings);
- }
-
- @Override
- public Collection<String> getUndefinedIssueFields() {
- Collection<String> undefinedFields = new HashSet<>();
- undefinedFields.addAll(getIssueSetting().getUndefinedFields());
- if (getServiceDeskSetting() != null)
- undefinedFields.addAll(getServiceDeskSetting().getUndefinedIssueFields());
- return undefinedFields;
- }
-
- @Override
- public Collection<UndefinedFieldValue> getUndefinedIssueFieldValues() {
- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- undefinedFieldValues.addAll(getIssueSetting().getUndefinedFieldValues());
- if (getServiceDeskSetting() != null)
- undefinedFieldValues.addAll(getServiceDeskSetting().getUndefinedIssueFieldValues());
- return undefinedFieldValues;
- }
-
- @Override
- public Collection<String> fixUndefinedIssueFields(Map<String, UndefinedFieldResolution> resolutions) {
- Collection<String> deletedFields = new HashSet<>();
- deletedFields.addAll(getIssueSetting().fixUndefinedFields(resolutions));
- if (getServiceDeskSetting() != null)
- getServiceDeskSetting().fixUndefinedIssueFields(resolutions);
- saveSetting(Key.ISSUE, getIssueSetting());
- saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
- return deletedFields;
- }
-
- @Override
- public Collection<String> fixUndefinedIssueFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {
- Collection<String> deletedFields = new HashSet<>();
- deletedFields.addAll(getIssueSetting().fixUndefinedFieldValues(resolutions));
- if (getServiceDeskSetting() != null)
- getServiceDeskSetting().fixUndefinedIssueFieldValues(resolutions);
- saveSetting(Key.ISSUE, getIssueSetting());
- saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
- return deletedFields;
- }
-
- @Override
- public void onRenameRole(String oldName, String newName) {
- getIssueSetting().onRenameRole(oldName, newName);
- if (getServiceDeskSetting() != null)
- getServiceDeskSetting().onRenameRole(oldName, newName);
- saveSetting(Key.ISSUE, getIssueSetting());
- saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
- }
-
- @Override
- public Usage onDeleteRole(String roleName) {
- Usage usage = new Usage();
-
- usage.add(getIssueSetting().onDeleteRole(roleName));
- if (getServiceDeskSetting() != null)
- usage.add(getServiceDeskSetting().onDeleteRole(roleName));
-
- return usage.prefix("administration");
- }
-
- @Override
- public void onMoveProject(String oldPath, String newPath) {
- for (JobExecutor jobExecutor: getJobExecutors())
- jobExecutor.onMoveProject(oldPath, newPath);
- for (GroovyScript groovyScript: getGroovyScripts())
- groovyScript.onMoveProject(oldPath, newPath);
- if (getServiceDeskSetting() != null)
- getServiceDeskSetting().onMoveProject(oldPath, newPath);
- getIssueSetting().onMoveProject(oldPath, newPath);
-
- saveSetting(Key.JOB_EXECUTORS, (Serializable) getJobExecutors());
- saveSetting(Key.GROOVY_SCRIPTS, (Serializable) getGroovyScripts());
- saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
- saveSetting(Key.ISSUE, getIssueSetting());
- }
-
- @Override
- public Usage onDeleteProject(String projectPath) {
- Usage usage = new Usage();
- int index = 1;
- for (JobExecutor jobExecutor: getJobExecutors()) {
- usage.add(jobExecutor.onDeleteProject(projectPath).prefix("job executor #" + index));
- index++;
- }
-
- index = 1;
- for (GroovyScript groovyScript: getGroovyScripts()) {
- usage.add(groovyScript.onDeleteProject(projectPath).prefix("groovy script #" + index));
- index++;
- }
- if (getServiceDeskSetting() != null)
- usage.add(getServiceDeskSetting().onDeleteProject(projectPath));
- usage.add(getIssueSetting().onDeleteProject(projectPath));
-
- return usage.prefix("administration");
- }
-
- @Override
- public void onRenameGroup(String oldName, String newName) {
- Authenticator authenticator = getAuthenticator();
- if (authenticator != null)
- authenticator.onRenameGroup(oldName, newName);
- getIssueSetting().onRenameGroup(oldName, newName);
- getSecuritySetting().onRenameGroup(oldName, newName);
-
- saveSetting(Key.AUTHENTICATOR, getAuthenticator());
- saveSetting(Key.ISSUE, getIssueSetting());
- saveSetting(Key.SECURITY, getSecuritySetting());
- }
-
- @Override
- public Usage onDeleteGroup(String groupName) {
- Usage usage = new Usage();
-
- usage.add(getIssueSetting().onDeleteGroup(groupName));
- usage.add(getSecuritySetting().onDeleteGroup(groupName));
-
- Authenticator authenticator = getAuthenticator();
- if (authenticator != null)
- usage.add(authenticator.onDeleteGroup(groupName));
-
- return usage.prefix("administration");
- }
-
- @Override
- public void onRenameUser(String oldName, String newName) {
- for (JobExecutor jobExecutor: getJobExecutors())
- jobExecutor.onRenameUser(oldName, newName);
- getIssueSetting().onRenameUser(oldName, newName);
-
- saveSetting(Key.JOB_EXECUTORS, (Serializable) getJobExecutors());
- saveSetting(Key.ISSUE, getIssueSetting());
- }
-
- @Override
- public Usage onDeleteUser(String userName) {
- Usage usage = new Usage();
-
- int index = 1;
- for (JobExecutor jobExecutor: getJobExecutors()) {
- usage.add(jobExecutor.onDeleteUser(userName).prefix("job executor #" + index));
- index++;
- }
-
- usage.add(getIssueSetting().onDeleteUser(userName));
-
- return usage.prefix("administration");
- }
-
- @Override
- public void onRenameLink(String oldName, String newName) {
- getIssueSetting().onRenameLink(oldName, newName);
- saveSetting(Key.ISSUE, getIssueSetting());
- }
-
- @Override
- public Usage onDeleteLink(String linkName) {
- Usage usage = new Usage();
- usage.add(getIssueSetting().onDeleteLink(linkName));
- return usage.prefix("administration");
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.cluster.ClusterManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.Setting.Key;
+import io.onedev.server.model.support.administration.*;
+import io.onedev.server.model.support.administration.authenticator.Authenticator;
+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
+import io.onedev.server.model.support.administration.mailsetting.MailSetting;
+import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.model.support.administration.sso.SsoConnector;
+import io.onedev.server.persistence.DataManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.util.usage.Usage;
+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;
+import org.hibernate.criterion.Restrictions;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.Validator;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+@Singleton
+public class DefaultSettingManager extends BaseEntityManager<Setting> implements SettingManager {
+
+ private final ClusterManager clusterManager;
+
+ private volatile Map<Key, Serializable> settingValues;
+
+ @Inject
+ public DefaultSettingManager(Dao dao, DataManager dataManager, ClusterManager clusterManager) {
+ super(dao);
+ this.clusterManager = clusterManager;
+ }
+
+ @Override
+ @Sessional
+ public void init() {
+ settingValues = clusterManager.getHazelcastInstance().getReplicatedMap("settingValues");
+ for (Setting setting: query()) {
+ if (setting.getValue() != null)
+ settingValues.put(setting.getKey(), setting.getValue());
+ }
+ }
+
+ @Override
+ public SystemSetting getSystemSetting() {
+ return (SystemSetting) settingValues.get(Key.SYSTEM);
+ }
+
+ @Sessional
+ @Override
+ public Setting findSetting(Key key) {
+ return find(EntityCriteria.of(Setting.class).add(Restrictions.eq("key", key)));
+ }
+
+ private void saveSetting(Key key, Serializable value) {
+ Setting setting = findSetting(key);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(key);
+ }
+ setting.setValue(value);
+ dao.persist(setting);
+
+ if (value != null)
+ settingValues.put(key, value);
+ else
+ settingValues.remove(key);
+ }
+
+ @Override
+ public MailSetting getMailSetting() {
+ return (MailSetting) settingValues.get(Key.MAIL);
+ }
+
+ @Override
+ public BackupSetting getBackupSetting() {
+ return (BackupSetting) settingValues.get(Key.BACKUP);
+ }
+
+ @Override
+ public BrandingSetting getBrandingSetting() {
+ return (BrandingSetting) settingValues.get(Key.BRANDING);
+ }
+
+ @Override
+ public SecuritySetting getSecuritySetting() {
+ return (SecuritySetting) settingValues.get(Key.SECURITY);
+ }
+
+ @Override
+ public GlobalIssueSetting getIssueSetting() {
+ return (GlobalIssueSetting) settingValues.get(Key.ISSUE);
+ }
+
+ @Override
+ public Authenticator getAuthenticator() {
+ return (Authenticator) settingValues.get(Key.AUTHENTICATOR);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<JobExecutor> getJobExecutors() {
+ return (List<JobExecutor>) settingValues.get(Key.JOB_EXECUTORS);
+ }
+
+ @Override
+ public NotificationTemplateSetting getNotificationTemplateSetting() {
+ return (NotificationTemplateSetting) settingValues.get(Key.NOTIFICATION_TEMPLATE_SETTING);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<GroovyScript> getGroovyScripts() {
+ return (List<GroovyScript>) settingValues.get(Key.GROOVY_SCRIPTS);
+ }
+
+ @Override
+ public GlobalPullRequestSetting getPullRequestSetting() {
+ return (GlobalPullRequestSetting) settingValues.get(Key.PULL_REQUEST);
+ }
+
+ @Override
+ public GlobalBuildSetting getBuildSetting() {
+ return (GlobalBuildSetting) settingValues.get(Key.BUILD);
+ }
+
+ @Override
+ public GlobalProjectSetting getProjectSetting() {
+ return (GlobalProjectSetting) settingValues.get(Key.PROJECT);
+ }
+
+ @Override
+ public AgentSetting getAgentSetting() {
+ return (AgentSetting) settingValues.get(Key.AGENT);
+ }
+
+ @Override
+ public SshSetting getSshSetting() {
+ return (SshSetting) settingValues.get(Key.SSH);
+ }
+
+ @Override
+ public PerformanceSetting getPerformanceSetting() {
+ return (PerformanceSetting) settingValues.get(Key.PERFORMANCE);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<SsoConnector> getSsoConnectors() {
+ return (List<SsoConnector>) settingValues.get(Key.SSO_CONNECTORS);
+ }
+
+ @Override
+ public ServiceDeskSetting getServiceDeskSetting() {
+ return (ServiceDeskSetting) settingValues.get(Key.SERVICE_DESK_SETTING);
+ }
+
+ @Override
+ public GpgSetting getGpgSetting() {
+ return (GpgSetting) settingValues.get(Key.GPG);
+ }
+
+ @Transactional
+ @Override
+ public void saveSystemSetting(SystemSetting systemSetting) {
+ saveSetting(Key.SYSTEM, systemSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveMailSetting(MailSetting mailSetting) {
+ saveSetting(Key.MAIL, mailSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveBackupSetting(BackupSetting backupSetting) {
+ saveSetting(Key.BACKUP, backupSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveBrandingSetting(BrandingSetting brandingSetting) {
+ saveSetting(Key.BRANDING, brandingSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveSecuritySetting(SecuritySetting securitySetting) {
+ saveSetting(Key.SECURITY, securitySetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveIssueSetting(GlobalIssueSetting issueSetting) {
+ saveSetting(Key.ISSUE, issueSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveAuthenticator(Authenticator authenticator) {
+ saveSetting(Key.AUTHENTICATOR, authenticator);
+ }
+
+ @Transactional
+ @Override
+ public void saveJobExecutors(List<JobExecutor> jobExecutors) {
+ saveSetting(Key.JOB_EXECUTORS, (Serializable) jobExecutors);
+ }
+
+ @Transactional
+ @Override
+ public void saveNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting) {
+ saveSetting(Key.NOTIFICATION_TEMPLATE_SETTING, notificationTemplateSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveServiceDeskSetting(ServiceDeskSetting serviceDeskSetting) {
+ saveSetting(Key.SERVICE_DESK_SETTING, serviceDeskSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveGroovyScripts(List<GroovyScript> groovyScripts) {
+ saveSetting(Key.GROOVY_SCRIPTS, (Serializable) groovyScripts);
+ }
+
+ @Transactional
+ @Override
+ public void savePullRequestSetting(GlobalPullRequestSetting pullRequestSetting) {
+ saveSetting(Key.PULL_REQUEST, pullRequestSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveBuildSetting(GlobalBuildSetting buildSetting) {
+ saveSetting(Key.BUILD, buildSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveProjectSetting(GlobalProjectSetting projectSetting) {
+ saveSetting(Key.PROJECT, projectSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveAgentSetting(AgentSetting agentSetting) {
+ saveSetting(Key.AGENT, agentSetting);
+ }
+
+ @Transactional
+ @Override
+ public void savePerformanceSetting(PerformanceSetting performanceSetting) {
+ saveSetting(Key.PERFORMANCE, performanceSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveSshSetting(SshSetting sshSetting) {
+ saveSetting(Key.SSH, sshSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveGpgSetting(GpgSetting gpgSetting) {
+ saveSetting(Key.GPG, gpgSetting);
+ }
+
+ @Transactional
+ @Override
+ public void saveSsoConnectors(List<SsoConnector> ssoConnectors) {
+ saveSetting(Key.SSO_CONNECTORS, (Serializable) ssoConnectors);
+ }
+
+ @Transactional
+ @Override
+ public void saveContributedSettings(Map<String, ContributedAdministrationSetting> contributedSettings) {
+ saveSetting(Key.CONTRIBUTED_SETTINGS, (Serializable) contributedSettings);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Map<String, ContributedAdministrationSetting> getContributedSettings() {
+ return (Map<String, ContributedAdministrationSetting>) settingValues.get(Key.CONTRIBUTED_SETTINGS);
+ }
+
+ @Nullable
+ @SuppressWarnings("unchecked")
+ public <T extends ContributedAdministrationSetting> T getContributedSetting(Class<T> settingClass) {
+ T contributedSetting = (T) getContributedSettings().get(settingClass.getName());
+ if (contributedSetting == null) {
+ try {
+ T value = settingClass.getDeclaredConstructor().newInstance();
+ if (OneDev.getInstance(Validator.class).validate(value).isEmpty())
+ contributedSetting = value;
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return contributedSetting;
+ }
+
+ public void saveContributedSetting(Class<? extends ContributedAdministrationSetting> settingClass,
+ @Nullable ContributedAdministrationSetting setting) {
+ Map<String, ContributedAdministrationSetting> contributedSettings = getContributedSettings();
+ contributedSettings.put(settingClass.getName(), setting);
+ saveSetting(Key.CONTRIBUTED_SETTINGS, (Serializable) contributedSettings);
+ }
+
+ @Override
+ public Collection<String> getUndefinedIssueFields() {
+ Collection<String> undefinedFields = new HashSet<>();
+ undefinedFields.addAll(getIssueSetting().getUndefinedFields());
+ if (getServiceDeskSetting() != null)
+ undefinedFields.addAll(getServiceDeskSetting().getUndefinedIssueFields());
+ return undefinedFields;
+ }
+
+ @Override
+ public Collection<UndefinedFieldValue> getUndefinedIssueFieldValues() {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ undefinedFieldValues.addAll(getIssueSetting().getUndefinedFieldValues());
+ if (getServiceDeskSetting() != null)
+ undefinedFieldValues.addAll(getServiceDeskSetting().getUndefinedIssueFieldValues());
+ return undefinedFieldValues;
+ }
+
+ @Override
+ public Collection<String> fixUndefinedIssueFields(Map<String, UndefinedFieldResolution> resolutions) {
+ Collection<String> deletedFields = new HashSet<>();
+ deletedFields.addAll(getIssueSetting().fixUndefinedFields(resolutions));
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().fixUndefinedIssueFields(resolutions);
+ saveSetting(Key.ISSUE, getIssueSetting());
+ saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
+ return deletedFields;
+ }
+
+ @Override
+ public Collection<String> fixUndefinedIssueFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {
+ Collection<String> deletedFields = new HashSet<>();
+ deletedFields.addAll(getIssueSetting().fixUndefinedFieldValues(resolutions));
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().fixUndefinedIssueFieldValues(resolutions);
+ saveSetting(Key.ISSUE, getIssueSetting());
+ saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
+ return deletedFields;
+ }
+
+ @Override
+ public void onRenameRole(String oldName, String newName) {
+ getIssueSetting().onRenameRole(oldName, newName);
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().onRenameRole(oldName, newName);
+ saveSetting(Key.ISSUE, getIssueSetting());
+ saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
+ }
+
+ @Override
+ public Usage onDeleteRole(String roleName) {
+ Usage usage = new Usage();
+
+ usage.add(getIssueSetting().onDeleteRole(roleName));
+ if (getServiceDeskSetting() != null)
+ usage.add(getServiceDeskSetting().onDeleteRole(roleName));
+
+ return usage.prefix("administration");
+ }
+
+ @Override
+ public void onMoveProject(String oldPath, String newPath) {
+ for (JobExecutor jobExecutor: getJobExecutors())
+ jobExecutor.onMoveProject(oldPath, newPath);
+ for (GroovyScript groovyScript: getGroovyScripts())
+ groovyScript.onMoveProject(oldPath, newPath);
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().onMoveProject(oldPath, newPath);
+ getIssueSetting().onMoveProject(oldPath, newPath);
+
+ saveSetting(Key.JOB_EXECUTORS, (Serializable) getJobExecutors());
+ saveSetting(Key.GROOVY_SCRIPTS, (Serializable) getGroovyScripts());
+ saveSetting(Key.SERVICE_DESK_SETTING, getServiceDeskSetting());
+ saveSetting(Key.ISSUE, getIssueSetting());
+ }
+
+ @Override
+ public Usage onDeleteProject(String projectPath) {
+ Usage usage = new Usage();
+
+ for (JobExecutor jobExecutor: getJobExecutors())
+ usage.add(jobExecutor.onDeleteProject(projectPath).prefix("job executor '" + jobExecutor.getName() + "'"));
+ for (GroovyScript groovyScript: getGroovyScripts())
+ usage.add(groovyScript.onDeleteProject(projectPath).prefix("groovy script '" + groovyScript.getName() + "'"));
+ if (getServiceDeskSetting() != null)
+ usage.add(getServiceDeskSetting().onDeleteProject(projectPath));
+ usage.add(getIssueSetting().onDeleteProject(projectPath));
+
+ return usage.prefix("administration");
+ }
+
+ @Override
+ public void onRenameGroup(String oldName, String newName) {
+ Authenticator authenticator = getAuthenticator();
+ if (authenticator != null)
+ authenticator.onRenameGroup(oldName, newName);
+
+ for (var jobExecutor: getJobExecutors())
+ jobExecutor.onRenameGroup(oldName, newName);
+ for (var groovyScript: getGroovyScripts())
+ groovyScript.onRenameGroup(oldName, newName);
+
+ getIssueSetting().onRenameGroup(oldName, newName);
+ getSecuritySetting().onRenameGroup(oldName, newName);
+
+ saveSetting(Key.AUTHENTICATOR, getAuthenticator());
+ saveSetting(Key.ISSUE, getIssueSetting());
+ saveSetting(Key.SECURITY, getSecuritySetting());
+ }
+
+ @Override
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
+
+ for (var jobExecutor: getJobExecutors())
+ usage.add(jobExecutor.onDeleteGroup(groupName).prefix("job executor '" + jobExecutor.getName() + "'"));
+ for (var groovyScript: getGroovyScripts())
+ usage.add(groovyScript.onDeleteGroup(groupName).prefix("groovy script '" + groovyScript.getName() + "'"));
+
+ usage.add(getIssueSetting().onDeleteGroup(groupName));
+ usage.add(getSecuritySetting().onDeleteGroup(groupName));
+
+ Authenticator authenticator = getAuthenticator();
+ if (authenticator != null)
+ usage.add(authenticator.onDeleteGroup(groupName));
+
+ return usage.prefix("administration");
+ }
+
+ @Override
+ public void onRenameUser(String oldName, String newName) {
+ for (var jobExecutor: getJobExecutors())
+ jobExecutor.onRenameUser(oldName, newName);
+ for (var groovyScript: getGroovyScripts())
+ groovyScript.onRenameUser(oldName, newName);
+ getIssueSetting().onRenameUser(oldName, newName);
+
+ saveSetting(Key.JOB_EXECUTORS, (Serializable) getJobExecutors());
+ saveSetting(Key.ISSUE, getIssueSetting());
+ }
+
+ @Override
+ public Usage onDeleteUser(String userName) {
+ Usage usage = new Usage();
+
+ for (var jobExecutor: getJobExecutors())
+ usage.add(jobExecutor.onDeleteUser(userName).prefix("job executor '" + jobExecutor.getName() + "'"));
+ for (var groovyScript: getGroovyScripts())
+ usage.add(groovyScript.onDeleteUser(userName).prefix("groovy script '" + groovyScript.getName() + "'"));
+
+ usage.add(getIssueSetting().onDeleteUser(userName));
+
+ return usage.prefix("administration");
+ }
+
+ @Override
+ public void onRenameLink(String oldName, String newName) {
+ getIssueSetting().onRenameLink(oldName, newName);
+ saveSetting(Key.ISSUE, getIssueSetting());
+ }
+
+ @Override
+ public Usage onDeleteLink(String linkName) {
+ Usage usage = new Usage();
+ usage.add(getIssueSetting().onDeleteLink(linkName));
+ return usage.prefix("administration");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index bb5d5bf53a..da01596878 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -1,46 +1,15 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
-
-import io.onedev.server.util.CryptoUtils;
-import org.apache.shiro.authc.credential.PasswordService;
-import org.apache.shiro.authz.Permission;
-import org.hibernate.ReplicationMode;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
-
import com.google.common.collect.Sets;
import com.hazelcast.core.HazelcastInstance;
-
import io.onedev.server.cluster.ClusterManager;
-import io.onedev.server.entitymanager.EmailAddressManager;
-import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.IssueFieldManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entitymanager.*;
import io.onedev.server.event.Listen;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.exception.SystemNotReadyException;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.EmailAddress;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.GroupAuthorization;
-import io.onedev.server.model.IssueAuthorization;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.code.TagProtection;
import io.onedev.server.persistence.IdManager;
@@ -51,12 +20,24 @@ import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.permission.ConfidentialIssuePermission;
+import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.facade.UserCache;
import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.usage.Usage;
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.shiro.authz.Permission;
+import org.hibernate.ReplicationMode;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.*;
+import java.util.Collection;
+import java.util.List;
+
import static io.onedev.server.model.User.*;
@Singleton
@@ -120,11 +101,16 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
if (oldName != null && !oldName.equals(user.getName())) {
for (Project project: projectManager.query()) {
- for (BranchProtection protection: project.getBranchProtections())
- protection.onRenameUser(oldName, user.getName());
- for (TagProtection protection: project.getTagProtections())
- protection.onRenameUser(oldName, user.getName());
- project.getIssueSetting().onRenameUser(oldName, user.getName());
+ try {
+ for (BranchProtection protection : project.getBranchProtections())
+ protection.onRenameUser(oldName, user.getName());
+ for (TagProtection protection : project.getTagProtections())
+ protection.onRenameUser(oldName, user.getName());
+ project.getIssueSetting().onRenameUser(oldName, user.getName());
+ project.getBuildSetting().onRenameUser(oldName, user.getName());
+ } catch (Exception e) {
+ throw new RuntimeException("Error checking user reference in project '" + project.getPath() + "'", e);
+ }
}
settingManager.onRenameUser(oldName, user.getName());
@@ -162,16 +148,17 @@ public class DefaultUserManager extends BaseEntityManager<User> implements UserM
Usage usage = new Usage();
for (Project project: projectManager.query()) {
try {
- Usage usedInProject = new Usage();
+ Usage usageInProject = new Usage();
for (BranchProtection protection : project.getBranchProtections())
- usedInProject.add(protection.onDeleteUser(user.getName()));
+ usageInProject.add(protection.onDeleteUser(user.getName()));
for (TagProtection protection : project.getTagProtections())
- usedInProject.add(protection.onDeleteUser(user.getName()));
- usedInProject.add(project.getIssueSetting().onDeleteUser(user.getName()));
- usedInProject.prefix("project '" + project.getPath() + "': settings");
- usage.add(usedInProject);
+ usageInProject.add(protection.onDeleteUser(user.getName()));
+ usageInProject.add(project.getIssueSetting().onDeleteUser(user.getName()));
+ usageInProject.add(project.getBuildSetting().onDeleteUser(user.getName()));
+ usageInProject.prefix("project '" + project.getPath() + "': settings");
+ usage.add(usageInProject);
} catch (Exception e) {
- logger.error("Failed to check user reference in project: {}", project.getPath());
+ throw new RuntimeException("Error checking user reference in project '" + project.getPath() + "'", e);
}
}
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.java
index 9a219246d9..d3f6a66896 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
@@ -38,12 +38,10 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.git.GitUtils;
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.job.match.JobMatch;
+import io.onedev.server.job.match.JobMatchContext;
import io.onedev.server.model.*;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
@@ -63,14 +61,11 @@ import io.onedev.server.terminal.Shell;
import io.onedev.server.terminal.Terminal;
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.interpolative.VariableInterpolator;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
-import io.onedev.server.util.script.identity.JobIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.web.editable.EditableStringTransformer;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -220,7 +215,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Transactional
@Override
public Build submit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {
+ Map<String, List<String>> paramMap, String pipeline,
+ String refName, User submitter, @Nullable PullRequest request,
+ String reason) {
Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());
transactionManager.mustRunAfterTransaction(new Runnable() {
@@ -231,7 +228,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
});
- JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, reason.getPullRequest()));
+ JobAuthorizationContext.push(new JobAuthorizationContext(
+ project, commitId, SecurityUtils.getUser(), request));
try {
// Lock to guarantee uniqueness of build (by project, commit, job and parameters)
lock.lockInterruptibly();
@@ -251,166 +249,158 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
project.getPath(), commitId.name(), jobName));
}
- return doSubmit(project, commitId, jobName, paramMap, pipeline, reason);
+ return doSubmit(project, commitId, jobName, paramMap, pipeline, refName,
+ submitter, request, reason);
} catch (Throwable e) {
throw ExceptionUtils.unchecked(e);
} finally {
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
}
private Build doSubmit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {
- ScriptIdentity.push(new JobIdentity(project, commitId));
- try {
- PullRequest request = reason.getPullRequest();
- if (request != null) {
- request.setBuildCommitHash(commitId.name());
- dao.persist(request);
- }
-
- Build build = new Build();
- build.setProject(project);
- build.setCommitHash(commitId.name());
- build.setJobName(jobName);
- build.setSubmitDate(new Date());
- build.setStatus(Build.Status.WAITING);
- build.setSubmitReason(reason.getDescription());
- build.setSubmitter(SecurityUtils.getUser());
- build.setRefName(reason.getRefName());
- build.setRequest(request);
- build.setPipeline(pipeline);
-
- ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);
-
- Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);
- for (ParamSpec paramSpec : build.getJob().getParamSpecs()) {
- if (paramSpec instanceof SecretParam)
- paramMapToQuery.remove(paramSpec.getName());
- }
+ Map<String, List<String>> paramMap, String pipeline,
+ String refName, User submitter,
+ @Nullable PullRequest request, String reason) {
+ if (request != null) {
+ request.setBuildCommitHash(commitId.name());
+ dao.persist(request);
+ }
+
+ Build build = new Build();
+ build.setProject(project);
+ build.setCommitHash(commitId.name());
+ build.setJobName(jobName);
+ build.setSubmitDate(new Date());
+ build.setStatus(Build.Status.WAITING);
+ build.setSubmitReason(reason);
+ build.setSubmitter(submitter);
+ build.setRefName(refName);
+ build.setRequest(request);
+ build.setPipeline(pipeline);
+
+ ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);
+
+ Map<String, List<String>> paramMapToQuery = new HashMap<>(paramMap);
+ for (ParamSpec paramSpec : build.getJob().getParamSpecs()) {
+ if (paramSpec instanceof SecretParam)
+ paramMapToQuery.remove(paramSpec.getName());
+ }
- Collection<Build> builds = buildManager.query(project, commitId, jobName,
- reason.getRefName(), Optional.ofNullable(reason.getPullRequest()),
- paramMapToQuery, pipeline);
+ Collection<Build> builds = buildManager.query(project, commitId, jobName,
+ refName, Optional.ofNullable(request), paramMapToQuery, pipeline);
- if (builds.isEmpty()) {
- for (Map.Entry<String, List<String>> entry : paramMap.entrySet()) {
- ParamSpec paramSpec = Preconditions.checkNotNull(build.getJob().getParamSpecMap().get(entry.getKey()));
- if (!entry.getValue().isEmpty()) {
- for (String string : entry.getValue()) {
- BuildParam param = new BuildParam();
- param.setBuild(build);
- param.setName(entry.getKey());
- param.setType(paramSpec.getType());
- param.setValue(string);
- build.getParams().add(param);
- }
- } else {
+ if (builds.isEmpty()) {
+ for (Map.Entry<String, List<String>> entry : paramMap.entrySet()) {
+ ParamSpec paramSpec = Preconditions.checkNotNull(build.getJob().getParamSpecMap().get(entry.getKey()));
+ if (!entry.getValue().isEmpty()) {
+ for (String string : entry.getValue()) {
BuildParam param = new BuildParam();
param.setBuild(build);
param.setName(entry.getKey());
param.setType(paramSpec.getType());
+ param.setValue(string);
build.getParams().add(param);
}
+ } else {
+ BuildParam param = new BuildParam();
+ param.setBuild(build);
+ param.setName(entry.getKey());
+ param.setType(paramSpec.getType());
+ build.getParams().add(param);
}
+ }
- VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
- for (JobDependency dependency : build.getJob().getJobDependencies()) {
- JobDependency interpolated = interpolator.interpolateProperties(dependency);
- new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(build, build.getParamCombination(),
- interpolated.getJobParams())) {
-
- @Override
- public void run(Map<String, List<String>> paramMap) {
- Build dependencyBuild = doSubmit(project, commitId,
- interpolated.getJobName(), paramMap, pipeline, reason);
- BuildDependence dependence = new BuildDependence();
- dependence.setDependency(dependencyBuild);
- dependence.setDependent(build);
- dependence.setRequireSuccessful(interpolated.isRequireSuccessful());
- dependence.setArtifacts(interpolated.getArtifacts());
- dependence.setDestinationPath(interpolated.getDestinationPath());
- build.getDependencies().add(dependence);
- }
-
- }.run();
- }
+ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
+ for (JobDependency dependency : build.getJob().getJobDependencies()) {
+ JobDependency interpolated = interpolator.interpolateProperties(dependency);
+ new MatrixRunner<>(ParamUtils.getParamMatrix(build, build.getParamCombination(),
+ interpolated.getJobParams())) {
- for (ProjectDependency dependency : build.getJob().getProjectDependencies()) {
- dependency = interpolator.interpolateProperties(dependency);
- Project dependencyProject = projectManager.findByPath(dependency.getProjectPath());
- if (dependencyProject == null)
- throw new ExplicitException("Unable to find dependency project: " + dependency.getProjectPath());
-
- Subject subject;
- if (dependency.getAccessTokenSecret() != null) {
- String accessToken = build.getJobSecretAuthorizationContext().getSecretValue(dependency.getAccessTokenSecret());
- User user = userManager.findByAccessToken(accessToken);
- if (user == null) {
- throw new ExplicitException("Unable to access dependency project '"
- + dependency.getProjectPath() + "': invalid access token");
- }
- subject = user.asSubject();
- } else {
- subject = SecurityUtils.asSubject(0L);
+ @Override
+ public void run(Map<String, List<String>> paramMap) {
+ Build dependencyBuild = doSubmit(project, commitId,
+ interpolated.getJobName(), paramMap, pipeline,
+ refName, submitter, request, reason);
+ BuildDependence dependence = new BuildDependence();
+ dependence.setDependency(dependencyBuild);
+ dependence.setDependent(build);
+ dependence.setRequireSuccessful(interpolated.isRequireSuccessful());
+ dependence.setArtifacts(interpolated.getArtifacts());
+ dependence.setDestinationPath(interpolated.getDestinationPath());
+ build.getDependencies().add(dependence);
}
- Build dependencyBuild = dependency.getBuildProvider().getBuild(dependencyProject);
- if (dependencyBuild == null) {
- String errorMessage = String.format("Unable to find dependency build in project '"
- + dependencyProject.getPath() + "'");
- throw new ExplicitException(errorMessage);
- }
+ }.run();
+ }
- JobPermission jobPermission = new JobPermission(dependencyBuild.getJobName(), new AccessBuild());
- if (!dependencyProject.isPermittedByLoginUser(jobPermission)
- && !subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {
- throw new ExplicitException("Unable to access dependency build '"
- + dependencyBuild.getFQN() + "': permission denied");
+ for (ProjectDependency dependency : build.getJob().getProjectDependencies()) {
+ dependency = interpolator.interpolateProperties(dependency);
+ Project dependencyProject = projectManager.findByPath(dependency.getProjectPath());
+ if (dependencyProject == null)
+ throw new ExplicitException("Unable to find dependency project: " + dependency.getProjectPath());
+
+ Subject subject;
+ if (dependency.getAccessTokenSecret() != null) {
+ String accessToken = build.getJobAuthorizationContext().getSecretValue(dependency.getAccessTokenSecret());
+ User user = userManager.findByAccessToken(accessToken);
+ if (user == null) {
+ throw new ExplicitException("Unable to access dependency project '"
+ + dependency.getProjectPath() + "': invalid access token");
}
+ subject = user.asSubject();
+ } else {
+ subject = SecurityUtils.asSubject(0L);
+ }
- BuildDependence dependence = new BuildDependence();
- dependence.setDependency(dependencyBuild);
- dependence.setDependent(build);
- dependence.setArtifacts(dependency.getArtifacts());
- dependence.setDestinationPath(dependency.getDestinationPath());
- build.getDependencies().add(dependence);
+ Build dependencyBuild = dependency.getBuildProvider().getBuild(dependencyProject);
+ if (dependencyBuild == null) {
+ String errorMessage = String.format("Unable to find dependency build in project '"
+ + dependencyProject.getPath() + "'");
+ throw new ExplicitException(errorMessage);
}
- buildManager.create(build);
- buildSubmitted(build);
+ JobPermission jobPermission = new JobPermission(dependencyBuild.getJobName(), new AccessBuild());
+ if (!dependencyProject.isPermittedByLoginUser(jobPermission)
+ && !subject.isPermitted(new ProjectPermission(dependencyProject, jobPermission))) {
+ throw new ExplicitException("Unable to access dependency build '"
+ + dependencyBuild.getFQN() + "': permission denied");
+ }
- Long buildId = build.getId();
- Long projectId = project.getId();
- Long pullRequestId = PullRequest.idOf(reason.getPullRequest());
- sessionManager.runAsyncAfterCommit(new Runnable() {
+ BuildDependence dependence = new BuildDependence();
+ dependence.setDependency(dependencyBuild);
+ dependence.setDependent(build);
+ dependence.setArtifacts(dependency.getArtifacts());
+ dependence.setDestinationPath(dependency.getDestinationPath());
+ build.getDependencies().add(dependence);
+ }
- @Override
- public void run() {
- SecurityUtils.bindAsSystem();
- Project project = projectManager.load(projectId);
- PullRequest pullRequest;
- if (pullRequestId != null)
- pullRequest = pullRequestManager.load(pullRequestId);
- else
- pullRequest = null;
- for (Build unfinished : buildManager.queryUnfinished(project, jobName, reason.getRefName(),
- Optional.ofNullable(pullRequest), paramMapToQuery)) {
- if (unfinished.getId() < buildId
- && (pullRequest != null || gitService.isMergedInto(project, null, unfinished.getCommitId(), commitId))) {
- cancel(unfinished);
- }
- }
+ buildManager.create(build);
+ buildSubmitted(build);
+
+ Long buildId = build.getId();
+ Long projectId = project.getId();
+ Long pullRequestId = PullRequest.idOf(request);
+ sessionManager.runAsyncAfterCommit(() -> {
+ SecurityUtils.bindAsSystem();
+ Project project1 = projectManager.load(projectId);
+ PullRequest pullRequest;
+ if (pullRequestId != null)
+ pullRequest = pullRequestManager.load(pullRequestId);
+ else
+ pullRequest = null;
+ for (Build unfinished : buildManager.queryUnfinished(project1, jobName, refName,
+ Optional.ofNullable(pullRequest), paramMapToQuery)) {
+ if (unfinished.getId() < buildId
+ && (pullRequest != null || gitService.isMergedInto(project1, null, unfinished.getCommitId(), commitId))) {
+ cancel(unfinished);
}
+ }
+ });
- });
-
- return build;
- } else {
- return builds.iterator().next();
- }
- } finally {
- ScriptIdentity.pop();
+ return build;
+ } else {
+ return builds.iterator().next();
}
}
@@ -431,25 +421,23 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
listenerRegistry.post(new BuildSubmitted(build));
}
- private boolean isAuthorized(JobExecutor executor, Build build) {
- if (executor.getJobAuthorization() != null) {
- JobAuthorization authorization = JobAuthorization.parse(executor.getJobAuthorization());
- Collection<ObjectId> descendants = OneDev.getInstance(CommitInfoManager.class)
- .getDescendants(build.getProject().getId(), Sets.newHashSet(build.getCommitId()));
- descendants.add(build.getCommitId());
-
- for (RefFacade ref : build.getProject().getBranchRefs()) {
- if (descendants.contains(ref.getPeeledObj())) {
- String branch = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getName()));
- if (authorization.matches(new Context(build.getProject(), branch, build.getJobName())))
- return true;
- }
- }
+ private boolean isApplicable(JobExecutor executor, Build build) {
+ if (executor.getJobRequirement() != null) {
+ JobMatch jobMatch = JobMatch.parse(executor.getJobRequirement(), true, true);
PullRequest request = build.getRequest();
- return request != null
- && request.getSource() != null
- && authorization.matches(new Context(request.getTargetProject(), request.getTargetBranch(), build.getJobName()))
- && authorization.matches(new Context(request.getSourceProject(), request.getSourceBranch(), build.getJobName()));
+ if (request != null && request.getSource() != null) {
+ JobMatchContext sourceContext = new JobMatchContext(
+ request.getSourceProject(), request.getSourceBranch(),
+ null, request.getSubmitter(), build.getJobName());
+ JobMatchContext targetContext = new JobMatchContext(
+ request.getTargetProject(), request.getTargetBranch(),
+ null, request.getSubmitter(), build.getJobName());
+ return jobMatch.matches(sourceContext) && jobMatch.matches(targetContext);
+ } else {
+ return jobMatch.matches(new JobMatchContext(
+ build.getProject(), null, build.getCommitId(),
+ build.getSubmitter(), build.getJobName()));
+ }
} else {
return true;
}
@@ -467,7 +455,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (jobExecutor != null) {
if (!jobExecutor.isEnabled())
throw new ExplicitException("Specified job executor '" + jobExecutorName + "' is disabled");
- else if (!isAuthorized(jobExecutor, build))
+ else if (!isApplicable(jobExecutor, build))
throw new ExplicitException("Specified job executor '" + jobExecutorName + "' is not authorized for current job");
else
return jobExecutor;
@@ -477,10 +465,10 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} else {
if (!settingManager.getJobExecutors().isEmpty()) {
for (JobExecutor executor : settingManager.getJobExecutors()) {
- if (executor.isEnabled() && isAuthorized(executor, build))
+ if (executor.isEnabled() && isApplicable(executor, build))
return executor;
}
- throw new ExplicitException("No authorized job executor");
+ throw new ExplicitException("No applicable job executor");
} else {
jobLogger.log("No job executor defined, auto-discovering...");
List<JobExecutorDiscoverer> discoverers = new ArrayList<>(OneDev.getExtensions(JobExecutorDiscoverer.class));
@@ -525,7 +513,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
Job job;
- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
+ JobAuthorizationContext.push(build.getJobAuthorizationContext());
Build.push(build);
try {
job = build.getJob();
@@ -547,7 +535,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
retryDelay.set(job.getRetryDelay());
} finally {
Build.pop();
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
AtomicReference<JobExecution> executionRef = new AtomicReference<>(null);
@@ -688,17 +676,18 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
PullRequest request = null;
if (event instanceof PullRequestEvent)
request = ((PullRequestEvent) event).getRequest();
- JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(event.getProject(), commitId, request));
- ScriptIdentity.push(new JobIdentity(event.getProject(), commitId));
+ JobAuthorizationContext jobAuthorizationContext = new JobAuthorizationContext(
+ event.getProject(), commitId, SecurityUtils.getUser(), request);
+ JobAuthorizationContext.push(jobAuthorizationContext);
try {
BuildSpec buildSpec = event.getProject().getBuildSpec(commitId);
if (buildSpec != null) {
validateBuildSpec(event.getProject(), commitId, buildSpec);
for (Job job : buildSpec.getJobMap().values()) {
- JobTriggerMatch match = job.getTriggerMatch(event);
+ TriggerMatch match = job.getTriggerMatch(event);
if (match != null) {
Map<String, List<List<String>>> paramMatrix =
- ParamUtils.getParamMatrix(null, null, match.getTrigger().getParams());
+ ParamUtils.getParamMatrix(null, null, match.getParams());
Long projectId = event.getProject().getId();
// run asynchrously as session may get closed due to exception
@@ -714,7 +703,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run(Map<String, List<String>> paramMap) {
submit(project, commitId, job.getName(), paramMap,
- pipeline, match.getReason());
+ pipeline, match.getRefName(), SecurityUtils.getUser(), match.getRequest(), match.getReason());
}
}.run();
@@ -734,8 +723,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
event.getProject().getPath(), commitId.name());
logger.error(message, e);
} finally {
- ScriptIdentity.pop();
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
}
}
@@ -745,7 +733,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void resubmit(Build build, String reason) {
if (build.isFinished()) {
- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
+ JobAuthorizationContext.push(build.getJobAuthorizationContext());
try {
BuildSpec buildSpec = build.getSpec();
@@ -802,7 +790,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
buildManager.save(build);
buildSubmitted(build);
} finally {
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
for (BuildDependence dependence : build.getDependencies()) {
@@ -1033,7 +1021,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (defaultBranch != null) {
ObjectId commitId = project.getObjectId(defaultBranch, false);
if (commitId != null) {
- JobSecretAuthorizationContext.push(new JobSecretAuthorizationContext(project, commitId, null));
+ JobAuthorizationContext.push(new JobAuthorizationContext(project, commitId, SecurityUtils.getUser(), null));
try {
BuildSpec buildSpec = project.getBuildSpec(commitId);
if (buildSpec != null) {
@@ -1043,9 +1031,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
for (JobTrigger trigger : job.getTriggers()) {
if (trigger instanceof ScheduleTrigger) {
ScheduleTrigger scheduledTrigger = (ScheduleTrigger) trigger;
- SubmitReason reason = trigger.matches(event, job);
- if (reason != null) {
- String taskId = taskScheduler.schedule(newSchedulableTask(project, commitId, job, scheduledTrigger, reason));
+ TriggerMatch match = trigger.matches(event, job);
+ if (match != null) {
+ String taskId = taskScheduler.schedule(newSchedulableTask(project, commitId, job, scheduledTrigger, match.getRefName(), match.getReason()));
tasksOfProject.add(taskId);
}
}
@@ -1056,7 +1044,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
logger.warn("Malformed build spec (project: {}, branch: {})",
project.getPath(), defaultBranch);
} finally {
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
}
}
@@ -1078,7 +1066,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
private SchedulableTask newSchedulableTask(Project project, ObjectId commitId, Job job,
- ScheduleTrigger trigger, SubmitReason reason) {
+ ScheduleTrigger trigger, String refName,
+ String reason) {
Long projectId = project.getId();
return new SchedulableTask() {
@@ -1095,7 +1084,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public void run(Map<String, List<String>> paramMap) {
- submit(project, commitId, job.getName(), paramMap, pipeline, reason);
+ submit(project, commitId, job.getName(), paramMap, pipeline, refName, SecurityUtils.getUser(), null, reason);
}
}.run();
@@ -1119,7 +1108,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (copy != null) {
try {
copy.join();
- } catch (InterruptedException e) {
+ } catch (InterruptedException ignored) {
}
}
scheduledTasks.values().forEach(it1 -> it1.forEach(taskScheduler::unschedule));
@@ -1271,7 +1260,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Listen
public void on(BuildFinished event) {
Build build = event.getBuild();
- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
+ JobAuthorizationContext.push(build.getJobAuthorizationContext());
Build.push(build);
try {
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
@@ -1292,7 +1281,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
logger.error(message, e);
} finally {
Build.pop();
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
}
@@ -1353,10 +1342,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
.filter(it -> !allAllocated.contains(it.getName()))
.findFirst();
CacheInstance allocation;
- if (result.isPresent())
- allocation = result.get();
- else
- allocation = new CacheInstance(UUID.randomUUID().toString(), cacheSpec.getNormalizedKey());
+ allocation = result.orElseGet(() -> new CacheInstance(UUID.randomUUID().toString(), cacheSpec.getNormalizedKey()));
allocations.put(allocation, cacheSpec.getPath());
allocatedCachesOfJob.add(allocation.getName());
allAllocated.add(allocation.getName());
diff --git a/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
new file mode 100644
index 0000000000..09f40bc37d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContext.java
@@ -0,0 +1,124 @@
+package io.onedev.server.job;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.job.match.BranchCriteria;
+import io.onedev.server.job.match.JobMatch;
+import io.onedev.server.job.match.JobMatchContext;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.GroovyScript;
+import io.onedev.server.model.support.build.JobSecret;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
+import io.onedev.server.util.ComponentContext;
+import io.onedev.server.web.util.WicketUtils;
+import org.eclipse.jgit.lib.ObjectId;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Stack;
+
+public class JobAuthorizationContext {
+
+ private final Project project;
+
+ @Nullable
+ private final ObjectId commitId;
+
+ @Nullable
+ private final User user;
+
+ @Nullable
+ private final PullRequest request;
+
+ private static final ThreadLocal<Stack<JobAuthorizationContext>> stack = ThreadLocal.withInitial(Stack::new);
+
+ public JobAuthorizationContext(Project project, @Nullable ObjectId commitId,
+ @Nullable User user, @Nullable PullRequest request) {
+ this.project = project;
+ this.commitId = commitId;
+ this.user = user;
+ this.request = request;
+ }
+
+ public boolean isScriptAuthorized(GroovyScript script) {
+ if (script.getAuthorization() != null) {
+ JobMatch jobMatch = JobMatch.parse(script.getAuthorization(), true, false);
+ if (request != null && request.getSource() != null) {
+ JobMatchContext sourceContext = new JobMatchContext(request.getSourceProject(), request.getSourceBranch(), null, request.getSubmitter(), null);
+ JobMatchContext targetContext = new JobMatchContext(request.getTargetProject(), request.getTargetBranch(), null, request.getSubmitter(), null);
+ return jobMatch.matches(sourceContext) && jobMatch.matches(targetContext);
+ } else {
+ return jobMatch.matches(new JobMatchContext(project, null, commitId, user, null));
+ }
+ } else {
+ return true;
+ }
+ }
+
+ public String getSecretValue(String secretName) {
+ if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {
+ return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());
+ } else {
+ for (JobSecret secret: project.getHierarchyJobSecrets()) {
+ if (secret.getName().equals(secretName)) {
+ String authorization = secret.getAuthorization();
+ if (authorization == null)
+ authorization = new BranchCriteria("**").toString();
+ JobMatch jobMatch = JobMatch.parse(authorization, false, false);
+ if (request != null) {
+ if (project.equals(request.getSourceProject())) {
+ JobMatchContext sourceMatchContext = new JobMatchContext(project, request.getSourceBranch(), null, request.getSubmitter(), null);
+ JobMatchContext targetMatchContext = new JobMatchContext(project, request.getTargetBranch(), null, request.getSubmitter(), null);
+ if (jobMatch.matches(sourceMatchContext) && jobMatch.matches(targetMatchContext))
+ return normalizeSecretValue(secret.getValue());
+ } else {
+ JobMatchContext matchContext = new JobMatchContext(project, null, commitId, request.getSubmitter(), null);
+ if (jobMatch.matches(matchContext))
+ return normalizeSecretValue(secret.getValue());
+ }
+ } else {
+ JobMatchContext matchContext = new JobMatchContext(project, null, commitId, user, null);
+ if (jobMatch.matches(matchContext))
+ return normalizeSecretValue(secret.getValue());
+ }
+ throw new ExplicitException(String.format(
+ "Job secret not authorized (project: %s, job secret: %s)",
+ project.getPath(), secretName));
+ }
+ }
+ throw new ExplicitException(String.format(
+ "Job secret not found (project: %s, job secret: %s)",
+ project.getPath(), secretName));
+ }
+ }
+
+ private String normalizeSecretValue(String secretValue) {
+ return secretValue.replace("\r\n", "\n");
+ }
+
+ public static void push(JobAuthorizationContext jobAuthorizationContext) {
+ stack.get().push(jobAuthorizationContext);
+ }
+
+ public static void pop() {
+ stack.get().pop();
+ }
+
+ @javax.annotation.Nullable
+ public static JobAuthorizationContext get() {
+ if (!stack.get().isEmpty()) {
+ return stack.get().peek();
+ } else {
+ ComponentContext componentContext = ComponentContext.get();
+ if (componentContext != null) {
+ JobAuthorizationContextAware jobAuthorizationContextAware = WicketUtils.findInnermost(
+ componentContext.getComponent(),
+ JobAuthorizationContextAware.class);
+ if (jobAuthorizationContextAware != null)
+ return jobAuthorizationContextAware.getJobAuthorizationContext();
+ }
+ return null;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContextAware.java b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContextAware.java
new file mode 100644
index 0000000000..0bd5167c0d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/JobAuthorizationContextAware.java
@@ -0,0 +1,7 @@
+package io.onedev.server.job;
+
+public interface JobAuthorizationContextAware {
+
+ JobAuthorizationContext getJobAuthorizationContext();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/JobManager.java b/server-core/src/main/java/io/onedev/server/job/JobManager.java
index 8a074ca6d0..d6f3434b18 100644
--- a/server-core/src/main/java/io/onedev/server/job/JobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/JobManager.java
@@ -1,25 +1,23 @@
package io.onedev.server.job;
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.cluster.ClusterRunnable;
-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import org.eclipse.jgit.lib.ObjectId;
-
import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.CacheAllocationRequest;
import io.onedev.k8shelper.CacheInstance;
-import io.onedev.server.buildspec.job.SubmitReason;
+import io.onedev.server.cluster.ClusterRunnable;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.terminal.Shell;
import io.onedev.server.terminal.Terminal;
import io.onedev.server.terminal.WebShell;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
public interface JobManager {
@@ -27,10 +25,10 @@ public interface JobManager {
void unschedule(Long projectId);
- @Nullable
- Build submit(Project project, ObjectId commitId, String jobName,
- Map<String, List<String>> paramMap, String pipeline,
- SubmitReason reason);
+ Build submit(Project project, ObjectId commitId, String jobName,
+ Map<String, List<String>> paramMap, String pipeline,
+ String refName, User submitter, @Nullable PullRequest request,
+ String reason);
void resubmit(Build build, String reason);
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.java
deleted file mode 100644
index d7f6bd554e..0000000000
--- a/server-core/src/main/java/io/onedev/server/job/authorization/BranchCriteria.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.onedev.server.job.authorization;
-
-import static io.onedev.server.job.authorization.JobAuthorization.getRuleName;
-import static io.onedev.server.job.authorization.JobAuthorizationLexer.OnBranch;
-
-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.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
-
-public class BranchCriteria extends Criteria<Context> {
-
- private static final long serialVersionUID = 1L;
-
- private final String branch;
-
- public BranchCriteria(String branch) {
- this.branch = branch;
- }
-
- @Override
- public boolean matches(Context context) {
- return WildcardUtils.matchPath(branch, context.getBranch());
- }
-
- @Override
- public String toStringWithoutParens() {
- return getRuleName(OnBranch) + " " + quote(branch);
- }
-
- @Override
- 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.java
deleted file mode 100644
index d3e339a8d1..0000000000
--- a/server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package io.onedev.server.job.authorization;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-
-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;
-import io.onedev.server.job.authorization.JobAuthorizationParser.JobAuthorizationContext;
-import io.onedev.server.job.authorization.JobAuthorizationParser.NotCriteriaContext;
-import io.onedev.server.job.authorization.JobAuthorizationParser.OperatorValueCriteriaContext;
-import 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.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<Context> {
-
- private static final long serialVersionUID = 1L;
-
- private final Criteria<Context> criteria;
-
- public JobAuthorization(Criteria<Context> criteria) {
- this.criteria = criteria;
- }
-
- public static String getValue(String token) {
- return StringUtils.unescape(FenceAware.unfence(token));
- }
-
- public static JobAuthorization parse(String jobAuthorizationString) {
- CharStream is = CharStreams.fromString(jobAuthorizationString);
- JobAuthorizationLexer lexer = new JobAuthorizationLexer(is);
- lexer.removeErrorListeners();
- lexer.addErrorListener(new BaseErrorListener() {
-
- @Override
- public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
- int charPositionInLine, String msg, RecognitionException e) {
- throw new RuntimeException("Malformed job authorization", e);
- }
-
- });
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- JobAuthorizationParser parser = new JobAuthorizationParser(tokens);
- parser.removeErrorListeners();
- parser.setErrorHandler(new BailErrorStrategy());
- JobAuthorizationContext jobAuthorizationContext = parser.jobAuthorization();
-
- Criteria<Context> criteria = new JobAuthorizationBaseVisitor<Criteria<Context>>() {
-
- @Override
- public Criteria<Context> visitParensCriteria(ParensCriteriaContext ctx) {
- return visit(ctx.criteria()).withParens(true);
- }
-
- @Override
- 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();
- checkField(fieldName, operator);
-
- 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<Context> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
- String fieldValue = getValue(ctx.Quoted().getText());
- return new BranchCriteria(fieldValue);
- }
-
- @Override
- public Criteria<Context> visitOrCriteria(OrCriteriaContext ctx) {
- List<Criteria<Context>> childCriterias = new ArrayList<>();
- for (CriteriaContext childCtx: ctx.criteria())
- childCriterias.add(visit(childCtx));
- return new OrCriteria<Context>(childCriterias);
- }
-
- @Override
- public Criteria<Context> visitAndCriteria(AndCriteriaContext ctx) {
- List<Criteria<Context>> childCriterias = new ArrayList<>();
- for (CriteriaContext childCtx: ctx.criteria())
- childCriterias.add(visit(childCtx));
- return new AndCriteria<Context>(childCriterias);
- }
-
- @Override
- public Criteria<Context> visitNotCriteria(NotCriteriaContext ctx) {
- return new NotCriteria<Context>(visit(ctx.criteria()));
- }
-
- }.visit(jobAuthorizationContext.criteria());
-
- return new JobAuthorization(criteria);
- }
-
- public static void checkField(String fieldName, int operator) {
- if (fieldName.equals(Build.NAME_PROJECT) || fieldName.equals(Build.NAME_JOB)) {
- if (operator != JobAuthorizationLexer.Is)
- throw newOperatorException(fieldName, operator);
- } else {
- throw new ExplicitException("Invalid field: " + fieldName);
- }
- }
-
- private static ExplicitException newOperatorException(String fieldName, int operator) {
- return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '"
- + AntlrUtils.getLexerRuleName(JobAuthorizationLexer.ruleNames, operator) + "'");
- }
-
- @Override
- public boolean matches(Context context) {
- return criteria.matches(context);
- }
-
- @Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Context, Context> from,
- CriteriaBuilder builder) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void onRenameUser(String oldName, String newName) {
- criteria.onRenameUser(oldName, newName);
- }
-
- @Override
- public void onMoveProject(String oldPath, String newPath) {
- criteria.onMoveProject(oldPath, newPath);
- }
-
- @Override
- public boolean isUsingUser(String userName) {
- return criteria.isUsingUser(userName);
- }
-
- @Override
- public boolean isUsingProject(String projectPath) {
- return criteria.isUsingProject(projectPath);
- }
-
- public static String getRuleName(int rule) {
- return AntlrUtils.getLexerRuleName(JobAuthorizationLexer.ruleNames, rule);
- }
-
- @Override
- public String toStringWithoutParens() {
- 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/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java
index 45c61c9eb2..b5090c9f6d 100644
--- a/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java
@@ -1,575 +1,575 @@
-package io.onedev.server.job.log;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.Lock;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.antlr.v4.runtime.tree.TerminalNode;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Splitter;
-
-import io.onedev.commons.loader.ManagedSerializedForm;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.LockUtils;
-import io.onedev.commons.utils.TaskLogger;
-import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.log.JobLogEntry;
-import io.onedev.server.buildspec.job.log.JobLogEntryEx;
-import io.onedev.server.buildspec.job.log.instruction.LogInstruction;
-import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.InstructionContext;
-import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.ParamContext;
-import io.onedev.server.cluster.ClusterTask;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.event.Listen;
-import io.onedev.server.event.project.build.BuildFinished;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.support.inputspec.SecretInput;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.storage.StorageManager;
-import io.onedev.server.web.websocket.WebSocketManager;
-
-@Singleton
-public class DefaultLogManager implements LogManager, Serializable {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultLogManager.class);
-
- private static final int MIN_CACHE_ENTRIES = 5000;
-
- private static final int MAX_CACHE_ENTRIES = 10000;
-
- private static final String LOG_FILE = "build.log";
-
- private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormat.forPattern("HH:mm:ss");
-
- private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");
-
- private final StorageManager storageManager;
-
- private final WebSocketManager webSocketManager;
-
- private final ProjectManager projectManager;
-
- private final BuildManager buildManager;
-
- private final Map<String, LogSnippet> recentSnippets = new ConcurrentHashMap<>();
-
- private final Map<String, TaskLogger> jobLoggers = new ConcurrentHashMap<>();
-
- @Inject
- public DefaultLogManager(StorageManager storageManager, WebSocketManager webSocketManager,
- ProjectManager projectManager, BuildManager buildManager) {
- this.storageManager = storageManager;
- this.webSocketManager = webSocketManager;
- this.projectManager = projectManager;
- this.buildManager = buildManager;
- }
-
- public Object writeReplace() throws ObjectStreamException {
- return new ManagedSerializedForm(LogManager.class);
- }
-
- private File getLogFile(Long projectId, Long buildNumber) {
- File buildDir = storageManager.getBuildDir(projectId, buildNumber);
- return new File(buildDir, LOG_FILE);
- }
-
- @Override
- public TaskLogger newLogger(Build build) {
- return newLogger(build, new ArrayList<>());
- }
-
- @Override
- public TaskLogger newLogger(Build build, Collection<String> jobSecretsToMask) {
- Long projectId = build.getProject().getId();
- Long buildId = build.getId();
- Long buildNumber = build.getNumber();
- Collection<String> secretValuesToMask = build.getSecretValuesToMask();
- secretValuesToMask.addAll(jobSecretsToMask);
- return new TaskLogger() {
-
- private final Map<String, StyleBuilder> styleBuilders = new ConcurrentHashMap<>();
-
- private void doLog(String message, StyleBuilder styleBuilder) {
- for (String maskSecret: secretValuesToMask)
- message = StringUtils.replace(message, maskSecret, SecretInput.MASK);
-
- String maskedMessage = message;
- LockUtils.write(getLockName(projectId, buildNumber), new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- String logKey = getLogKey(projectId, buildNumber);
- LogSnippet snippet = recentSnippets.get(logKey);
- if (snippet == null) {
- File logFile = getLogFile(projectId, buildNumber);
- if (!logFile.exists()) {
- snippet = new LogSnippet();
- recentSnippets.put(logKey, snippet);
- }
- }
- if (snippet != null) {
- boolean entryAdded = false;
- try {
- snippet.entries.add(JobLogEntryEx.parse(maskedMessage, styleBuilder));
- entryAdded = true;
- } catch (Exception e) {
- logger.error("Failed to parse job log message: " + maskedMessage, e);
- }
- if (entryAdded) {
- if (snippet.entries.size() > MAX_CACHE_ENTRIES) {
- File logFile = getLogFile(projectId, buildNumber);
- try (ObjectOutputStream oos = newOutputStream(logFile)) {
- while (snippet.entries.size() > MIN_CACHE_ENTRIES) {
- writeLogEntry(oos, snippet.entries.remove(0));
- snippet.offset++;
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- webSocketManager.notifyObservableChange(Build.getLogWebSocketObservable(buildId));
- }
- }
- return null;
- }
-
- });
- }
-
- @Override
- public void log(String message, String sessionId) {
- try {
- StyleBuilder styleBuilder;
- if (sessionId != null) {
- styleBuilder = styleBuilders.get(sessionId);
- if (styleBuilder == null) {
- styleBuilder = new StyleBuilder();
- styleBuilders.put(sessionId, styleBuilder);
- }
- } else {
- styleBuilder = new StyleBuilder();
- }
- if (message.startsWith(LogInstruction.PREFIX)) {
- InstructionContext instructionContext = LogInstruction.parse(message);
- String name = instructionContext.Identifier().getText();
-
- LogInstruction instruction = null;
- for (LogInstruction extension: OneDev.getExtensions(LogInstruction.class)) {
- if (extension.getName().equals(name)) {
- instruction = extension;
- break;
- }
- }
-
- if (instruction != null) {
- Map<String, List<String>> params = new HashMap<>();
- for (ParamContext paramContext: instructionContext.param()) {
- String paramName;
- if (paramContext.Identifier() != null)
- paramName = paramContext.Identifier().getText();
- else
- paramName = "";
- List<String> paramValues = new ArrayList<>();
- for (TerminalNode terminalNode: paramContext.Value())
- paramValues.add(LogInstruction.getValue(terminalNode));
- params.put(paramName, paramValues);
- }
- doInSession(instruction, buildId, params, this);
- } else {
- doLog("Unsupported log instruction: " + name, new StyleBuilder());
- }
- } else {
- doLog(message, styleBuilder);
- }
- } catch (Exception e) {
- logger.error("Error logging", e);
- }
- }
-
- };
- }
-
- @Sessional
- protected void doInSession(LogInstruction instruction, Long buildId,
- Map<String, List<String>> params, TaskLogger logger) {
- instruction.execute(buildManager.load(buildId), params, logger);
- }
-
- private String getLockName(Long projectId, Long buildNumber) {
- return "build-log: " + projectId + ":" + buildNumber;
- }
-
- @Override
- public boolean matches(Build build, Pattern pattern) {
- String key = getLogKey(build.getProject().getId(), build.getNumber());
- return LockUtils.read(getLockName(build.getProject().getId(), build.getNumber()), new Callable<Boolean>() {
-
- @Override
- public Boolean call() throws Exception {
- LogSnippet snippet = recentSnippets.get(key);
- if (snippet != null) {
- for (JobLogEntryEx entry: snippet.entries) {
- if ((build.getRetryDate() == null || !entry.getDate().before(build.getRetryDate()))
- && pattern.matcher(entry.getMessageText()).find()) {
- return true;
- }
- }
- }
-
- File logFile = getLogFile(build.getProject().getId(), build.getNumber());
-
- if (logFile.exists()) {
- try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
- while (true) {
- JobLogEntry entry = (JobLogEntry) ois.readObject();
- if ((build.getRetryDate() == null || !entry.getDate().before(build.getRetryDate()))
- && pattern.matcher(entry.getMessage()).find()) {
- return true;
- }
- }
- } catch (EOFException e) {
- } catch (IOException|ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- return false;
- }
-
- });
- }
-
- private List<JobLogEntryEx> readLogEntries(File logFile, int from, int count) {
- List<JobLogEntryEx> entries = new ArrayList<>();
- if (logFile.exists()) {
- try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
- int numOfReadEntries = 0;
- while (numOfReadEntries < from) {
- ois.readObject();
- numOfReadEntries++;
- }
- while (count == 0 || numOfReadEntries - from < count) {
- entries.add(readLogEntry(ois));
- numOfReadEntries++;
- }
- } catch (EOFException e) {
- } catch (IOException | ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- return entries;
- }
-
- private JobLogEntryEx readLogEntry(ObjectInputStream ois) throws ClassNotFoundException, IOException {
- Object obj = ois.readObject();
- if (obj instanceof JobLogEntry)
- return new JobLogEntryEx((JobLogEntry) obj);
- else
- return (JobLogEntryEx) obj;
- }
-
- private void writeLogEntry(ObjectOutputStream oos, JobLogEntryEx logEntry) throws IOException {
- JobLogEntry spaceEfficientVersion = logEntry.getSpaceEfficientVersion();
- if (spaceEfficientVersion != null)
- oos.writeObject(spaceEfficientVersion);
- else
- oos.writeObject(logEntry);
- }
-
- private LogSnippet readLogSnippetReversely(File logFile, int count) {
- LogSnippet snippet = new LogSnippet();
- if (logFile.exists()) {
- try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
- while (true) {
- snippet.entries.add(readLogEntry(ois));
- if (snippet.entries.size() > count) {
- snippet.entries.remove(0);
- snippet.offset ++;
- }
- }
- } catch (EOFException e) {
- } catch (IOException | ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- return snippet;
- }
-
- private List<JobLogEntryEx> readLogEntries(List<JobLogEntryEx> cachedEntries, int from, int count) {
- if (from < cachedEntries.size()) {
- int to = from + count;
- if (to == from || to > cachedEntries.size())
- to = cachedEntries.size();
- return new ArrayList<>(cachedEntries.subList(from, to));
- } else {
- return new ArrayList<>();
- }
- }
-
- @Sessional
- @Override
- public List<JobLogEntryEx> readLogEntries(Build build, int from, int count) {
- Long projectId = build.getProject().getId();
- Long buildNumber = build.getNumber();
- return projectManager.runOnProjectServer(projectId, new ClusterTask<List<JobLogEntryEx>>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public List<JobLogEntryEx> call() throws Exception {
- return LockUtils.read(getLockName(projectId, buildNumber), new Callable<List<JobLogEntryEx>>() {
-
- @Override
- public List<JobLogEntryEx> call() throws Exception {
- File logFile = getLogFile(projectId, buildNumber);
- LogSnippet snippet = recentSnippets.get(getLogKey(projectId, buildNumber));
- if (snippet != null) {
- if (from >= snippet.offset) {
- return readLogEntries(snippet.entries, from - snippet.offset, count);
- } else {
- List<JobLogEntryEx> entries = new ArrayList<>();
- entries.addAll(readLogEntries(logFile, from, count));
- if (count == 0)
- entries.addAll(snippet.entries);
- else if (entries.size() < count)
- entries.addAll(readLogEntries(snippet.entries, 0, count - entries.size()));
- return entries;
- }
- } else {
- return readLogEntries(logFile, from, count);
- }
- }
-
- });
- }
-
- });
- }
-
- @Sessional
- @Override
- public LogSnippet readLogSnippetReversely(Build build, int count) {
- Long projectId = build.getProject().getId();
- Long buildNumber = build.getNumber();
- return projectManager.runOnProjectServer(projectId, new ClusterTask<LogSnippet>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public LogSnippet call() throws Exception {
- return LockUtils.read(getLockName(projectId, buildNumber), new Callable<LogSnippet>() {
-
- @Override
- public LogSnippet call() throws Exception {
- File logFile = getLogFile(projectId, buildNumber);
- LogSnippet recentSnippet = recentSnippets.get(getLogKey(projectId, buildNumber));
- if (recentSnippet != null) {
- LogSnippet snippet = new LogSnippet();
- if (count <= recentSnippet.entries.size()) {
- snippet.entries.addAll(recentSnippet.entries.subList(
- recentSnippet.entries.size()-count, recentSnippet.entries.size()));
- } else {
- snippet.entries.addAll(readLogSnippetReversely(logFile, count - recentSnippet.entries.size()).entries);
- snippet.entries.addAll(recentSnippet.entries);
- }
- snippet.offset = recentSnippet.entries.size() + recentSnippet.offset - snippet.entries.size();
- return snippet;
- } else {
- return readLogSnippetReversely(logFile, count);
- }
- }
-
- });
- }
-
- });
- }
-
- private ObjectOutputStream newOutputStream(File logFile) {
- try {
- if (logFile.exists()) {
- return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile, true))) {
-
- @Override
- protected void writeStreamHeader() throws IOException {
- reset();
- }
-
- };
- } else {
- return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile)));
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Sessional
- @Listen
- public void on(BuildFinished event) {
- Build build = event.getBuild();
- LockUtils.write(getLockName(build.getProject().getId(), build.getNumber()), new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- LogSnippet snippet = recentSnippets.remove(getLogKey(build.getProject().getId(), build.getNumber()));
- if (snippet != null) {
- File logFile = getLogFile(build.getProject().getId(), build.getNumber());
- try (ObjectOutputStream oos = newOutputStream(logFile)) {
- for (JobLogEntryEx entry: snippet.entries)
- writeLogEntry(oos, entry);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- return null;
- }
-
- });
- }
-
- private String getLogKey(Long projectId, Long buildNumber) {
- return projectId + ":" + buildNumber;
- }
-
- @Override
- public InputStream openLogStream(Long projectId, Long buildNumber) {
- return new LogStream(projectId, buildNumber);
- }
-
- class LogStream extends InputStream {
-
- private ObjectInputStream ois;
-
- private final Lock lock;
-
- private byte[] buffer = new byte[0];
-
- private byte[] recentBuffer;
-
- private int pos = 0;
-
- public LogStream(Long projectId, Long buildNumber) {
- lock = LockUtils.getReadWriteLock(getLockName(projectId, buildNumber)).readLock();
- lock.lock();
- try {
- File logFile = getLogFile(projectId, buildNumber);
-
- if (logFile.exists())
- ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)));
-
- LogSnippet snippet = recentSnippets.get(getLogKey(projectId, buildNumber));
- if (snippet != null) {
- StringBuilder builder = new StringBuilder();
- for (JobLogEntryEx entry: snippet.entries)
- builder.append(renderAsText(entry) + "\n");
- recentBuffer = builder.toString().getBytes(StandardCharsets.UTF_8);
- }
- } catch (Exception e) {
- lock.unlock();
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- private String renderAsText(JobLogEntryEx entry) {
- String prefix = DATE_FORMATTER.print(new DateTime(entry.getDate())) + " ";
- StringBuilder builder = new StringBuilder();
- for (String line: Splitter.on(EOL_PATTERN).split(entry.getMessageText())) {
- if (builder.length() == 0) {
- builder.append(prefix).append(line);
- } else {
- builder.append("\n");
- for (int i=0; i<prefix.length(); i++)
- builder.append(" ");
- builder.append(line);
- }
- }
- return builder.toString();
- }
-
- @Override
- public int read() throws IOException {
- if (pos == buffer.length) {
- if (ois != null) {
- try {
- buffer = (renderAsText(readLogEntry(ois)) + "\n").getBytes(StandardCharsets.UTF_8);
- } catch (EOFException e) {
- ois.close();
- ois = null;
- if (recentBuffer != null) {
- buffer = recentBuffer;
- recentBuffer = null;
- } else {
- return -1;
- }
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- } else if (recentBuffer != null) {
- buffer = recentBuffer;
- recentBuffer = null;
- } else {
- return -1;
- }
- pos = 1;
- return buffer[0];
- } else {
- return buffer[pos++];
- }
- }
-
- @Override
- public void close() throws IOException {
- try {
- if (ois != null)
- ois.close();
- } finally {
- lock.unlock();
- }
- }
-
- }
-
- @Override
- public TaskLogger getJobLogger(String jobToken) {
- return jobLoggers.get(jobToken);
- }
-
- @Override
- public void addJobLogger(String jobToken, TaskLogger logger) {
- jobLoggers.put(jobToken, logger);
- }
-
- @Override
- public void removeJobLogger(String jobToken) {
- jobLoggers.remove(jobToken);
- }
-}
+package io.onedev.server.job.log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.regex.Pattern;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.antlr.v4.runtime.tree.TerminalNode;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.loader.ManagedSerializedForm;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.job.log.JobLogEntry;
+import io.onedev.server.buildspec.job.log.JobLogEntryEx;
+import io.onedev.server.buildspec.job.log.instruction.LogInstruction;
+import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.InstructionContext;
+import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.ParamContext;
+import io.onedev.server.cluster.ClusterTask;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.Listen;
+import io.onedev.server.event.project.build.BuildFinished;
+import io.onedev.server.model.Build;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.storage.StorageManager;
+import io.onedev.server.web.websocket.WebSocketManager;
+
+@Singleton
+public class DefaultLogManager implements LogManager, Serializable {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultLogManager.class);
+
+ private static final int MIN_CACHE_ENTRIES = 5000;
+
+ private static final int MAX_CACHE_ENTRIES = 10000;
+
+ private static final String LOG_FILE = "build.log";
+
+ private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormat.forPattern("HH:mm:ss");
+
+ private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");
+
+ private final StorageManager storageManager;
+
+ private final WebSocketManager webSocketManager;
+
+ private final ProjectManager projectManager;
+
+ private final BuildManager buildManager;
+
+ private final Map<String, LogSnippet> recentSnippets = new ConcurrentHashMap<>();
+
+ private final Map<String, TaskLogger> jobLoggers = new ConcurrentHashMap<>();
+
+ @Inject
+ public DefaultLogManager(StorageManager storageManager, WebSocketManager webSocketManager,
+ ProjectManager projectManager, BuildManager buildManager) {
+ this.storageManager = storageManager;
+ this.webSocketManager = webSocketManager;
+ this.projectManager = projectManager;
+ this.buildManager = buildManager;
+ }
+
+ public Object writeReplace() throws ObjectStreamException {
+ return new ManagedSerializedForm(LogManager.class);
+ }
+
+ private File getLogFile(Long projectId, Long buildNumber) {
+ File buildDir = storageManager.getBuildDir(projectId, buildNumber);
+ return new File(buildDir, LOG_FILE);
+ }
+
+ @Override
+ public TaskLogger newLogger(Build build) {
+ return newLogger(build, new ArrayList<>());
+ }
+
+ @Override
+ public TaskLogger newLogger(Build build, Collection<String> jobSecretsToMask) {
+ Long projectId = build.getProject().getId();
+ Long buildId = build.getId();
+ Long buildNumber = build.getNumber();
+ Collection<String> secretValuesToMask = build.getSecretValuesToMask();
+ secretValuesToMask.addAll(jobSecretsToMask);
+ return new TaskLogger() {
+
+ private final Map<String, StyleBuilder> styleBuilders = new ConcurrentHashMap<>();
+
+ private void doLog(String message, StyleBuilder styleBuilder) {
+ for (String maskSecret: secretValuesToMask)
+ message = StringUtils.replace(message, maskSecret, SecretInput.MASK);
+
+ String maskedMessage = message;
+ LockUtils.write(getLockName(projectId, buildNumber), new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ String logKey = getLogKey(projectId, buildNumber);
+ LogSnippet snippet = recentSnippets.get(logKey);
+ if (snippet == null) {
+ File logFile = getLogFile(projectId, buildNumber);
+ if (!logFile.exists()) {
+ snippet = new LogSnippet();
+ recentSnippets.put(logKey, snippet);
+ }
+ }
+ if (snippet != null) {
+ boolean entryAdded = false;
+ try {
+ snippet.entries.add(JobLogEntryEx.parse(maskedMessage, styleBuilder));
+ entryAdded = true;
+ } catch (Exception e) {
+ logger.error("Failed to parse job log message: " + maskedMessage, e);
+ }
+ if (entryAdded) {
+ if (snippet.entries.size() > MAX_CACHE_ENTRIES) {
+ File logFile = getLogFile(projectId, buildNumber);
+ try (ObjectOutputStream oos = newOutputStream(logFile)) {
+ while (snippet.entries.size() > MIN_CACHE_ENTRIES) {
+ writeLogEntry(oos, snippet.entries.remove(0));
+ snippet.offset++;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ webSocketManager.notifyObservableChange(Build.getLogWebSocketObservable(buildId));
+ }
+ }
+ return null;
+ }
+
+ });
+ }
+
+ @Override
+ public void log(String message, String sessionId) {
+ try {
+ StyleBuilder styleBuilder;
+ if (sessionId != null) {
+ styleBuilder = styleBuilders.get(sessionId);
+ if (styleBuilder == null) {
+ styleBuilder = new StyleBuilder();
+ styleBuilders.put(sessionId, styleBuilder);
+ }
+ } else {
+ styleBuilder = new StyleBuilder();
+ }
+ if (message.startsWith(LogInstruction.PREFIX)) {
+ InstructionContext instructionContext = LogInstruction.parse(message);
+ String name = instructionContext.Identifier().getText();
+
+ LogInstruction instruction = null;
+ for (LogInstruction extension: OneDev.getExtensions(LogInstruction.class)) {
+ if (extension.getName().equals(name)) {
+ instruction = extension;
+ break;
+ }
+ }
+
+ if (instruction != null) {
+ Map<String, List<String>> params = new HashMap<>();
+ for (ParamContext paramContext: instructionContext.param()) {
+ String paramName;
+ if (paramContext.Identifier() != null)
+ paramName = paramContext.Identifier().getText();
+ else
+ paramName = "";
+ List<String> paramValues = new ArrayList<>();
+ for (TerminalNode terminalNode: paramContext.Value())
+ paramValues.add(LogInstruction.getValue(terminalNode));
+ params.put(paramName, paramValues);
+ }
+ doInSession(instruction, buildId, params, this);
+ } else {
+ doLog("Unsupported log instruction: " + name, new StyleBuilder());
+ }
+ } else {
+ doLog(message, styleBuilder);
+ }
+ } catch (Exception e) {
+ logger.error("Error logging", e);
+ }
+ }
+
+ };
+ }
+
+ @Sessional
+ protected void doInSession(LogInstruction instruction, Long buildId,
+ Map<String, List<String>> params, TaskLogger logger) {
+ instruction.execute(buildManager.load(buildId), params, logger);
+ }
+
+ private String getLockName(Long projectId, Long buildNumber) {
+ return "build-log: " + projectId + ":" + buildNumber;
+ }
+
+ @Override
+ public boolean matches(Build build, Pattern pattern) {
+ String key = getLogKey(build.getProject().getId(), build.getNumber());
+ return LockUtils.read(getLockName(build.getProject().getId(), build.getNumber()), new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() throws Exception {
+ LogSnippet snippet = recentSnippets.get(key);
+ if (snippet != null) {
+ for (JobLogEntryEx entry: snippet.entries) {
+ if ((build.getRetryDate() == null || !entry.getDate().before(build.getRetryDate()))
+ && pattern.matcher(entry.getMessageText()).find()) {
+ return true;
+ }
+ }
+ }
+
+ File logFile = getLogFile(build.getProject().getId(), build.getNumber());
+
+ if (logFile.exists()) {
+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
+ while (true) {
+ JobLogEntry entry = (JobLogEntry) ois.readObject();
+ if ((build.getRetryDate() == null || !entry.getDate().before(build.getRetryDate()))
+ && pattern.matcher(entry.getMessage()).find()) {
+ return true;
+ }
+ }
+ } catch (EOFException e) {
+ } catch (IOException|ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return false;
+ }
+
+ });
+ }
+
+ private List<JobLogEntryEx> readLogEntries(File logFile, int from, int count) {
+ List<JobLogEntryEx> entries = new ArrayList<>();
+ if (logFile.exists()) {
+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
+ int numOfReadEntries = 0;
+ while (numOfReadEntries < from) {
+ ois.readObject();
+ numOfReadEntries++;
+ }
+ while (count == 0 || numOfReadEntries - from < count) {
+ entries.add(readLogEntry(ois));
+ numOfReadEntries++;
+ }
+ } catch (EOFException e) {
+ } catch (IOException | ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return entries;
+ }
+
+ private JobLogEntryEx readLogEntry(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+ Object obj = ois.readObject();
+ if (obj instanceof JobLogEntry)
+ return new JobLogEntryEx((JobLogEntry) obj);
+ else
+ return (JobLogEntryEx) obj;
+ }
+
+ private void writeLogEntry(ObjectOutputStream oos, JobLogEntryEx logEntry) throws IOException {
+ JobLogEntry spaceEfficientVersion = logEntry.getSpaceEfficientVersion();
+ if (spaceEfficientVersion != null)
+ oos.writeObject(spaceEfficientVersion);
+ else
+ oos.writeObject(logEntry);
+ }
+
+ private LogSnippet readLogSnippetReversely(File logFile, int count) {
+ LogSnippet snippet = new LogSnippet();
+ if (logFile.exists()) {
+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
+ while (true) {
+ snippet.entries.add(readLogEntry(ois));
+ if (snippet.entries.size() > count) {
+ snippet.entries.remove(0);
+ snippet.offset ++;
+ }
+ }
+ } catch (EOFException e) {
+ } catch (IOException | ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return snippet;
+ }
+
+ private List<JobLogEntryEx> readLogEntries(List<JobLogEntryEx> cachedEntries, int from, int count) {
+ if (from < cachedEntries.size()) {
+ int to = from + count;
+ if (to == from || to > cachedEntries.size())
+ to = cachedEntries.size();
+ return new ArrayList<>(cachedEntries.subList(from, to));
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ @Sessional
+ @Override
+ public List<JobLogEntryEx> readLogEntries(Build build, int from, int count) {
+ Long projectId = build.getProject().getId();
+ Long buildNumber = build.getNumber();
+ return projectManager.runOnProjectServer(projectId, new ClusterTask<List<JobLogEntryEx>>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public List<JobLogEntryEx> call() throws Exception {
+ return LockUtils.read(getLockName(projectId, buildNumber), new Callable<List<JobLogEntryEx>>() {
+
+ @Override
+ public List<JobLogEntryEx> call() throws Exception {
+ File logFile = getLogFile(projectId, buildNumber);
+ LogSnippet snippet = recentSnippets.get(getLogKey(projectId, buildNumber));
+ if (snippet != null) {
+ if (from >= snippet.offset) {
+ return readLogEntries(snippet.entries, from - snippet.offset, count);
+ } else {
+ List<JobLogEntryEx> entries = new ArrayList<>();
+ entries.addAll(readLogEntries(logFile, from, count));
+ if (count == 0)
+ entries.addAll(snippet.entries);
+ else if (entries.size() < count)
+ entries.addAll(readLogEntries(snippet.entries, 0, count - entries.size()));
+ return entries;
+ }
+ } else {
+ return readLogEntries(logFile, from, count);
+ }
+ }
+
+ });
+ }
+
+ });
+ }
+
+ @Sessional
+ @Override
+ public LogSnippet readLogSnippetReversely(Build build, int count) {
+ Long projectId = build.getProject().getId();
+ Long buildNumber = build.getNumber();
+ return projectManager.runOnProjectServer(projectId, new ClusterTask<LogSnippet>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public LogSnippet call() throws Exception {
+ return LockUtils.read(getLockName(projectId, buildNumber), new Callable<LogSnippet>() {
+
+ @Override
+ public LogSnippet call() throws Exception {
+ File logFile = getLogFile(projectId, buildNumber);
+ LogSnippet recentSnippet = recentSnippets.get(getLogKey(projectId, buildNumber));
+ if (recentSnippet != null) {
+ LogSnippet snippet = new LogSnippet();
+ if (count <= recentSnippet.entries.size()) {
+ snippet.entries.addAll(recentSnippet.entries.subList(
+ recentSnippet.entries.size()-count, recentSnippet.entries.size()));
+ } else {
+ snippet.entries.addAll(readLogSnippetReversely(logFile, count - recentSnippet.entries.size()).entries);
+ snippet.entries.addAll(recentSnippet.entries);
+ }
+ snippet.offset = recentSnippet.entries.size() + recentSnippet.offset - snippet.entries.size();
+ return snippet;
+ } else {
+ return readLogSnippetReversely(logFile, count);
+ }
+ }
+
+ });
+ }
+
+ });
+ }
+
+ private ObjectOutputStream newOutputStream(File logFile) {
+ try {
+ if (logFile.exists()) {
+ return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile, true))) {
+
+ @Override
+ protected void writeStreamHeader() throws IOException {
+ reset();
+ }
+
+ };
+ } else {
+ return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile)));
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Sessional
+ @Listen
+ public void on(BuildFinished event) {
+ Build build = event.getBuild();
+ LockUtils.write(getLockName(build.getProject().getId(), build.getNumber()), new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ LogSnippet snippet = recentSnippets.remove(getLogKey(build.getProject().getId(), build.getNumber()));
+ if (snippet != null) {
+ File logFile = getLogFile(build.getProject().getId(), build.getNumber());
+ try (ObjectOutputStream oos = newOutputStream(logFile)) {
+ for (JobLogEntryEx entry: snippet.entries)
+ writeLogEntry(oos, entry);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return null;
+ }
+
+ });
+ }
+
+ private String getLogKey(Long projectId, Long buildNumber) {
+ return projectId + ":" + buildNumber;
+ }
+
+ @Override
+ public InputStream openLogStream(Long projectId, Long buildNumber) {
+ return new LogStream(projectId, buildNumber);
+ }
+
+ class LogStream extends InputStream {
+
+ private ObjectInputStream ois;
+
+ private final Lock lock;
+
+ private byte[] buffer = new byte[0];
+
+ private byte[] recentBuffer;
+
+ private int pos = 0;
+
+ public LogStream(Long projectId, Long buildNumber) {
+ lock = LockUtils.getReadWriteLock(getLockName(projectId, buildNumber)).readLock();
+ lock.lock();
+ try {
+ File logFile = getLogFile(projectId, buildNumber);
+
+ if (logFile.exists())
+ ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)));
+
+ LogSnippet snippet = recentSnippets.get(getLogKey(projectId, buildNumber));
+ if (snippet != null) {
+ StringBuilder builder = new StringBuilder();
+ for (JobLogEntryEx entry: snippet.entries)
+ builder.append(renderAsText(entry) + "\n");
+ recentBuffer = builder.toString().getBytes(StandardCharsets.UTF_8);
+ }
+ } catch (Exception e) {
+ lock.unlock();
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ private String renderAsText(JobLogEntryEx entry) {
+ String prefix = DATE_FORMATTER.print(new DateTime(entry.getDate())) + " ";
+ StringBuilder builder = new StringBuilder();
+ for (String line: Splitter.on(EOL_PATTERN).split(entry.getMessageText())) {
+ if (builder.length() == 0) {
+ builder.append(prefix).append(line);
+ } else {
+ builder.append("\n");
+ for (int i=0; i<prefix.length(); i++)
+ builder.append(" ");
+ builder.append(line);
+ }
+ }
+ return builder.toString();
+ }
+
+ @Override
+ public int read() throws IOException {
+ if (pos == buffer.length) {
+ if (ois != null) {
+ try {
+ buffer = (renderAsText(readLogEntry(ois)) + "\n").getBytes(StandardCharsets.UTF_8);
+ } catch (EOFException e) {
+ ois.close();
+ ois = null;
+ if (recentBuffer != null) {
+ buffer = recentBuffer;
+ recentBuffer = null;
+ } else {
+ return -1;
+ }
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ } else if (recentBuffer != null) {
+ buffer = recentBuffer;
+ recentBuffer = null;
+ } else {
+ return -1;
+ }
+ pos = 1;
+ return buffer[0];
+ } else {
+ return buffer[pos++];
+ }
+ }
+
+ @Override
+ public void close() throws IOException {
+ try {
+ if (ois != null)
+ ois.close();
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ }
+
+ @Override
+ public TaskLogger getJobLogger(String jobToken) {
+ return jobLoggers.get(jobToken);
+ }
+
+ @Override
+ public void addJobLogger(String jobToken, TaskLogger logger) {
+ jobLoggers.put(jobToken, logger);
+ }
+
+ @Override
+ public void removeJobLogger(String jobToken) {
+ jobLoggers.remove(jobToken);
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java
new file mode 100644
index 0000000000..e601d10563
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java
@@ -0,0 +1,43 @@
+package io.onedev.server.job.match;
+
+import io.onedev.server.util.criteria.Criteria;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import static io.onedev.server.util.match.WildcardUtils.matchPath;
+
+public class BranchCriteria extends Criteria<JobMatchContext> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String branch;
+
+ public BranchCriteria(String branch) {
+ this.branch = branch;
+ }
+
+ @Override
+ public boolean matches(JobMatchContext context) {
+ if (context.getBranch() != null)
+ return matchPath(branch, context.getBranch());
+ else if (context.getCommitId() != null)
+ return context.getProject().isCommitOnBranch(context.getCommitId(), branch);
+ else
+ return matchPath(branch, "main");
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return JobMatch.getRuleName(JobMatchLexer.OnBranch) + " " + quote(branch);
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ CriteriaBuilder builder) {
+ throw new UnsupportedOperationException();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/GroupCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/GroupCriteria.java
new file mode 100644
index 0000000000..86c5b6d5ca
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/match/GroupCriteria.java
@@ -0,0 +1,52 @@
+package io.onedev.server.job.match;
+
+import io.onedev.server.model.Group;
+import io.onedev.server.model.User;
+import io.onedev.server.util.criteria.Criteria;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+import static io.onedev.server.job.match.JobMatchLexer.SubmittedByGroup;
+
+public class GroupCriteria extends Criteria<JobMatchContext> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Group group;
+
+ public GroupCriteria(Group group) {
+ this.group = group;
+ }
+
+ @Override
+ public boolean matches(JobMatchContext context) {
+ User user = context.getUser();
+ return user != null && user.getGroups().contains(group);
+ }
+
+ @Override
+ public void onRenameGroup(String oldName, String newName) {
+ if (group.getName().equals(oldName))
+ group.setName(newName);
+ }
+
+ @Override
+ public boolean isUsingGroup(String groupName) {
+ return group.getName().equals(groupName);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return JobMatch.getRuleName(SubmittedByGroup) + " " + quote(group.getName());
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ CriteriaBuilder builder) {
+ throw new UnsupportedOperationException();
+ }
+
+}
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/match/JobCriteria.java
similarity index 51%
rename from server-core/src/main/java/io/onedev/server/job/authorization/JobCriteria.java
rename to server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
index cb4b119997..2b21a7bdb6 100644
--- a/server-core/src/main/java/io/onedev/server/job/authorization/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobCriteria.java
@@ -1,19 +1,16 @@
-package io.onedev.server.job.authorization;
+package io.onedev.server.job.match;
-import static io.onedev.server.job.authorization.JobAuthorization.getRuleName;
-import static io.onedev.server.job.authorization.JobAuthorizationLexer.Is;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.model.Build;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.match.WildcardUtils;
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> {
+public class JobCriteria extends Criteria<JobMatchContext> {
private static final long serialVersionUID = 1L;
@@ -24,19 +21,22 @@ public class JobCriteria extends Criteria<Context> {
}
@Override
- public boolean matches(Context context) {
- return WildcardUtils.matchString(jobName, context.getJobName());
+ public boolean matches(JobMatchContext context) {
+ if (context.getJobName() != null)
+ return WildcardUtils.matchString(jobName, context.getJobName());
+ else
+ throw new ExplicitException("Job name not available in match context");
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Context, Context> from,
+ public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
@Override
public String toStringWithoutParens() {
- return quote(Build.NAME_JOB) + " " + getRuleName(Is) + " " + quote(jobName);
+ return quote(Build.NAME_JOB) + " " + JobMatch.getRuleName(JobMatchLexer.Is) + " " + quote(jobName);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.g4 b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
similarity index 70%
rename from server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.g4
rename to server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
index faaf85354c..2464584146 100644
--- a/server-core/src/main/java/io/onedev/server/job/authorization/JobAuthorization.g4
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
@@ -1,11 +1,11 @@
-grammar JobAuthorization;
+grammar JobMatch;
-jobAuthorization
+jobMatch
: WS* criteria WS* EOF
;
criteria
- : operator=OnBranch WS+ criteriaValue=Quoted #OperatorValueCriteria
+ : operator=(OnBranch|SubmittedByUser|SubmittedByGroup) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=Is WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
@@ -16,11 +16,19 @@ criteria
OnBranch
: 'on' WS+ 'branch'
;
-
+
+SubmittedByUser
+ : 'submitted' WS+ 'by' WS+ 'user'
+ ;
+
+SubmittedByGroup
+ : 'submitted' WS+ 'by' WS+ 'group'
+ ;
+
Is
: 'is'
;
-
+
And
: 'and'
;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
new file mode 100644
index 0000000000..594ed82100
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
@@ -0,0 +1,188 @@
+package io.onedev.server.job.match;
+
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Build;
+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;
+import org.antlr.v4.runtime.*;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+
+import static io.onedev.commons.codeassist.AntlrUtils.getLexerRuleName;
+
+public class JobMatch extends Criteria<JobMatchContext> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Criteria<JobMatchContext> criteria;
+
+ public JobMatch(Criteria<JobMatchContext> criteria) {
+ this.criteria = criteria;
+ }
+
+ public static String getValue(String token) {
+ return StringUtils.unescape(FenceAware.unfence(token));
+ }
+
+ public static JobMatch parse(String jobMatchString, boolean withProjectCriteria, boolean withJobCriteria) {
+ CharStream is = CharStreams.fromString(jobMatchString);
+ JobMatchLexer lexer = new JobMatchLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new RuntimeException("Malformed job match", e);
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ JobMatchParser parser = new JobMatchParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ JobMatchParser.JobMatchContext JobMatchContext = parser.jobMatch();
+
+ Criteria<io.onedev.server.job.match.JobMatchContext> criteria = new JobMatchBaseVisitor<Criteria<io.onedev.server.job.match.JobMatchContext>>() {
+
+ @Override
+ public Criteria<io.onedev.server.job.match.JobMatchContext> visitParensCriteria(JobMatchParser.ParensCriteriaContext ctx) {
+ return visit(ctx.criteria()).withParens(true);
+ }
+
+ @Override
+ public Criteria<io.onedev.server.job.match.JobMatchContext> visitFieldOperatorValueCriteria(JobMatchParser.FieldOperatorValueCriteriaContext ctx) {
+ String fieldName = getValue(ctx.Quoted(0).getText());
+ String fieldValue = getValue(ctx.Quoted(1).getText());
+ checkField(fieldName, withProjectCriteria, withJobCriteria);
+
+ if (fieldName.equals(Build.NAME_PROJECT))
+ return new ProjectCriteria(fieldValue);
+ else
+ return new JobCriteria(fieldValue);
+ }
+
+ @Override
+ public Criteria<io.onedev.server.job.match.JobMatchContext> visitOperatorValueCriteria(JobMatchParser.OperatorValueCriteriaContext ctx) {
+ String fieldValue = getValue(ctx.Quoted().getText());
+ switch (ctx.operator.getType()) {
+ case JobMatchParser.OnBranch:
+ return new BranchCriteria(fieldValue);
+ case JobMatchParser.SubmittedByGroup:
+ var group = OneDev.getInstance(GroupManager.class).find(fieldValue);
+ if (group != null)
+ return new GroupCriteria(group);
+ else
+ throw new ExplicitException("Unable to find group: " + fieldValue);
+ case JobMatchParser.SubmittedByUser:
+ var user = OneDev.getInstance(UserManager.class).findByName(fieldValue);
+ if (user != null)
+ return new UserCriteria(user);
+ else
+ throw new ExplicitException("Unable to find user with login: " + fieldValue);
+ default:
+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
+ }
+ }
+
+ @Override
+ public Criteria<io.onedev.server.job.match.JobMatchContext> visitOrCriteria(JobMatchParser.OrCriteriaContext ctx) {
+ List<Criteria<io.onedev.server.job.match.JobMatchContext>> childCriterias = new ArrayList<>();
+ for (JobMatchParser.CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new OrCriteria<>(childCriterias);
+ }
+
+ @Override
+ public Criteria<io.onedev.server.job.match.JobMatchContext> visitAndCriteria(JobMatchParser.AndCriteriaContext ctx) {
+ List<Criteria<io.onedev.server.job.match.JobMatchContext>> childCriterias = new ArrayList<>();
+ for (JobMatchParser.CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new AndCriteria<>(childCriterias);
+ }
+
+ @Override
+ public Criteria<io.onedev.server.job.match.JobMatchContext> visitNotCriteria(JobMatchParser.NotCriteriaContext ctx) {
+ return new NotCriteria<>(visit(ctx.criteria()));
+ }
+
+ }.visit(JobMatchContext.criteria());
+
+ return new JobMatch(criteria);
+ }
+
+ public static void checkField(String fieldName, boolean withProjectCriteria, boolean withJobCriteria) {
+ if (fieldName.equals(Build.NAME_PROJECT)) {
+ if (!withProjectCriteria)
+ throw new ExplicitException("Project criteria is not supported here");
+ } else if (fieldName.equals(Build.NAME_JOB)) {
+ if (!withJobCriteria)
+ throw new ExplicitException("Job criteria is not supported here");
+ } else {
+ throw new ExplicitException("Invalid field: " + fieldName);
+ }
+ }
+
+ @Override
+ public boolean matches(JobMatchContext context) {
+ return criteria.matches(context);
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ CriteriaBuilder builder) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void onRenameUser(String oldName, String newName) {
+ criteria.onRenameUser(oldName, newName);
+ }
+
+ @Override
+ public void onRenameGroup(String oldName, String newName) {
+ criteria.onRenameGroup(oldName, newName);
+ }
+
+ @Override
+ public void onMoveProject(String oldPath, String newPath) {
+ criteria.onMoveProject(oldPath, newPath);
+ }
+
+ @Override
+ public boolean isUsingUser(String userName) {
+ return criteria.isUsingUser(userName);
+ }
+
+ @Override
+ public boolean isUsingGroup(String groupName) {
+ return criteria.isUsingGroup(groupName);
+ }
+
+ @Override
+ public boolean isUsingProject(String projectPath) {
+ return criteria.isUsingProject(projectPath);
+ }
+
+ public static String getRuleName(int rule) {
+ return getLexerRuleName(JobMatchLexer.ruleNames, rule);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return criteria.toString();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatchContext.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatchContext.java
new file mode 100644
index 0000000000..8aa1851d1a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatchContext.java
@@ -0,0 +1,64 @@
+package io.onedev.server.job.match;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Role;
+import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+
+public class JobMatchContext {
+
+ private final Project project;
+
+ @Nullable
+ private final String branch;
+
+ @Nullable
+ private final ObjectId commitId;
+
+ @Nullable
+ private final User user;
+
+ @Nullable
+ private final String jobName;
+
+ public JobMatchContext(Project project, @Nullable String branch, @Nullable ObjectId commitId,
+ @Nullable User user, @Nullable String jobName) {
+ this.project = project;
+ this.branch = branch;
+ this.commitId = commitId;
+ this.user = user;
+ this.jobName = jobName;
+ }
+
+ public Project getProject() {
+ return project;
+ }
+
+ @Nullable
+ public String getBranch() {
+ return branch;
+ }
+
+ @Nullable
+ public ObjectId getCommitId() {
+ return commitId;
+ }
+
+ @Nullable
+ public User getUser() {
+ return user;
+ }
+
+ @Nullable
+ public String getJobName() {
+ return jobName;
+ }
+
+ public boolean isSubmittedBy(Role role) {
+ return SecurityUtils.isAssignedRole(user, project, role);
+ }
+
+}
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/match/ProjectCriteria.java
similarity index 67%
rename from server-core/src/main/java/io/onedev/server/job/authorization/ProjectCriteria.java
rename to server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
index a6427df4b0..343a76ca82 100644
--- a/server-core/src/main/java/io/onedev/server/job/authorization/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
@@ -1,20 +1,17 @@
-package io.onedev.server.job.authorization;
+package io.onedev.server.job.match;
-import static io.onedev.server.job.authorization.JobAuthorization.getRuleName;
-import static io.onedev.server.job.authorization.JobAuthorizationLexer.Is;
-import static io.onedev.server.model.Build.NAME_PROJECT;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.match.WildcardUtils;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.server.job.authorization.JobAuthorization.Context;
-import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.match.WildcardUtils;
+import static io.onedev.server.model.Build.NAME_PROJECT;
-public class ProjectCriteria extends Criteria<Context> {
+public class ProjectCriteria extends Criteria<JobMatchContext> {
private static final long serialVersionUID = 1L;
@@ -25,7 +22,7 @@ public class ProjectCriteria extends Criteria<Context> {
}
@Override
- public boolean matches(Context context) {
+ public boolean matches(JobMatchContext context) {
return WildcardUtils.matchPath(projectPath, context.getProject().getPath());
}
@@ -41,11 +38,11 @@ public class ProjectCriteria extends Criteria<Context> {
@Override
public String toStringWithoutParens() {
- return quote(NAME_PROJECT) + " " + getRuleName(Is) + " " + quote(projectPath);
+ return quote(NAME_PROJECT) + " " + JobMatch.getRuleName(JobMatchLexer.Is) + " " + quote(projectPath);
}
@Override
- public Predicate getPredicate(CriteriaQuery<?> query, From<Context, Context> from,
+ public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
CriteriaBuilder builder) {
throw new UnsupportedOperationException();
}
diff --git a/server-core/src/main/java/io/onedev/server/job/match/UserCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/UserCriteria.java
new file mode 100644
index 0000000000..984c0c3019
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/match/UserCriteria.java
@@ -0,0 +1,51 @@
+package io.onedev.server.job.match;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.User;
+import io.onedev.server.util.criteria.Criteria;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+public class UserCriteria extends Criteria<JobMatchContext> {
+
+ private static final long serialVersionUID = 1L;
+
+ private User user;
+
+ public UserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public boolean matches(JobMatchContext context) {
+ return user.equals(context.getUser());
+ }
+
+ @Override
+ public void onRenameUser(String oldName, String newName) {
+ if (user.getName().equals(oldName))
+ user.setName(newName);
+ }
+
+ @Override
+ public boolean isUsingUser(String userName) {
+ return user.getName().equals(userName);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return JobMatch.getRuleName(JobMatchLexer.SubmittedByUser) + " " + quote(user.getName());
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<JobMatchContext, JobMatchContext> from,
+ CriteriaBuilder builder) {
+ throw new UnsupportedOperationException();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 54345afed3..b19399d525 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -12,6 +12,7 @@ import io.onedev.server.markdown.MentionParser;
import io.onedev.server.model.*;
import io.onedev.server.util.CryptoUtils;
import io.onedev.server.util.Pair;
+import io.onedev.server.util.patternset.PatternSet;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.tuple.Triple;
import org.dom4j.Element;
@@ -4976,4 +4977,119 @@ public class DataMigrator {
}
}
}
+
+ private void migrate114_reviewRequirement(@Nullable Element reviewRequirementElement) {
+ if (reviewRequirementElement != null) {
+ String reviewRequirement = reviewRequirementElement.getText();
+ reviewRequirement = reviewRequirement.replaceAll("\\)\\s+(user|group)", ") and $1");
+ reviewRequirement = reviewRequirement.replace("):all", "):2");
+ reviewRequirementElement.setText(reviewRequirement);
+ }
+ }
+
+ private void migrate114(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ try {
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
+ content = StringUtils.replace(content,
+ "io.onedev.server.model.support.inputspec.",
+ "io.onedev.server.buildspecmodel.inputspec.");
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Projects.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ var buildSettingElement = element.element("buildSetting");
+ buildSettingElement.element("actionAuthorizations").detach();
+ for (var branchProtectionElement : element.element("branchProtections").elements()) {
+ migrate114_reviewRequirement(branchProtectionElement.element("reviewRequirement"));
+ for (Element fileProtectionElement : branchProtectionElement.element("fileProtections").elements()) {
+ migrate114_reviewRequirement(fileProtectionElement.element("reviewRequirement"));
+ }
+ }
+ for (var secretElement: buildSettingElement.element("jobSecrets").elements()) {
+ var authorizedBranchesElement = secretElement.element("authorizedBranches");
+ if (authorizedBranchesElement != null) {
+ PatternSet patterns = PatternSet.parse(authorizedBranchesElement.getText());
+ var criterias = new ArrayList<>();
+ var positiveCriterias = new ArrayList<>();
+ for (String include : patterns.getIncludes()) {
+ positiveCriterias.add("on branch \"" + include + "\"");
+ }
+ if (!positiveCriterias.isEmpty()) {
+ criterias.add("(" + StringUtils.join(positiveCriterias, " or ") + ")");
+ }
+ for (String exclude : patterns.getExcludes()) {
+ criterias.add("not(on branch \"" + exclude + "\")");
+ }
+ secretElement.addElement("authorization").setText(StringUtils.join(criterias, " and "));
+ authorizedBranchesElement.detach();
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String key = element.elementTextTrim("key");
+ if (key.equals("JOB_EXECUTORS")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ for (var jobExecutorElement: valueElement.elements()) {
+ var jobAuthorizationElement = jobExecutorElement.element("jobAuthorization");
+ if (jobAuthorizationElement != null)
+ jobAuthorizationElement.setName("jobRequirement");
+ }
+ }
+ } else if (key.equals("GROOVY_SCRIPTS")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ for (var groovyScriptElement: valueElement.elements()) {
+ var criterias = new ArrayList<>();
+ Element allowedProjectsElement = groovyScriptElement.element("allowedProjects");
+ if (allowedProjectsElement != null) {
+ PatternSet patterns = PatternSet.parse(allowedProjectsElement.getText());
+ var positiveCriterias = new ArrayList<>();
+ for (String include : patterns.getIncludes()) {
+ positiveCriterias.add("\"Project\" is \"" + include + "\"");
+ }
+ if (!positiveCriterias.isEmpty()) {
+ criterias.add("(" + StringUtils.join(positiveCriterias, " or ") + ")");
+ }
+ for (String exclude : patterns.getExcludes()) {
+ criterias.add("not(\"Project\" is \"" + exclude + "\")");
+ }
+ allowedProjectsElement.detach();
+ }
+
+ Element allowedBranchesElement = groovyScriptElement.element("allowedBranches");
+ if (allowedBranchesElement != null) {
+ PatternSet patterns = PatternSet.parse(allowedBranchesElement.getText());
+ var positiveCriterias = new ArrayList<>();
+ for (String include : patterns.getIncludes()) {
+ positiveCriterias.add("on branch \"" + include + "\"");
+ }
+ if (!positiveCriterias.isEmpty()) {
+ criterias.add("(" + StringUtils.join(positiveCriterias, " or ") + ")");
+ }
+ for (String exclude : patterns.getExcludes()) {
+ criterias.add("not(on branch \"" + exclude + "\")");
+ }
+ allowedBranchesElement.detach();
+ }
+ if (!criterias.isEmpty())
+ groovyScriptElement.addElement("authorization").setText(StringUtils.join(criterias, " and "));
+ }
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index fd558414a3..d6013bab18 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -1,63 +1,11 @@
package io.onedev.server.model;
-import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;
-import static io.onedev.server.model.Build.PROP_COMMIT;
-import static io.onedev.server.model.Build.PROP_FINISH_DATE;
-import static io.onedev.server.model.Build.PROP_FINISH_DAY;
-import static io.onedev.server.model.Build.PROP_JOB;
-import static io.onedev.server.model.Build.PROP_PENDING_DATE;
-import static io.onedev.server.model.Build.PROP_PIPELINE;
-import static io.onedev.server.model.Build.PROP_REF_NAME;
-import static io.onedev.server.model.Build.PROP_RUNNING_DATE;
-import static io.onedev.server.model.Build.PROP_STATUS;
-import static io.onedev.server.model.Build.PROP_SUBMIT_DATE;
-import static io.onedev.server.model.Build.PROP_VERSION;
-
-import java.io.File;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.Stack;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.annotation.Nullable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Index;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import io.onedev.server.util.artifact.ArtifactInfo;
-import io.onedev.server.util.artifact.DirectoryInfo;
-import io.onedev.server.util.validation.annotation.Directory;
-import org.apache.commons.lang3.StringUtils;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Restrictions;
-
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
+import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentStorageSupport;
@@ -69,38 +17,47 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.param.spec.SecretParam;
import io.onedev.server.buildspec.param.supply.ParamSupply;
import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.git.GitUtils;
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.JobAuthorizationContext;
import io.onedev.server.model.support.BuildMetric;
import io.onedev.server.model.support.LabelSupport;
import io.onedev.server.model.support.ProjectBelonging;
import io.onedev.server.model.support.build.JobSecret;
-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
-import io.onedev.server.model.support.build.actionauthorization.CloseMilestoneAuthorization;
-import io.onedev.server.model.support.build.actionauthorization.CreateTagAuthorization;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.CollectionUtils;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.Day;
-import io.onedev.server.util.Input;
-import io.onedev.server.util.JobSecretAuthorizationContext;
-import io.onedev.server.util.MatrixRunner;
-import io.onedev.server.util.ProjectScopedNumber;
+import io.onedev.server.util.*;
+import io.onedev.server.util.artifact.ArtifactInfo;
+import io.onedev.server.util.artifact.DirectoryInfo;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.facade.BuildFacade;
-import io.onedev.server.util.match.WildcardUtils;
-import io.onedev.server.util.script.identity.JobIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Markdown;
import io.onedev.server.web.util.BuildAware;
import io.onedev.server.web.util.WicketUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+
+import javax.annotation.Nullable;
+import javax.persistence.*;
+import java.io.File;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static io.onedev.server.model.AbstractEntity.PROP_NUMBER;
+import static io.onedev.server.model.Build.*;
@Entity
@Table(
@@ -369,7 +326,7 @@ public class Build extends ProjectBelonging
private transient Map<Integer, Collection<Long>> streamPreviousNumbersCache = new HashMap<>();
- private transient JobSecretAuthorizationContext jobSecretAuthorizationContext;
+ private transient JobAuthorizationContext jobAuthorizationContext;
private transient List<ArtifactInfo> rootArtifacts;
@@ -739,18 +696,16 @@ public class Build extends ProjectBelonging
return new BuildFacade(getId(), getProject().getId(), getNumber(), getCommitHash());
}
- public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
- if (jobSecretAuthorizationContext == null)
- jobSecretAuthorizationContext = new JobSecretAuthorizationContext(project, getCommitId(), request);
- return jobSecretAuthorizationContext;
+ public JobAuthorizationContext getJobAuthorizationContext() {
+ if (jobAuthorizationContext == null)
+ jobAuthorizationContext = new JobAuthorizationContext(project, getCommitId(), getSubmitter(), request);
+ return jobAuthorizationContext;
}
public Collection<String> getSecretValuesToMask() {
Collection<String> secretValuesToMask = new HashSet<>();
- for (JobSecret secret: getProject().getHierarchyJobSecrets()) {
- if (getJobSecretAuthorizationContext().isOnBranches(secret.getAuthorizedBranches()))
- secretValuesToMask.add(secret.getValue());
- }
+ for (JobSecret secret: getProject().getHierarchyJobSecrets())
+ secretValuesToMask.add(secret.getValue());
for (BuildParam param: getParams()) {
if (param.getType().equals(ParamSpec.SECRET) && param.getValue() != null) {
@@ -775,11 +730,11 @@ public class Build extends ProjectBelonging
@Nullable
public Job getJob() {
- JobSecretAuthorizationContext.push(getJobSecretAuthorizationContext());
+ JobAuthorizationContext.push(getJobAuthorizationContext());
try {
return getSpec()!=null? getSpec().getJobMap().get(getJobName()): null;
} finally {
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
}
@@ -885,42 +840,26 @@ public class Build extends ProjectBelonging
public static void push(@Nullable Build build) {
stack.get().push(build);
- if (build != null)
- ScriptIdentity.push(new JobIdentity(build.getProject(), build.getCommitId()));
}
public static void pop() {
- Build build = stack.get().pop();
- if (build != null)
- ScriptIdentity.pop();
- }
-
- public boolean canCreateTag(String tagName) {
- for (ActionAuthorization authorization: getProject().getHierarchyActionAuthorizations()) {
- if (getJobSecretAuthorizationContext().isOnBranches(authorization.getAuthorizedBranches())) {
- if (authorization instanceof CreateTagAuthorization) {
- CreateTagAuthorization createTagAuthorization = (CreateTagAuthorization) authorization;
- String tagNames = createTagAuthorization.getTagNames();
- if (tagNames == null || WildcardUtils.matchPath(tagNames, tagName))
- return true;
- }
- }
- }
- return false;
+ stack.get().pop();
}
- public boolean canCloseMilestone(String milestoneName) {
- for (ActionAuthorization authorization: getProject().getHierarchyActionAuthorizations()) {
- if (getJobSecretAuthorizationContext().isOnBranches(authorization.getAuthorizedBranches())) {
- if (authorization instanceof CloseMilestoneAuthorization) {
- CloseMilestoneAuthorization closeMilestoneAuthorization = (CloseMilestoneAuthorization) authorization;
- String milestoneNames = closeMilestoneAuthorization.getMilestoneNames();
- if (milestoneNames == null || WildcardUtils.matchPath(milestoneNames, milestoneName))
- return true;
- }
- }
- }
- return false;
+ public boolean canCreateTag(String accessTokenSecret, String tagName) {
+ return SecurityUtils.canCreateTag(getUser(accessTokenSecret), getProject(), tagName);
+ }
+
+ private User getUser(String accessTokenSecret) {
+ String accessToken = getJobAuthorizationContext().getSecretValue(accessTokenSecret);
+ User user = OneDev.getInstance(UserManager.class).findByAccessToken(accessToken);
+ if (user == null)
+ throw new ExplicitException("No user found with specified access token");
+ return user;
+ }
+
+ public boolean canCloseMilestone(String accessTokenSecret, String milestoneName) {
+ return SecurityUtils.canManageIssues(getUser(accessTokenSecret), getProject());
}
public boolean isValid() {
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildParam.java b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
index 35c1828877..cd039193f2 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildParam.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildParam.java
@@ -13,7 +13,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import io.onedev.server.model.support.inputspec.textinput.TextInput;
+import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;
/**
* @author robin
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index e98432735b..75760fc662 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -18,7 +18,7 @@ import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.ProjectBelonging;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.search.entity.SortField;
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueField.java b/server-core/src/main/java/io/onedev/server/model/IssueField.java
index 62363e5879..351e125d64 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueField.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueField.java
@@ -15,7 +15,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import io.onedev.server.model.support.inputspec.textinput.TextInput;
+import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;
@Entity
@Table(
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.java
index 75c6ce8e14..237da90838 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
@@ -22,7 +22,6 @@ import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.support.*;
import io.onedev.server.model.support.build.*;
-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.model.support.code.FileProtection;
import io.onedev.server.model.support.code.GitPackConfig;
@@ -78,6 +77,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import static io.onedev.server.model.Project.PROP_NAME;
+import static io.onedev.server.util.match.WildcardUtils.matchPath;
@Entity
@Table(
@@ -350,6 +350,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
private transient Map<ObjectId, Collection<Build>> buildsCache;
+ private transient Map<ObjectId, Collection<String>> reachableBranchesCache;
+
@Editable(order=100)
@ProjectName
@NotEmpty
@@ -958,13 +960,6 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
return jobProperties;
}
- public List<ActionAuthorization> getHierarchyActionAuthorizations() {
- List<ActionAuthorization> actionAuthorizations = new ArrayList<>(getBuildSetting().getActionAuthorizations());
- if (getParent() != null)
- actionAuthorizations.addAll(getParent().getHierarchyActionAuthorizations());
- return actionAuthorizations;
- }
-
public List<DefaultFixedIssueFilter> getHierarchyDefaultFixedIssueFilters() {
List<DefaultFixedIssueFilter> defaultFixedIssueFilters = new ArrayList<>(getBuildSetting().getDefaultFixedIssueFilters());
if (getParent() != null)
@@ -1169,7 +1164,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
Set<String> jobNames = new HashSet<>();
List<FileProtection> fileProtections = new ArrayList<>();
- ReviewRequirement reviewRequirement = ReviewRequirement.parse(null, true);
+ ReviewRequirement reviewRequirement = ReviewRequirement.parse(null);
for (BranchProtection protection: getHierarchyBranchProtections()) {
if (protection.isEnabled()
&& UserMatch.parse(protection.getUserMatch()).matches(this, user)
@@ -1331,24 +1326,38 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
return null;
}
- public boolean isCommitOnBranches(@Nullable ObjectId commitId, String branches) {
- Matcher matcher = new PathMatcher();
- if (commitId != null) {
+ private Collection<String> getReachableBranches(ObjectId commitId) {
+ if (reachableBranchesCache == null)
+ reachableBranchesCache = new HashMap<>();
+ Collection<String> reachableBranches = reachableBranchesCache.get(commitId);
+ if (reachableBranches == null) {
+ reachableBranches = new HashSet<>();
+
CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
Collection<ObjectId> descendants = commitInfoManager.getDescendants(
getId(), Sets.newHashSet(commitId));
descendants.add(commitId);
-
- PatternSet branchPatterns = PatternSet.parse(branches);
- for (RefFacade ref: getBranchRefs()) {
- String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getName()));
- if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))
- return true;
+
+ for (RefFacade ref : getBranchRefs()) {
+ if (descendants.contains(ref.getPeeledObj()))
+ reachableBranches.add(Preconditions.checkNotNull(GitUtils.ref2branch(ref.getName())));
}
- return false;
- } else {
- return PatternSet.parse(branches).matches(matcher, "main");
+ reachableBranchesCache.put(commitId, reachableBranches);
}
+ return reachableBranches;
+ }
+
+ public boolean isCommitOnBranches(@Nullable ObjectId commitId, PatternSet branches) {
+ Matcher matcher = new PathMatcher();
+ if (commitId != null)
+ return getReachableBranches(commitId).stream().anyMatch(it->branches.matches(matcher, it));
+ else
+ return branches.matches(matcher, "main");
+
+ }
+
+ public boolean isCommitOnBranch(ObjectId commitId, String branch) {
+ return getReachableBranches(commitId).stream().anyMatch(it->matchPath(branch, it));
}
public boolean isReviewRequiredForModification(User user, String branch, @Nullable String 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 1e826e8f20..584ae55c4b 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
@@ -1,29 +1,6 @@
package io.onedev.server.model;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Lob;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.NotNull;
-
-import org.apache.shiro.authz.Permission;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import javax.validation.constraints.NotEmpty;
-
import com.google.common.collect.Lists;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -32,32 +9,24 @@ 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.security.SecurityUtils;
-import io.onedev.server.security.permission.AccessBuild;
-import io.onedev.server.security.permission.AccessBuildLog;
-import io.onedev.server.security.permission.AccessBuildReports;
-import io.onedev.server.security.permission.AccessConfidentialIssues;
-import io.onedev.server.security.permission.AccessProject;
-import io.onedev.server.security.permission.CreateChildren;
-import io.onedev.server.security.permission.EditIssueField;
-import io.onedev.server.security.permission.EditIssueLink;
-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;
-import io.onedev.server.security.permission.ManageProject;
-import io.onedev.server.security.permission.ManagePullRequests;
-import io.onedev.server.security.permission.ReadCode;
-import io.onedev.server.security.permission.RunJob;
-import io.onedev.server.security.permission.ScheduleIssues;
-import io.onedev.server.security.permission.WriteCode;
+import io.onedev.server.security.permission.*;
import io.onedev.server.util.EditContext;
+import io.onedev.server.util.facade.RoleFacade;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.util.validation.annotation.RoleName;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.ShowCondition;
+import org.apache.shiro.authz.Permission;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import javax.persistence.*;
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.*;
/**
* @author robin
@@ -333,6 +302,11 @@ public class Role extends AbstractEntity implements Permission, Validatable {
this.linkAuthorizations = linkAuthorizations;
}
+ @Override
+ public RoleFacade getFacade() {
+ return new RoleFacade(getId(), getName());
+ }
+
@Override
public boolean implies(Permission p) {
for (Permission each: getPermissions()) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index eb885dc9ad..960f16ee82 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -19,10 +19,10 @@ import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;
-import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.Choice;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
+import io.onedev.server.buildspecmodel.inputspec.showcondition.ValueIsOneOf;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.IssueTemplate;
import io.onedev.server.model.support.issue.NamedIssueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
index 29bae8cf9f..b4ef3b94d4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
@@ -1,27 +1,18 @@
package io.onedev.server.model.support.administration;
-import java.io.Serializable;
-import java.util.List;
-
-import javax.validation.constraints.Size;
-
-import javax.validation.constraints.NotEmpty;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
+import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.util.script.identity.JobIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.SiteAdministrator;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.util.validation.annotation.Code;
import io.onedev.server.util.validation.annotation.RegEx;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.editable.annotation.JobMatch;
import io.onedev.server.web.editable.annotation.ShowCondition;
-import io.onedev.server.web.util.SuggestionUtils;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
@Editable
public class GroovyScript implements Serializable {
@@ -36,9 +27,7 @@ public class GroovyScript implements Serializable {
private boolean canBeUsedByBuildJobs = true;
- private String allowedProjects;
-
- private String allowedBranches;
+ private String authorization;
@Editable(order=100)
@RegEx(pattern="^(?!" + BUILTIN_PREFIX + ").*$", message="Name is not allowed to start with '" + BUILTIN_PREFIX + "'")
@@ -75,59 +64,84 @@ public class GroovyScript implements Serializable {
private static boolean isCanBeUsedByBuildJobsEnabled() {
return (boolean) EditContext.get().getInputValue("canBeUsedByBuildJobs");
}
-
- @Editable(order=400, placeholder="All", description="Optionally specify space-separated projects allowed to "
- + "execute this script. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude. "
- + "Leave empty to allow all")
- @Patterns(suggester="suggestProjects", path=true)
- @ShowCondition("isCanBeUsedByBuildJobsEnabled")
- public String getAllowedProjects() {
- return allowedProjects;
- }
- public void setAllowedProjects(String allowedProjects) {
- this.allowedProjects = allowedProjects;
- }
-
- @Editable(order=500, placeholder="All", description="Optionally specify space-separated branches allowed to "
- + "execute this script. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to allow all")
- @Patterns(path=true)
+ @Editable(order=500, placeholder="Any job", description="Optionally specify jobs allowed to use this script")
@ShowCondition("isCanBeUsedByBuildJobsEnabled")
- public String getAllowedBranches() {
- return allowedBranches;
+ @JobMatch(withProjectCriteria = true)
+ public String getAuthorization() {
+ return authorization;
}
- public void setAllowedBranches(String allowedBranches) {
- this.allowedBranches = allowedBranches;
+ public void setAuthorization(String authorization) {
+ this.authorization = authorization;
}
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestProjects(String matchWith) {
- return SuggestionUtils.suggestProjectPaths(matchWith);
- }
-
- public final boolean isAuthorized(ScriptIdentity identity) {
- if (identity instanceof SiteAdministrator) {
+ public final boolean isAuthorized() {
+ JobAuthorizationContext jobAuthorizationContext = JobAuthorizationContext.get();
+ if (jobAuthorizationContext != null)
+ return canBeUsedByBuildJobs && jobAuthorizationContext.isScriptAuthorized(this);
+ else
return true;
- } else if (isCanBeUsedByBuildJobs() && identity instanceof JobIdentity) {
- JobIdentity jobIdentity = (JobIdentity) identity;
- return (getAllowedProjects() == null || PatternSet.parse(getAllowedProjects()).matches(new PathMatcher(), jobIdentity.getProject().getPath()))
- && (getAllowedBranches() == null || jobIdentity.getProject().isCommitOnBranches(jobIdentity.getCommitId(), getAllowedBranches()));
- } else {
- return false;
- }
}
public Usage onDeleteProject(String projectPath) {
Usage usage = new Usage();
- if (Project.containsPath(getAllowedProjects(), projectPath))
- usage.add("allowed projects");
+ if (authorization != null && io.onedev.server.job.match.JobMatch.parse(authorization, true, false).isUsingProject(projectPath))
+ usage.add("authorization");
return usage;
}
public void onMoveProject(String oldPath, String newPath) {
- setAllowedProjects(Project.substitutePath(getAllowedProjects(), oldPath, newPath));
+ if (authorization != null) {
+ var jobMatch = io.onedev.server.job.match.JobMatch.parse(authorization, true, false);
+ jobMatch.onMoveProject(oldPath, newPath);
+ authorization = jobMatch.toString();
+ }
}
+ public Usage onDeleteUser(String userName) {
+ Usage usage = new Usage();
+ if (authorization != null && io.onedev.server.job.match.JobMatch.parse(authorization, true, false).isUsingUser(userName))
+ usage.add("authorization");
+ return usage;
+ }
+
+ public void onRenameUser(String oldName, String newName) {
+ if (authorization != null) {
+ var jobMatch = io.onedev.server.job.match.JobMatch.parse(authorization, true, false);
+ jobMatch.onRenameUser(oldName, newName);
+ authorization = jobMatch.toString();
+ }
+ }
+
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
+ if (authorization != null && io.onedev.server.job.match.JobMatch.parse(authorization, true, false).isUsingGroup(groupName))
+ usage.add("authorization");
+ return usage;
+ }
+
+ public void onRenameGroup(String oldName, String newName) {
+ if (authorization != null) {
+ var jobMatch = io.onedev.server.job.match.JobMatch.parse(authorization, true, false);
+ jobMatch.onRenameGroup(oldName, newName);
+ authorization = jobMatch.toString();
+ }
+ }
+
+ public Usage onDeleteRole(String roleName) {
+ Usage usage = new Usage();
+ if (authorization != null && io.onedev.server.job.match.JobMatch.parse(authorization, true, false).isUsingRole(roleName))
+ usage.add("authorization");
+ return usage;
+ }
+
+ public void onRenameRole(String oldName, String newName) {
+ if (authorization != null) {
+ var jobMatch = io.onedev.server.job.match.JobMatch.parse(authorization, true, false);
+ jobMatch.onRenameRole(oldName, newName);
+ authorization = jobMatch.toString();
+ }
+ }
+
}
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 ddb70c4d52..4a3aab7aa4 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
@@ -9,6 +9,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.build.BuildRunning;
import io.onedev.server.job.JobContext;
+import io.onedev.server.job.match.JobMatch;
import io.onedev.server.model.Build;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.terminal.TerminalManager;
@@ -16,7 +17,6 @@ import io.onedev.server.util.ExceptionUtils;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.util.validation.annotation.DnsName;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.JobAuthorization;
import io.onedev.server.web.editable.annotation.ShowCondition;
import javax.annotation.Nullable;
@@ -35,7 +35,7 @@ public abstract class JobExecutor implements Serializable {
private String name;
- private String jobAuthorization;
+ private String jobRequirement;
private boolean shellAccessEnabled;
@@ -64,7 +64,7 @@ public abstract class JobExecutor implements Serializable {
@Editable(order=20, description="Enable this to allow project managers to open web terminal to running builds. "
+ "<b class='text-danger'>WARNING</b>: Users with shell access can take control of the node used by "
- + "the executor. You should configure job authorization below to make sure the executor can only be "
+ + "the executor. You should configure job requirement below to make sure the executor can only be "
+ "used by trusted jobs if this option is enabled")
@ShowCondition("isTerminalSupported")
public boolean isShellAccessEnabled() {
@@ -90,16 +90,15 @@ public abstract class JobExecutor implements Serializable {
return OneDev.getInstance(TerminalManager.class).isTerminalSupported();
}
- @Editable(order=10000, placeholder="Can be used by any jobs",
- description="Optionally specify jobs authorized to use this executor")
- @JobAuthorization
+ @Editable(order=10000, placeholder="Any job", description="Optionally specify job requirement of this executor")
+ @io.onedev.server.web.editable.annotation.JobMatch(withProjectCriteria = true, withJobCriteria = true)
@Nullable
- public String getJobAuthorization() {
- return jobAuthorization;
+ public String getJobRequirement() {
+ return jobRequirement;
}
- public void setJobAuthorization(String jobAuthorization) {
- this.jobAuthorization = jobAuthorization;
+ public void setJobRequirement(String jobRequirement) {
+ this.jobRequirement = jobRequirement;
}
@Editable(order=50000, group="More Settings", description="Specify job cache TTL (time to live) by days. "
@@ -122,37 +121,65 @@ public abstract class JobExecutor implements Serializable {
public Usage onDeleteProject(String projectPath) {
Usage usage = new Usage();
- if (jobAuthorization != null
- && io.onedev.server.job.authorization.JobAuthorization.parse(jobAuthorization).isUsingProject(projectPath)) {
+ if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingProject(projectPath)) {
usage.add("job requirement" );
}
return usage;
}
public void onMoveProject(String oldPath, String newPath) {
- if (jobAuthorization != null) {
- io.onedev.server.job.authorization.JobAuthorization parsedJobAuthorization =
- io.onedev.server.job.authorization.JobAuthorization.parse(jobAuthorization);
- parsedJobAuthorization.onMoveProject(oldPath, newPath);
- jobAuthorization = parsedJobAuthorization.toString();
+ if (jobRequirement != null) {
+ JobMatch jobMatch = JobMatch.parse(jobRequirement, true, true);
+ jobMatch.onMoveProject(oldPath, newPath);
+ jobRequirement = jobMatch.toString();
}
}
public Usage onDeleteUser(String userName) {
Usage usage = new Usage();
- if (jobAuthorization != null
- && io.onedev.server.job.authorization.JobAuthorization.parse(jobAuthorization).isUsingUser(userName)) {
- usage.add("job authorization" );
+ if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingUser(userName)) {
+ usage.add("job requirement");
}
return usage;
}
public void onRenameUser(String oldName, String newName) {
- if (jobAuthorization != null) {
- io.onedev.server.job.authorization.JobAuthorization parsedJobAuthorization =
- io.onedev.server.job.authorization.JobAuthorization.parse(jobAuthorization);
- parsedJobAuthorization.onRenameUser(oldName, newName);
- jobAuthorization = parsedJobAuthorization.toString();
+ if (jobRequirement != null) {
+ JobMatch jobMatch = JobMatch.parse(jobRequirement, true, true);
+ jobMatch.onRenameUser(oldName, newName);
+ jobRequirement = jobMatch.toString();
+ }
+ }
+
+ public Usage onDeleteGroup(String groupName) {
+ Usage usage = new Usage();
+ if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingGroup(groupName)) {
+ usage.add("job requirement");
+ }
+ return usage;
+ }
+
+ public void onRenameGroup(String oldName, String newName) {
+ if (jobRequirement != null) {
+ JobMatch jobMatch = JobMatch.parse(jobRequirement, true, true);
+ jobMatch.onRenameGroup(oldName, newName);
+ jobRequirement = jobMatch.toString();
+ }
+ }
+
+ public Usage onDeleteRole(String roleName) {
+ Usage usage = new Usage();
+ if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingRole(roleName)) {
+ usage.add("job requirement");
+ }
+ return usage;
+ }
+
+ public void onRenameRole(String oldName, String newName) {
+ if (jobRequirement != null) {
+ JobMatch jobMatch = JobMatch.parse(jobRequirement, true, true);
+ jobMatch.onRenameRole(oldName, newName);
+ jobRequirement = jobMatch.toString();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java
index a2489977b4..43b7bb0bed 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java
@@ -1,18 +1,12 @@
package io.onedev.server.model.support.build;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.constraints.NotEmpty;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
import io.onedev.server.util.validation.annotation.SecretName;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.JobMatch;
import io.onedev.server.web.editable.annotation.Multiline;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.util.SuggestionUtils;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
@Editable
public class JobSecret implements Serializable {
@@ -23,7 +17,7 @@ public class JobSecret implements Serializable {
private String value;
- private String authorizedBranches;
+ private String authorization;
@Editable(order=100)
@NotEmpty
@@ -47,27 +41,15 @@ public class JobSecret implements Serializable {
this.value = value;
}
- @Editable(order=300, placeholder="All", description=""
- + "Optionally specify space-separated branches to authorize.\n"
- + "Only builds from authorized branches can access this secret.\n"
- + "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to authorize all branches")
- @Patterns(suggester = "suggestBranches", path=true)
- public String getAuthorizedBranches() {
- return authorizedBranches;
+ @Editable(order=300, placeholder="All Branches", description=
+ "Optionally specify branches/roles allowed to access this secret")
+ @JobMatch(withProjectCriteria = true)
+ public String getAuthorization() {
+ return authorization;
}
- public void setAuthorizedBranches(String authorizedBranches) {
- this.authorizedBranches = authorizedBranches;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestBranches(String matchWith) {
- Project project = Project.get();
- if (project != null)
- return SuggestionUtils.suggestBranches(project, matchWith);
- else
- return new ArrayList<>();
+ public void setAuthorization(String authorization) {
+ this.authorization = authorization;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
index c31dd657b9..10594a185c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
@@ -1,22 +1,9 @@
package io.onedev.server.model.support.build;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.job.match.JobMatch;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
-import io.onedev.server.model.support.build.actionauthorization.CloseMilestoneAuthorization;
-import io.onedev.server.model.support.build.actionauthorization.CreateTagAuthorization;
import io.onedev.server.search.entity.issue.IssueQueryUpdater;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
@@ -25,6 +12,10 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValu
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
import io.onedev.server.web.editable.annotation.Editable;
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.*;
+
@Editable
public class ProjectBuildSetting implements Serializable {
@@ -40,17 +31,10 @@ public class ProjectBuildSetting implements Serializable {
private List<BuildPreservation> buildPreservations = new ArrayList<>();
- private List<ActionAuthorization> actionAuthorizations = new ArrayList<>();
-
private List<DefaultFixedIssueFilter> defaultFixedIssueFilters = new ArrayList<>();
private transient GlobalBuildSetting globalSetting;
- public ProjectBuildSetting() {
- actionAuthorizations.add(new CloseMilestoneAuthorization());
- actionAuthorizations.add(new CreateTagAuthorization());
- }
-
public List<JobProperty> getJobProperties() {
return jobProperties;
}
@@ -75,14 +59,6 @@ public class ProjectBuildSetting implements Serializable {
this.buildPreservations = buildPreservations;
}
- public List<ActionAuthorization> getActionAuthorizations() {
- return actionAuthorizations;
- }
-
- public void setActionAuthorizations(List<ActionAuthorization> actionAuthorizations) {
- this.actionAuthorizations = actionAuthorizations;
- }
-
public List<DefaultFixedIssueFilter> getDefaultFixedIssueFilters() {
return defaultFixedIssueFilters;
}
@@ -194,4 +170,48 @@ public class ProjectBuildSetting implements Serializable {
}
}
+ public void onRenameGroup(String oldName, String newName) {
+ for (var jobSecret: getJobSecrets()) {
+ if (jobSecret.getAuthorization() != null) {
+ JobMatch jobMatch = JobMatch.parse(jobSecret.getAuthorization(), false, false);
+ jobMatch.onRenameGroup(oldName, newName);
+ jobSecret.setAuthorization(jobMatch.toString());
+ }
+ }
+ }
+
+ public Usage onDeleteGroup(String name) {
+ Usage usage = new Usage();
+ for (var jobSecret: getJobSecrets()) {
+ if (jobSecret.getAuthorization() != null) {
+ JobMatch jobMatch = JobMatch.parse(jobSecret.getAuthorization(), false, false);
+ if (jobMatch.isUsingGroup(name))
+ usage.add("job secret '" + jobSecret.getName() + "': authorization");
+ }
+ }
+ return usage.prefix("build");
+ }
+
+ public void onRenameUser(String oldName, String newName) {
+ for (var jobSecret: getJobSecrets()) {
+ if (jobSecret.getAuthorization() != null) {
+ JobMatch jobMatch = JobMatch.parse(jobSecret.getAuthorization(), false, false);
+ jobMatch.onRenameUser(oldName, newName);
+ jobSecret.setAuthorization(jobMatch.toString());
+ }
+ }
+ }
+
+ public Usage onDeleteUser(String name) {
+ Usage usage = new Usage();
+ for (var jobSecret: getJobSecrets()) {
+ if (jobSecret.getAuthorization() != null) {
+ JobMatch jobMatch = JobMatch.parse(jobSecret.getAuthorization(), false, false);
+ if (jobMatch.isUsingUser(name))
+ usage.add("job secret '" + jobSecret.getName() + "': authorization");
+ }
+ }
+ return usage.prefix("build");
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
deleted file mode 100644
index e3a8343676..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.onedev.server.model.support.build.actionauthorization;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.util.SuggestionUtils;
-
-@Editable
-public abstract class ActionAuthorization implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String authorizedBranches;
-
- @Editable(order=1000, placeholder="All", description="Action is allowed only if build runs on "
- + "specified branches. Multiple branches should be separated with space. "
- + "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to match all")
- @Patterns(suggester = "suggestBranches", path=true)
- public String getAuthorizedBranches() {
- return authorizedBranches;
- }
-
- public void setAuthorizedBranches(String authorizedBranches) {
- this.authorizedBranches = authorizedBranches;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestBranches(String matchWith) {
- Project project = Project.get();
- if (project != null)
- return SuggestionUtils.suggestBranches(project, matchWith);
- else
- return new ArrayList<>();
- }
-
- public abstract String getActionDescription();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
deleted file mode 100644
index aea89c35bf..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.onedev.server.model.support.build.actionauthorization;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.util.SuggestionUtils;
-
-@Editable(order=200, name="Close milestone")
-public class CloseMilestoneAuthorization extends ActionAuthorization {
-
- private static final long serialVersionUID = 1L;
-
- private String milestoneNames;
-
- @Editable(order=100, placeholder="All", description="Specify space-separated milestone names. "
- + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. Leave empty to match all")
- @Patterns(suggester = "suggestMilestones")
- public String getMilestoneNames() {
- return milestoneNames;
- }
-
- public void setMilestoneNames(String milestoneNames) {
- this.milestoneNames = milestoneNames;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestMilestones(String matchWith) {
- if (Project.get() != null)
- return SuggestionUtils.suggestMilestones(Project.get(), matchWith);
- else
- return new ArrayList<>();
- }
-
- @Override
- public String getActionDescription() {
- if (milestoneNames != null)
- return "Close milestone with name matching '" + milestoneNames + "'";
- else
- return "Close milestone";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
deleted file mode 100644
index df25e5dc31..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.onedev.server.model.support.build.actionauthorization;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.util.SuggestionUtils;
-
-@Editable(order=20, name="Create tag")
-public class CreateTagAuthorization extends ActionAuthorization {
-
- private static final long serialVersionUID = 1L;
-
- private String tagNames;
-
- @Editable(order=100, placeholder="All", description="Specify space-separated tag names. "
- + "Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty to match all")
- @Patterns(suggester = "suggestTags", path=true)
- public String getTagNames() {
- return tagNames;
- }
-
- public void setTagNames(String tagNames) {
- this.tagNames = tagNames;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestTags(String matchWith) {
- if (Project.get() != null)
- return SuggestionUtils.suggestTags(Project.get(), matchWith);
- else
- return new ArrayList<>();
- }
-
- @Override
- public String getActionDescription() {
- if (tagNames != null)
- return "Create tag with name matching '" + tagNames + "'";
- else
- return "Create tag";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
index dbb2ee14ae..3afa3c9a44 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/BranchProtection.java
@@ -1,15 +1,5 @@
package io.onedev.server.model.support.code;
-import java.io.Serializable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.validation.Valid;
-
-import org.eclipse.jgit.lib.ObjectId;
-import javax.validation.constraints.NotEmpty;
-
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
@@ -29,6 +19,14 @@ import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.JobChoice;
import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.util.SuggestionUtils;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.*;
+import java.util.stream.Collectors;
@Editable
@Horizontal
@@ -145,7 +143,7 @@ public class BranchProtection implements Serializable {
public ReviewRequirement getParsedReviewRequirement() {
if (parsedReviewRequirement == null)
- parsedReviewRequirement = ReviewRequirement.parse(reviewRequirement, true);
+ parsedReviewRequirement = ReviewRequirement.parse(reviewRequirement);
return parsedReviewRequirement;
}
@@ -188,7 +186,7 @@ public class BranchProtection implements Serializable {
public FileProtection getFileProtection(String file) {
Set<String> jobNames = new HashSet<>();
- ReviewRequirement reviewRequirement = ReviewRequirement.parse(null, true);
+ ReviewRequirement reviewRequirement = ReviewRequirement.parse(null);
for (FileProtection protection: fileProtections) {
if (PatternSet.parse(protection.getPaths()).matches(new PathMatcher(), file)) {
jobNames.addAll(protection.getJobNames());
@@ -224,7 +222,7 @@ public class BranchProtection implements Serializable {
break;
}
}
- return usage.prefix("branch protection '" + getBranches() + "'");
+ return usage.prefix("code: branch protection '" + getBranches() + "'");
}
public void onRenameUser(String oldName, String newName) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.java
index b468519512..a1c107edde 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/FileProtection.java
@@ -65,7 +65,7 @@ public class FileProtection implements Serializable, Validatable {
public ReviewRequirement getParsedReviewRequirement() {
if (parsedReviewRequirement == null)
- parsedReviewRequirement = ReviewRequirement.parse(reviewRequirement, true);
+ parsedReviewRequirement = ReviewRequirement.parse(reviewRequirement);
return parsedReviewRequirement;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java
index 46fbd5abfc..43df6b556f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/code/TagProtection.java
@@ -1,11 +1,5 @@
package io.onedev.server.model.support.code;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.constraints.NotEmpty;
-
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.model.Project;
import io.onedev.server.util.patternset.PatternSet;
@@ -17,6 +11,11 @@ import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.util.SuggestionUtils;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
@Editable
@Horizontal
public class TagProtection implements Serializable {
@@ -126,7 +125,7 @@ public class TagProtection implements Serializable {
Usage usage = new Usage();
if (UserMatch.isUsingGroup(userMatch, groupName))
usage.add("applicable users");
- return usage.prefix("tag protection '" + getTags() + "'");
+ return usage.prefix("code: tag protection '" + getTags() + "'");
}
public void onRenameUser(String oldName, String newName) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index 6b32ae792a..fdf6f1368c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -24,7 +24,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
index 54d4f8ad54..62b7c9ce34 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
@@ -96,7 +96,7 @@ public class ProjectIssueSetting implements Serializable {
it.remove();
}
}
- return usage.prefix("issue settings");
+ return usage.prefix("issue boards");
}
private Collection<IssueQueryUpdater> getNamedQueryUpdaters() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
index bfb2882d50..0ea3780780 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/FieldUtils.java
@@ -23,9 +23,9 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.SecretField;
import io.onedev.server.model.support.issue.field.supply.FieldSupply;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java
index 4744a2c191..c2a194cfad 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BooleanField.java
@@ -6,9 +6,9 @@ import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.inputspec.booleaninput.BooleanInput;
-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;
+import io.onedev.server.buildspecmodel.inputspec.booleaninput.BooleanInput;
+import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.booleaninput.defaultvalueprovider.FalseDefaultValue;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=300, name=FieldSpec.BOOLEAN)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java
index 714b2df371..afafe1e9c9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/BuildChoiceField.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.BuildChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.BuildChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1200, name=FieldSpec.BUILD)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java
index 1a20cf594d..9bc168228d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/CommitField.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.CommitInput;
+import io.onedev.server.buildspecmodel.inputspec.CommitInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1400, name=FieldSpec.COMMIT)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java
index 2a68bbd8a2..7cb1c5d14b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.dateinput.DateInput;
-import io.onedev.server.model.support.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.dateinput.DateInput;
+import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.Constants;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java
index 930ff35099..7fd39537d2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.datetimeinput.DateTimeInput;
-import io.onedev.server.model.support.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.datetimeinput.DateTimeInput;
+import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.Constants;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
index f2d7065f24..3be5a15736 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FieldSpec.java
@@ -1,379 +1,365 @@
-package io.onedev.server.model.support.issue.field.spec;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.validation.Valid;
-
-import org.apache.wicket.MarkupContainer;
-import javax.validation.constraints.NotEmpty;
-
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
-import io.onedev.server.model.support.inputspec.showcondition.ShowCondition;
-import io.onedev.server.model.support.inputspec.showcondition.ValueIsNotAnyOf;
-import io.onedev.server.model.support.inputspec.showcondition.ValueIsOneOf;
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.util.EditContext;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.util.script.identity.SiteAdministrator;
-import io.onedev.server.util.usage.Usage;
-import io.onedev.server.util.validation.annotation.FieldName;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.util.SuggestionUtils;
-
-@Editable
-public abstract class FieldSpec extends InputSpec {
-
- private static final long serialVersionUID = 1L;
-
- private String nameOfEmptyValue;
-
- private boolean promptUponIssueOpen = true;
-
- private String applicableProjects;
-
- private transient Collection<String> dependencies;
-
- private transient Collection<String> dependents;
-
- @Editable(order=10)
- @FieldName
- @NotEmpty
- @Override
- public String getName() {
- return super.getName();
- }
-
- @Override
- public void setName(String name) {
- super.setName(name);
- }
-
- @Editable(order=30, placeholder="No description", description="Optionally describes the custom field")
- @Override
- public String getDescription() {
- return super.getDescription();
- }
-
- @Override
- public void setDescription(String description) {
- super.setDescription(description);
- }
-
- @Editable(order=35, description="Whether or not multiple values can be specified for this field")
- @Override
- public boolean isAllowMultiple() {
- return super.isAllowMultiple();
- }
-
- @Override
- public void setAllowMultiple(boolean allowMultiple) {
- super.setAllowMultiple(allowMultiple);
- }
-
- @Editable(order=40, name="Show Conditionally", placeholder="Always", description="Enable if visibility "
- + "of this field depends on other fields")
- @Valid
- @Override
- public ShowCondition getShowCondition() {
- return super.getShowCondition();
- }
-
- @Override
- public void setShowCondition(ShowCondition showCondition) {
- super.setShowCondition(showCondition);
- }
-
- @Editable(order=50, name="Allow Empty Value", description="Whether or not this field accepts empty value")
- @Override
- public boolean isAllowEmpty() {
- return super.isAllowEmpty();
- }
-
- @Override
- public void setAllowEmpty(boolean allowEmpty) {
- super.setAllowEmpty(allowEmpty);
- }
-
- @Editable(order=60)
- @io.onedev.server.web.editable.annotation.ShowCondition("isNameOfEmptyValueVisible")
- @NotEmpty
- public String getNameOfEmptyValue() {
- return nameOfEmptyValue;
- }
-
- public void setNameOfEmptyValue(String nameOfEmptyValue) {
- this.nameOfEmptyValue = nameOfEmptyValue;
- }
-
- @SuppressWarnings("unused")
- private static boolean isNameOfEmptyValueVisible() {
- return (boolean) EditContext.get().getInputValue("allowEmpty");
- }
-
- @Editable(order=10000, description="Whether or not to prompt this field upon issue open")
- public boolean isPromptUponIssueOpen() {
- return promptUponIssueOpen;
- }
-
- public void setPromptUponIssueOpen(boolean promptUponIssueOpen) {
- this.promptUponIssueOpen = promptUponIssueOpen;
- }
-
- @SuppressWarnings("unused")
- private static boolean isPromptUponIssueOpenEnabled() {
- return Boolean.TRUE.equals(EditContext.get().getInputValue("promptUponIssueOpen"));
- }
-
- @Editable(order=10100, placeholder="All projects", description="Specify applicable projects for above option. "
- + "Multiple projects should be separated by space. Use '**', '*' or '?' for "
- + "<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
- + "Prefix with '-' to exclude. Leave empty for all projects")
- @io.onedev.server.web.editable.annotation.ShowCondition("isPromptUponIssueOpenEnabled")
- @Patterns(suggester="suggestProjects", path=true)
- public String getApplicableProjects() {
- return applicableProjects;
- }
-
- public void setApplicableProjects(String applicableProjects) {
- this.applicableProjects = applicableProjects;
- }
-
- @SuppressWarnings("unused")
- private static List<InputSuggestion> suggestProjects(String matchWith) {
- return SuggestionUtils.suggestProjectPaths(matchWith);
- }
-
- private GlobalIssueSetting getIssueSetting() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting();
- }
-
- public Collection<String> getUndefinedFields() {
- Collection<String> undefinedFields = new HashSet<>();
- ShowCondition showCondition = getShowCondition();
- if (showCondition != null && getIssueSetting().getFieldSpec(showCondition.getInputName()) == null)
- undefinedFields.add(showCondition.getInputName());
- return undefinedFields;
- }
-
- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- ShowCondition showCondition = getShowCondition();
- if (showCondition != null) {
- FieldSpec field = getIssueSetting().getFieldSpec(showCondition.getInputName());
- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(field);
- if (specifiedChoices != null) {
- if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {
- ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();
- for (String value: valueIsOneOf.getValues()) {
- if (!specifiedChoices.getChoiceValues().contains(value))
- undefinedFieldValues.add(new UndefinedFieldValue(field.getName(), value));
- }
- } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {
- ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();
- for (String value: valueIsNotAnyOf.getValues()) {
- if (!specifiedChoices.getChoiceValues().contains(value))
- undefinedFieldValues.add(new UndefinedFieldValue(field.getName(), value));
- }
- }
- }
- }
- return undefinedFieldValues;
- }
-
- public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
- ShowCondition showCondition = getShowCondition();
- if (showCondition != null) {
- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
- if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
- if (entry.getKey().equals(showCondition.getInputName()))
- showCondition.setInputName(entry.getValue().getNewField());
- } else if (showCondition.getInputName().equals(entry.getKey())) {
- return false;
- }
- }
- }
- return true;
- }
-
- public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {
- ShowCondition showCondition = getShowCondition();
- if (showCondition != null) {
- for (Map.Entry<String, UndefinedFieldValuesResolution> resolutionEntry: resolutions.entrySet()) {
- if (showCondition.getInputName().equals(resolutionEntry.getKey())) {
- if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {
- ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();
- valueIsOneOf.getValues().removeAll(resolutionEntry.getValue().getDeletions());
- for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {
- int index = valueIsOneOf.getValues().indexOf(renameEntry.getKey());
- if (index != -1) {
- if (valueIsOneOf.getValues().contains(renameEntry.getValue()))
- valueIsOneOf.getValues().remove(index);
- else
- valueIsOneOf.getValues().set(index, renameEntry.getValue());
- }
- }
- if (valueIsOneOf.getValues().isEmpty())
- return false;
- } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {
- ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();
- valueIsNotAnyOf.getValues().removeAll(resolutionEntry.getValue().getDeletions());
- for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {
- int index = valueIsNotAnyOf.getValues().indexOf(renameEntry.getKey());
- if (index != -1) {
- if (valueIsNotAnyOf.getValues().contains(renameEntry.getValue()))
- valueIsNotAnyOf.getValues().remove(index);
- else
- valueIsNotAnyOf.getValues().set(index, renameEntry.getValue());
- }
- }
- if (valueIsNotAnyOf.getValues().isEmpty())
- return false;
- }
- }
- }
- }
- return true;
- }
-
- public void onRenameUser(String oldName, String newName) {
- }
-
- public void onRenameGroup(String oldName, String newName) {
-
- }
-
- public Usage onDeleteUser(String userName) {
- return new Usage();
- }
-
- public Usage onDeleteGroup(String groupName) {
- return new Usage();
- }
-
- public Collection<String> getDependencies() {
- if (dependencies == null) {
- dependencies = new HashSet<>();
- if (getShowCondition() != null)
- dependencies.add(getShowCondition().getInputName());
-
- class PropertyComponent extends MarkupContainer implements InputContext, EditContext, ScriptIdentityAware {
-
- private static final long serialVersionUID = 1L;
-
- public PropertyComponent() {
- super("component");
- }
-
- @Override
- public List<String> getInputNames() {
- return getIssueSetting().getFieldNames();
- }
-
- @Override
- public InputSpec getInputSpec(String inputName) {
- return getIssueSetting().getFieldSpec(inputName);
- }
-
- @Override
- public Object getInputValue(String name) {
- dependencies.add(name);
- return null;
- }
-
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new SiteAdministrator();
- }
-
- }
-
- ComponentContext.push(new ComponentContext(new PropertyComponent()));
- try {
- runScripts();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- ComponentContext.pop();
- }
- }
- return dependencies;
- }
-
- protected abstract void runScripts();
-
- public Collection<String> getTransitiveDependencies() {
- return getTransitiveDependencies(new HashSet<>());
- }
-
- private Collection<String> getTransitiveDependencies(Set<String> checkedFields) {
- Collection<String> transitiveDependencies = new HashSet<>(getDependencies());
- for (String dependency: getDependencies()) {
- if (checkedFields.add(dependency)) {
- FieldSpec dependencyField = getIssueSetting().getFieldSpec(dependency);
- if (dependencyField != null)
- transitiveDependencies.addAll(dependencyField.getTransitiveDependencies(checkedFields));
- }
- }
- return transitiveDependencies;
- }
-
- public Collection<String> getDependents() {
- if (dependents == null) {
- dependents = new HashSet<>();
- for (FieldSpec field: getIssueSetting().getFieldSpecs()) {
- if (field.getDependencies().contains(getName()))
- dependents.add(field.getName());
- }
- }
- return dependents;
- }
-
- public Collection<String> getTransitiveDependents() {
- return getTransitiveDependents(new HashSet<>());
- }
-
- private Collection<String> getTransitiveDependents(Set<String> checkedFields) {
- Collection<String> transitiveDependents = new HashSet<>(getDependents());
- for (String dependent: getDependents()) {
- if (checkedFields.add(dependent)) {
- FieldSpec dependentField = getIssueSetting().getFieldSpec(dependent);
- if (dependentField != null)
- transitiveDependents.addAll(dependentField.getTransitiveDependents(checkedFields));
- }
- }
- return transitiveDependents;
- }
-
- public void onMoveProject(String oldPath, String newPath) {
- setApplicableProjects(Project.substitutePath(getApplicableProjects(), oldPath, newPath));
- }
-
- public Usage onDeleteProject(String projectPath) {
- Usage usage = new Usage();
- if (Project.containsPath(getApplicableProjects(), projectPath))
- usage.add("applicable projects");
- onDeleteProject(usage, projectPath);
-
- return usage.prefix("custom field '" + getName() + "'");
- }
-
- protected void onDeleteProject(Usage usage, String projectPath) {
- }
-
-}
+package io.onedev.server.model.support.issue.field.spec;
+
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.administration.GlobalIssueSetting;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.showcondition.ShowCondition;
+import io.onedev.server.buildspecmodel.inputspec.showcondition.ValueIsNotAnyOf;
+import io.onedev.server.buildspecmodel.inputspec.showcondition.ValueIsOneOf;
+import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.EditContext;
+import io.onedev.server.util.usage.Usage;
+import io.onedev.server.util.validation.annotation.FieldName;
+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.util.SuggestionUtils;
+import org.apache.wicket.MarkupContainer;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.util.*;
+
+@Editable
+public abstract class FieldSpec extends InputSpec {
+
+ private static final long serialVersionUID = 1L;
+
+ private String nameOfEmptyValue;
+
+ private boolean promptUponIssueOpen = true;
+
+ private String applicableProjects;
+
+ private transient Collection<String> dependencies;
+
+ private transient Collection<String> dependents;
+
+ @Editable(order=10)
+ @FieldName
+ @NotEmpty
+ @Override
+ public String getName() {
+ return super.getName();
+ }
+
+ @Override
+ public void setName(String name) {
+ super.setName(name);
+ }
+
+ @Editable(order=30, placeholder="No description", description="Optionally describes the custom field")
+ @Override
+ public String getDescription() {
+ return super.getDescription();
+ }
+
+ @Override
+ public void setDescription(String description) {
+ super.setDescription(description);
+ }
+
+ @Editable(order=35, description="Whether or not multiple values can be specified for this field")
+ @Override
+ public boolean isAllowMultiple() {
+ return super.isAllowMultiple();
+ }
+
+ @Override
+ public void setAllowMultiple(boolean allowMultiple) {
+ super.setAllowMultiple(allowMultiple);
+ }
+
+ @Editable(order=40, name="Show Conditionally", placeholder="Always", description="Enable if visibility "
+ + "of this field depends on other fields")
+ @Valid
+ @Override
+ public ShowCondition getShowCondition() {
+ return super.getShowCondition();
+ }
+
+ @Override
+ public void setShowCondition(ShowCondition showCondition) {
+ super.setShowCondition(showCondition);
+ }
+
+ @Editable(order=50, name="Allow Empty Value", description="Whether or not this field accepts empty value")
+ @Override
+ public boolean isAllowEmpty() {
+ return super.isAllowEmpty();
+ }
+
+ @Override
+ public void setAllowEmpty(boolean allowEmpty) {
+ super.setAllowEmpty(allowEmpty);
+ }
+
+ @Editable(order=60)
+ @io.onedev.server.web.editable.annotation.ShowCondition("isNameOfEmptyValueVisible")
+ @NotEmpty
+ public String getNameOfEmptyValue() {
+ return nameOfEmptyValue;
+ }
+
+ public void setNameOfEmptyValue(String nameOfEmptyValue) {
+ this.nameOfEmptyValue = nameOfEmptyValue;
+ }
+
+ @SuppressWarnings("unused")
+ private static boolean isNameOfEmptyValueVisible() {
+ return (boolean) EditContext.get().getInputValue("allowEmpty");
+ }
+
+ @Editable(order=10000, description="Whether or not to prompt this field upon issue open")
+ public boolean isPromptUponIssueOpen() {
+ return promptUponIssueOpen;
+ }
+
+ public void setPromptUponIssueOpen(boolean promptUponIssueOpen) {
+ this.promptUponIssueOpen = promptUponIssueOpen;
+ }
+
+ @SuppressWarnings("unused")
+ private static boolean isPromptUponIssueOpenEnabled() {
+ return Boolean.TRUE.equals(EditContext.get().getInputValue("promptUponIssueOpen"));
+ }
+
+ @Editable(order=10100, placeholder="All projects", description="Specify applicable projects for above option. "
+ + "Multiple projects should be separated by space. Use '**', '*' or '?' for "
+ + "<a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty for all projects")
+ @io.onedev.server.web.editable.annotation.ShowCondition("isPromptUponIssueOpenEnabled")
+ @Patterns(suggester="suggestProjects", path=true)
+ public String getApplicableProjects() {
+ return applicableProjects;
+ }
+
+ public void setApplicableProjects(String applicableProjects) {
+ this.applicableProjects = applicableProjects;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<InputSuggestion> suggestProjects(String matchWith) {
+ return SuggestionUtils.suggestProjectPaths(matchWith);
+ }
+
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ public Collection<String> getUndefinedFields() {
+ Collection<String> undefinedFields = new HashSet<>();
+ ShowCondition showCondition = getShowCondition();
+ if (showCondition != null && getIssueSetting().getFieldSpec(showCondition.getInputName()) == null)
+ undefinedFields.add(showCondition.getInputName());
+ return undefinedFields;
+ }
+
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ ShowCondition showCondition = getShowCondition();
+ if (showCondition != null) {
+ FieldSpec field = getIssueSetting().getFieldSpec(showCondition.getInputName());
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(field);
+ if (specifiedChoices != null) {
+ if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {
+ ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();
+ for (String value: valueIsOneOf.getValues()) {
+ if (!specifiedChoices.getChoiceValues().contains(value))
+ undefinedFieldValues.add(new UndefinedFieldValue(field.getName(), value));
+ }
+ } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {
+ ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();
+ for (String value: valueIsNotAnyOf.getValues()) {
+ if (!specifiedChoices.getChoiceValues().contains(value))
+ undefinedFieldValues.add(new UndefinedFieldValue(field.getName(), value));
+ }
+ }
+ }
+ }
+ return undefinedFieldValues;
+ }
+
+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
+ ShowCondition showCondition = getShowCondition();
+ if (showCondition != null) {
+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
+ if (entry.getKey().equals(showCondition.getInputName()))
+ showCondition.setInputName(entry.getValue().getNewField());
+ } else if (showCondition.getInputName().equals(entry.getKey())) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {
+ ShowCondition showCondition = getShowCondition();
+ if (showCondition != null) {
+ for (Map.Entry<String, UndefinedFieldValuesResolution> resolutionEntry: resolutions.entrySet()) {
+ if (showCondition.getInputName().equals(resolutionEntry.getKey())) {
+ if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {
+ ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();
+ valueIsOneOf.getValues().removeAll(resolutionEntry.getValue().getDeletions());
+ for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {
+ int index = valueIsOneOf.getValues().indexOf(renameEntry.getKey());
+ if (index != -1) {
+ if (valueIsOneOf.getValues().contains(renameEntry.getValue()))
+ valueIsOneOf.getValues().remove(index);
+ else
+ valueIsOneOf.getValues().set(index, renameEntry.getValue());
+ }
+ }
+ if (valueIsOneOf.getValues().isEmpty())
+ return false;
+ } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {
+ ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();
+ valueIsNotAnyOf.getValues().removeAll(resolutionEntry.getValue().getDeletions());
+ for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {
+ int index = valueIsNotAnyOf.getValues().indexOf(renameEntry.getKey());
+ if (index != -1) {
+ if (valueIsNotAnyOf.getValues().contains(renameEntry.getValue()))
+ valueIsNotAnyOf.getValues().remove(index);
+ else
+ valueIsNotAnyOf.getValues().set(index, renameEntry.getValue());
+ }
+ }
+ if (valueIsNotAnyOf.getValues().isEmpty())
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ public void onRenameUser(String oldName, String newName) {
+ }
+
+ public void onRenameGroup(String oldName, String newName) {
+
+ }
+
+ public Usage onDeleteUser(String userName) {
+ return new Usage();
+ }
+
+ public Usage onDeleteGroup(String groupName) {
+ return new Usage();
+ }
+
+ public Collection<String> getDependencies() {
+ if (dependencies == null) {
+ dependencies = new HashSet<>();
+ if (getShowCondition() != null)
+ dependencies.add(getShowCondition().getInputName());
+
+ class PropertyComponent extends MarkupContainer implements InputContext, EditContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public PropertyComponent() {
+ super("component");
+ }
+
+ @Override
+ public List<String> getInputNames() {
+ return getIssueSetting().getFieldNames();
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return getIssueSetting().getFieldSpec(inputName);
+ }
+
+ @Override
+ public Object getInputValue(String name) {
+ dependencies.add(name);
+ return null;
+ }
+
+ }
+
+ ComponentContext.push(new ComponentContext(new PropertyComponent()));
+ try {
+ runScripts();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ ComponentContext.pop();
+ }
+ }
+ return dependencies;
+ }
+
+ protected abstract void runScripts();
+
+ public Collection<String> getTransitiveDependencies() {
+ return getTransitiveDependencies(new HashSet<>());
+ }
+
+ private Collection<String> getTransitiveDependencies(Set<String> checkedFields) {
+ Collection<String> transitiveDependencies = new HashSet<>(getDependencies());
+ for (String dependency: getDependencies()) {
+ if (checkedFields.add(dependency)) {
+ FieldSpec dependencyField = getIssueSetting().getFieldSpec(dependency);
+ if (dependencyField != null)
+ transitiveDependencies.addAll(dependencyField.getTransitiveDependencies(checkedFields));
+ }
+ }
+ return transitiveDependencies;
+ }
+
+ public Collection<String> getDependents() {
+ if (dependents == null) {
+ dependents = new HashSet<>();
+ for (FieldSpec field: getIssueSetting().getFieldSpecs()) {
+ if (field.getDependencies().contains(getName()))
+ dependents.add(field.getName());
+ }
+ }
+ return dependents;
+ }
+
+ public Collection<String> getTransitiveDependents() {
+ return getTransitiveDependents(new HashSet<>());
+ }
+
+ private Collection<String> getTransitiveDependents(Set<String> checkedFields) {
+ Collection<String> transitiveDependents = new HashSet<>(getDependents());
+ for (String dependent: getDependents()) {
+ if (checkedFields.add(dependent)) {
+ FieldSpec dependentField = getIssueSetting().getFieldSpec(dependent);
+ if (dependentField != null)
+ transitiveDependents.addAll(dependentField.getTransitiveDependents(checkedFields));
+ }
+ }
+ return transitiveDependents;
+ }
+
+ public void onMoveProject(String oldPath, String newPath) {
+ setApplicableProjects(Project.substitutePath(getApplicableProjects(), oldPath, newPath));
+ }
+
+ public Usage onDeleteProject(String projectPath) {
+ Usage usage = new Usage();
+ if (Project.containsPath(getApplicableProjects(), projectPath))
+ usage.add("applicable projects");
+ onDeleteProject(usage, projectPath);
+
+ return usage.prefix("custom field '" + getName() + "'");
+ }
+
+ protected void onDeleteProject(Usage usage, String projectPath) {
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java
index b1fed89f88..27753b9703 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/FloatField.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.floatinput.FloatInput;
-import io.onedev.server.model.support.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.floatinput.FloatInput;
+import io.onedev.server.buildspecmodel.inputspec.floatinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=450, name=FieldSpec.FLOAT)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java
index db2ada1488..0c671787d2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/GroupChoiceField.java
@@ -6,11 +6,11 @@ import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.GroupChoiceInput;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.AllGroups;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.model.support.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.GroupChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider.AllGroups;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.groupchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java
index 37781c2d7d..cdd7782f38 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IntegerField.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.integerinput.IntegerInput;
-import io.onedev.server.model.support.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.integerinput.IntegerInput;
+import io.onedev.server.buildspecmodel.inputspec.integerinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=400, name=FieldSpec.INTEGER)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java
index 4c109e3ef1..c3cf853401 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/IssueChoiceField.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.IssueChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.IssueChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1100, name=FieldSpec.ISSUE)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/MilestoneChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/MilestoneChoiceField.java
index 5a22bdcf81..89f10ec48b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/MilestoneChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/MilestoneChoiceField.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.MilestoneChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.MilestoneChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1110, name=FieldSpec.MILESTONE)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java
index 795bdd8d63..dd0408d87d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/PullRequestChoiceField.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.PullRequestChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.PullRequestChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=1000, name=FieldSpec.PULL_REQUEST)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java
index 28e7330212..b853d705f0 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/SecretField.java
@@ -3,7 +3,7 @@ package io.onedev.server.model.support.issue.field.spec;
import java.util.List;
import java.util.Map;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=500, name=FieldSpec.SECRET)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java
index 5d3f0e4768..a1c5539677 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/TextField.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.textinput.TextInput;
-import io.onedev.server.model.support.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.textinput.TextInput;
+import io.onedev.server.buildspecmodel.inputspec.textinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.web.editable.annotation.Editable;
@Editable(order=100, name=FieldSpec.TEXT)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java
index b15d167f33..54604dfe25 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/UserChoiceField.java
@@ -6,12 +6,12 @@ import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.inputspec.userchoiceinput.UserChoiceInput;
-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.AllUsers;
-import io.onedev.server.model.support.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;
-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.model.support.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.AllUsers;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java
index 91921ad279..3bd6331d36 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java
@@ -5,8 +5,8 @@ import java.util.Map;
import javax.validation.Valid;
-import io.onedev.server.model.support.inputspec.workingperiodinput.WorkingPeriodInput;
-import io.onedev.server.model.support.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;
+import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.WorkingPeriodInput;
+import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java
index 085cfeda43..0c0dd5d772 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/ChoiceField.java
@@ -7,9 +7,9 @@ import java.util.Map;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import io.onedev.server.model.support.inputspec.choiceinput.ChoiceInput;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.choicefield.defaultmultivalueprovider.DefaultMultiValueProvider;
import io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalueprovider.DefaultValueProvider;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.java
index 1cbb4d625c..139bd37190 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValue.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue.field.spec.choicefield.defaultmulti
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValueProvider.java
index 8fc72faea4..5a6a2f24bb 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultmultivalueprovider/DefaultMultiValueProvider.java
@@ -3,6 +3,6 @@ package io.onedev.server.model.support.issue.field.spec.choicefield.defaultmulti
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-public interface DefaultMultiValueProvider extends io.onedev.server.model.support.inputspec.choiceinput.DefaultMultiValueProvider {
+public interface DefaultMultiValueProvider extends io.onedev.server.buildspecmodel.inputspec.choiceinput.DefaultMultiValueProvider {
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.java
index ac0853067f..57d03a9316 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValue.java
@@ -2,7 +2,7 @@ package io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalue
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.server.OneDev;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Patterns;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValueProvider.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValueProvider.java
index 0b7e0e998c..922f00a949 100755
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValueProvider.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/choicefield/defaultvalueprovider/DefaultValueProvider.java
@@ -3,6 +3,6 @@ package io.onedev.server.model.support.issue.field.spec.choicefield.defaultvalue
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-public interface DefaultValueProvider extends io.onedev.server.model.support.inputspec.choiceinput.DefaultValueProvider {
+public interface DefaultValueProvider extends io.onedev.server.buildspecmodel.inputspec.choiceinput.DefaultValueProvider {
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java
index 046efe6cd7..85baa501e9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/FieldSupply.java
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
index dd64a239ff..14f6ca3805 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
@@ -20,7 +20,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.Role;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;
import io.onedev.server.model.support.issue.field.spec.UserChoiceField;
@@ -31,12 +31,16 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldReso
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.IssueQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Editable(order=100, name="Button is pressed")
public class PressButtonTrigger extends TransitionTrigger {
private static final long serialVersionUID = 1L;
+ private static final Logger logger = LoggerFactory.getLogger(PressButtonTrigger.class);
+
public static final String ROLE_SUBMITTER = "<Issue Submitter>";
private String buttonLabel;
@@ -185,8 +189,14 @@ public class PressButtonTrigger extends TransitionTrigger {
} else if (roleName.equals(ROLE_SUBMITTER)) {
if (user.equals(issue.getSubmitter()))
return true;
- } else if (SecurityUtils.isAuthorizedWithRole(project, roleName)) {
- return true;
+ } else {
+ Role role = OneDev.getInstance(RoleManager.class).find(roleName);
+ if (role != null) {
+ if (SecurityUtils.isAssignedRole(project, role))
+ return true;
+ } else {
+ logger.error("Undefined role: " + roleName);
+ }
}
}
return false;
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
index 825a72ff44..f4b3da1694 100644
--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
@@ -25,7 +25,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.BuildParam;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.exception.InvalidParamException;
import io.onedev.server.rest.support.RestConstants;
diff --git a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
index ae5d030cef..1057168b6c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/JobRunResource.java
@@ -1,29 +1,5 @@
package io.onedev.server.rest;
-import java.io.Serializable;
-import java.util.UUID;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.Valid;
-import javax.validation.ValidationException;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import io.onedev.server.buildspec.job.SubmitReason;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestManager;
@@ -38,6 +14,22 @@ import io.onedev.server.rest.support.JobRun;
import io.onedev.server.rest.support.JobRunOnCommit;
import io.onedev.server.rest.support.JobRunOnPullRequest;
import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.Valid;
+import javax.validation.ValidationException;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.Serializable;
+import java.util.UUID;
@Api(order=3500)
@Path("/job-runs")
@@ -71,7 +63,8 @@ public class JobRunResource {
@POST
public Long runBuild(@NotNull @Valid JobRun jobRun) {
Project project;
- SubmitReason reason;
+ String refName;
+ PullRequest request;
ObjectId commitId;
if (jobRun instanceof JobRunOnCommit) {
@@ -91,62 +84,30 @@ public class JobRunResource {
if (!gitService.isMergedInto(project, null, commitId, refCommit))
throw new ValidationException("Specified commit is not reachable from specified ref");
- reason = new SubmitReason() {
-
- @Override
- public String getRefName() {
- return jobRunOnCommit.getRefName();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return null;
- }
-
- @Override
- public String getDescription() {
- return jobRun.getReason();
- }
-
- };
+ refName = jobRunOnCommit.getRefName();
+ request = null;
} else {
JobRunOnPullRequest jobRunOnPullRequest = (JobRunOnPullRequest) jobRun;
- PullRequest pullRequest = pullRequestManager.load(jobRunOnPullRequest.getPullRequestId());
- project = pullRequest.getProject();
+ request = pullRequestManager.load(jobRunOnPullRequest.getPullRequestId());
+ refName = request.getMergeRef();
+ project = request.getProject();
- if (!SecurityUtils.canRunJob(pullRequest.getProject(), jobRun.getJobName()))
+ if (!SecurityUtils.canRunJob(request.getProject(), jobRun.getJobName()))
throw new UnauthorizedException();
- MergePreview preview = pullRequest.checkMergePreview();
+ MergePreview preview = request.checkMergePreview();
if (preview == null)
throw new ValidationException("Pull request merge preview not calculated yet");
if (preview.getMergeCommitHash() == null)
throw new ValidationException("Pull request has merge conflicts");
commitId = ObjectId.fromString(preview.getMergeCommitHash());
-
- reason = new SubmitReason() {
-
- @Override
- public String getRefName() {
- return pullRequest.getMergeRef();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return pullRequest;
- }
-
- @Override
- public String getDescription() {
- return jobRun.getReason();
- }
-
- };
}
- return jobManager.submit(project, commitId, jobRun.getJobName(),
- jobRun.getParams(), UUID.randomUUID().toString(), reason).getId();
+ Build build = jobManager.submit(project, commitId, jobRun.getJobName(),
+ jobRun.getParams(), UUID.randomUUID().toString(), refName,
+ SecurityUtils.getUser(), request, jobRun.getReason());
+ return build.getId();
}
@Api(order=200)
diff --git a/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java b/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java
index 1ccb563176..a5b0799334 100644
--- a/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/TriggerJobResource.java
@@ -1,39 +1,31 @@
package io.onedev.server.rest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.shiro.util.ThreadContext;
-import org.eclipse.jgit.revwalk.RevCommit;
-import javax.validation.constraints.NotEmpty;
-
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.buildspec.job.SubmitReason;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.job.JobManager;
+import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.exception.InvalidParamException;
import io.onedev.server.security.SecurityUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.shiro.util.ThreadContext;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotEmpty;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
@Api(order=3510, description="This resource provides an alternative way to run job by passing all parameters via url")
@Path("/trigger-job")
@@ -136,27 +128,11 @@ public class TriggerJobResource {
}
}
- SubmitReason reason = new SubmitReason() {
-
- @Override
- public String getRefName() {
- return refName;
- }
-
- @Override
- public PullRequest getPullRequest() {
- return null;
- }
-
- @Override
- public String getDescription() {
- return "Triggered via restful api";
- }
-
- };
-
- return jobManager.submit(project, commit.copy(), job,
- jobParams, UUID.randomUUID().toString(), reason).getId();
+ Build build = jobManager.submit(project, commit.copy(), job,
+ jobParams, UUID.randomUUID().toString(), refName,
+ SecurityUtils.getUser(), null,
+ "Triggered via restful api");
+ return build.getId();
} finally {
ThreadContext.unbindSubject();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index 2280b81093..4bafa4c88c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -16,7 +16,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueField;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
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 a56305bb97..f675f4ec26 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
@@ -6,7 +6,6 @@ import io.onedev.commons.loader.AppLoader;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.*;
@@ -88,9 +87,13 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canCreateTag(Project project, String tagName) {
- if (canWriteCode(project))
- return !project.getHierarchyTagProtection(tagName, getUser()).isPreventCreation();
- else
+ return canCreateTag(getUser(), project, tagName);
+ }
+
+ public static boolean canCreateTag(@Nullable User user, Project project, String tagName) {
+ if (canWriteCode(user, project))
+ return !project.getHierarchyTagProtection(tagName, user).isPreventCreation();
+ else
return false;
}
@@ -127,37 +130,34 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canScheduleIssues(Project project) {
return getSubject().isPermitted(new ProjectPermission(project, new ScheduleIssues()));
}
+
+ public static boolean isAssignedRole(Project project, Role role) {
+ return isAssignedRole(getUser(), project, role);
+ }
- public static boolean isAuthorizedWithRole(Project project, String roleName) {
- Role role = OneDev.getInstance(RoleManager.class).find(roleName);
- if (role != null) {
- User user = getUser();
- if (user != null) {
- for (UserAuthorization authorization: user.getProjectAuthorizations()) {
+ public static boolean isAssignedRole(@Nullable User user, Project project, Role role) {
+ if (user != null) {
+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {
+ Project authorizedProject = authorization.getProject();
+ if (authorization.getRole().equals(role) && authorizedProject.isSelfOrAncestorOf(project))
+ return true;
+ }
+
+ Set<Group> groups = new HashSet<>(user.getGroups());
+ Group defaultLoginGroup = OneDev.getInstance(SettingManager.class)
+ .getSecuritySetting().getDefaultLoginGroup();
+ if (defaultLoginGroup != null)
+ groups.add(defaultLoginGroup);
+
+ for (Group group: groups) {
+ for (GroupAuthorization authorization: group.getAuthorizations()) {
Project authorizedProject = authorization.getProject();
if (authorization.getRole().equals(role) && authorizedProject.isSelfOrAncestorOf(project))
return true;
}
-
- Set<Group> groups = new HashSet<>(user.getGroups());
- Group defaultLoginGroup = OneDev.getInstance(SettingManager.class)
- .getSecuritySetting().getDefaultLoginGroup();
- if (defaultLoginGroup != null)
- groups.add(defaultLoginGroup);
-
- for (Group group: groups) {
- for (GroupAuthorization authorization: group.getAuthorizations()) {
- Project authorizedProject = authorization.getProject();
- if (authorization.getRole().equals(role) && authorizedProject.isSelfOrAncestorOf(project))
- return true;
- }
- }
- }
- return role.getDefaultProjects().stream().anyMatch(it->it.isSelfOrAncestorOf(project));
- } else {
- logger.error("Undefined role: " + roleName);
- return false;
- }
+ }
+ }
+ return role.getDefaultProjects().stream().anyMatch(it->it.isSelfOrAncestorOf(project));
}
public static boolean canAccess(Project project) {
@@ -191,7 +191,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canWriteCode(Project project) {
- return getSubject().isPermitted(new ProjectPermission(project, new WriteCode()));
+ return canWriteCode(getUser(), project);
+ }
+
+ public static boolean canWriteCode(@Nullable User user, Project project) {
+ return asSubject(user).isPermitted(new ProjectPermission(project, new WriteCode()));
}
public static boolean canManage(Project project) {
@@ -199,7 +203,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canManageIssues(Project project) {
- return getSubject().isPermitted(new ProjectPermission(project, new ManageIssues()));
+ return canManageIssues(getUser(), project);
+ }
+
+ public static boolean canManageIssues(@Nullable User user, Project project) {
+ return asSubject(user).isPermitted(new ProjectPermission(project, new ManageIssues()));
}
public static boolean canManageBuilds(Project project) {
@@ -301,6 +309,13 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static Subject asAnonymous() {
return asSubject(0L);
}
+
+ public static Subject asSubject(@Nullable User user) {
+ if (user != null)
+ return asSubject(user.getId());
+ else
+ return asAnonymous();
+ }
public static void bindAsSystem() {
ThreadContext.bind(asSubject(User.SYSTEM_ID));
diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
index c7b1c5d63a..76dce4b03d 100644
--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
@@ -1,15 +1,6 @@
package io.onedev.server.util;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.collect.MapMaker;
-
import groovy.lang.Binding;
import groovy.lang.GroovyClassLoader;
import groovy.lang.Script;
@@ -19,8 +10,13 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.exception.ScriptException;
import io.onedev.server.model.support.administration.GroovyScript;
-import io.onedev.server.util.script.ScriptContribution;
-import io.onedev.server.util.script.identity.ScriptIdentity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
public class GroovyUtils {
@@ -87,7 +83,7 @@ public class GroovyUtils {
}
}
if (script != null) {
- if (script.isAuthorized(ScriptIdentity.get())) {
+ if (script.isAuthorized()) {
try {
return evalScript(StringUtils.join(script.getContent(), "\n"), variables);
} catch (Exception e) {
diff --git a/server-core/src/main/java/io/onedev/server/util/Input.java b/server-core/src/main/java/io/onedev/server/util/Input.java
index 8b9dde4d24..ab415cb524 100644
--- a/server-core/src/main/java/io/onedev/server/util/Input.java
+++ b/server-core/src/main/java/io/onedev/server/util/Input.java
@@ -13,8 +13,8 @@ import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.annotations.XStreamOmitField;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
public class Input implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java
deleted file mode 100644
index fa769bf18c..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContext.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package io.onedev.server.util;
-
-import java.util.Stack;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.support.build.JobSecret;
-import io.onedev.server.model.support.inputspec.SecretInput;
-import io.onedev.server.util.match.PathMatcher;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.util.WicketUtils;
-
-public class JobSecretAuthorizationContext {
-
- private final Project project;
-
- private final ObjectId commitId;
-
- private final PullRequest pullRequest;
-
- public JobSecretAuthorizationContext(Project project, ObjectId commitId, @Nullable PullRequest pullRequest) {
- this.project = project;
- this.commitId = commitId;
- this.pullRequest = pullRequest;
- }
-
- public Project getProject() {
- return project;
- }
-
- public ObjectId getCommitId() {
- return commitId;
- }
-
- @Nullable
- public PullRequest getPullRequest() {
- return pullRequest;
- }
-
- public boolean isOnBranches(@Nullable String branches) {
- if (branches == null)
- branches = "**";
- if (project.isCommitOnBranches(getCommitId(), branches)) {
- return true;
- } else if (pullRequest != null) {
- PatternSet patternSet = PatternSet.parse(branches);
- PathMatcher matcher = new PathMatcher();
- return project.equals(pullRequest.getSourceProject())
- && patternSet.matches(matcher, pullRequest.getTargetBranch())
- && patternSet.matches(matcher, pullRequest.getSourceBranch());
- } else {
- return false;
- }
- }
-
- public String getSecretValue(String secretName) {
- if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {
- return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());
- } else {
- for (JobSecret secret: project.getHierarchyJobSecrets()) {
- if (secret.getName().equals(secretName)) {
- if (isOnBranches(secret.getAuthorizedBranches())) {
- return secret.getValue().replace("\r\n", "\n");
- } else {
- throw new ExplicitException(String.format(
- "Job secret not authorized (project: %s, job secret: %s)",
- project.getPath(), secretName));
- }
- }
- }
- throw new ExplicitException(String.format(
- "Job secret not found (project: %s, job secret: %s)",
- project.getPath(), secretName));
- }
- }
-
- public String getSecretValue(String branchName, String secretName) {
- if (secretName.startsWith(SecretInput.LITERAL_VALUE_PREFIX)) {
- return secretName.substring(SecretInput.LITERAL_VALUE_PREFIX.length());
- } else {
- JobSecret secret = null;
- for (JobSecret each: project.getHierarchyJobSecrets()) {
- if (each.getName().equals(secretName)) {
- secret = each;
- break;
- }
- }
- if (secret == null) {
- throw new ExplicitException(String.format(
- "Job secret not found (project: %s, job secret: %s)",
- project.getPath(), secretName));
- }
-
- String authorizedBranches = secret.getAuthorizedBranches();
- if (authorizedBranches == null)
- authorizedBranches = "**";
-
- PatternSet patternSet = PatternSet.parse(authorizedBranches);
- PathMatcher matcher = new PathMatcher();
- if (!patternSet.matches(matcher, branchName)) {
- throw new ExplicitException(String.format(
- "Job secret not authorized (project: %s, job secret: %s)",
- project.getPath(), secretName));
- }
- return secret.getValue().replace("\r\n", "\n");
- }
- }
-
- private static ThreadLocal<Stack<JobSecretAuthorizationContext>> stack =
- new ThreadLocal<Stack<JobSecretAuthorizationContext>>() {
-
- @Override
- protected Stack<JobSecretAuthorizationContext> initialValue() {
- return new Stack<>();
- }
-
- };
-
- public static void push(JobSecretAuthorizationContext authorizationContext) {
- stack.get().push(authorizationContext);
- }
-
- public static void pop() {
- stack.get().pop();
- }
-
- @Nullable
- public static JobSecretAuthorizationContext get() {
- if (!stack.get().isEmpty()) {
- return stack.get().peek();
- } else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- JobSecretAuthorizationContextAware jobSecretAuthorizationContextAware = WicketUtils.findInnermost(
- componentContext.getComponent(),
- JobSecretAuthorizationContextAware.class);
- if (jobSecretAuthorizationContextAware != null)
- return jobSecretAuthorizationContextAware.getJobSecretAuthorizationContext();
- }
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContextAware.java b/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContextAware.java
deleted file mode 100644
index 8100486587..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/JobSecretAuthorizationContextAware.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.onedev.server.util;
-
-public interface JobSecretAuthorizationContextAware {
-
- JobSecretAuthorizationContext getJobSecretAuthorizationContext();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java b/server-core/src/main/java/io/onedev/server/util/ScriptContribution.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java
rename to server-core/src/main/java/io/onedev/server/util/ScriptContribution.java
index 9b9068cfd4..593caaa9a8 100644
--- a/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java
+++ b/server-core/src/main/java/io/onedev/server/util/ScriptContribution.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.script;
+package io.onedev.server.util;
import javax.annotation.Nullable;
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
index 06743de06f..0867d86cc4 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
@@ -47,6 +47,11 @@ public class AndCriteria<T> extends Criteria<T> {
criterias.stream().forEach(it->it.onRenameUser(oldName, newName));
}
+ @Override
+ public void onRenameRole(String oldName, String newName) {
+ criterias.stream().forEach(it->it.onRenameRole(oldName, newName));
+ }
+
@Override
public void onMoveProject(String oldPath, String newPath) {
criterias.stream().forEach(it->it.onMoveProject(oldPath, newPath));
@@ -67,6 +72,11 @@ public class AndCriteria<T> extends Criteria<T> {
return criterias.stream().anyMatch(it->it.isUsingUser(userName));
}
+ @Override
+ public boolean isUsingRole(String roleName) {
+ return criterias.stream().anyMatch(it->it.isUsingRole(roleName));
+ }
+
@Override
public boolean isUsingProject(String projectPath) {
return criterias.stream().anyMatch(it->it.isUsingProject(projectPath));
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
index 727d698907..30fdccde6f 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/Criteria.java
@@ -122,6 +122,9 @@ public abstract class Criteria<T> implements Serializable {
public void onRenameUser(String oldName, String newName) {
}
+ public void onRenameRole(String oldName, String newName) {
+ }
+
public void onMoveProject(String oldPath, String newPath) {
}
@@ -135,6 +138,10 @@ public abstract class Criteria<T> implements Serializable {
return false;
}
+ public boolean isUsingRole(String roleName) {
+ return false;
+ }
+
public boolean isUsingProject(String projectPath) {
return false;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
index ba73e064cb..78bc424ec8 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/NotCriteria.java
@@ -38,6 +38,11 @@ public class NotCriteria<T> extends Criteria<T> {
criteria.onRenameUser(oldName, newName);
}
+ @Override
+ public void onRenameRole(String oldName, String newName) {
+ criteria.onRenameRole(oldName, newName);
+ }
+
@Override
public void onMoveProject(String oldPath, String newPath) {
criteria.onMoveProject(oldPath, newPath);
@@ -58,6 +63,11 @@ public class NotCriteria<T> extends Criteria<T> {
return criteria.isUsingUser(userName);
}
+ @Override
+ public boolean isUsingRole(String roleName) {
+ return criteria.isUsingRole(roleName);
+ }
+
@Override
public boolean isUsingProject(String projectPath) {
return criteria.isUsingProject(projectPath);
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
index 3bb6c77501..e7d743c7cc 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
@@ -47,6 +47,11 @@ public class OrCriteria<T> extends Criteria<T> {
criterias.stream().forEach(it->it.onRenameUser(oldName, newName));
}
+ @Override
+ public void onRenameRole(String oldName, String newName) {
+ criterias.stream().forEach(it->it.onRenameRole(oldName, newName));
+ }
+
@Override
public void onMoveProject(String oldPath, String newPath) {
criterias.stream().forEach(it->it.onMoveProject(oldPath, newPath));
@@ -67,6 +72,11 @@ public class OrCriteria<T> extends Criteria<T> {
return criterias.stream().anyMatch(it->it.isUsingUser(userName));
}
+ @Override
+ public boolean isUsingRole(String roleName) {
+ return criterias.stream().anyMatch(it->it.isUsingRole(roleName));
+ }
+
@Override
public boolean isUsingProject(String projectName) {
return criterias.stream().anyMatch(it->it.isUsingProject(projectName));
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/RoleCache.java b/server-core/src/main/java/io/onedev/server/util/facade/RoleCache.java
new file mode 100644
index 0000000000..a071b7c43f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/RoleCache.java
@@ -0,0 +1,32 @@
+package io.onedev.server.util.facade;
+
+import io.onedev.server.util.MapProxy;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class RoleCache extends MapProxy<Long, RoleFacade> implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public RoleCache(Map<Long, RoleFacade> delegate) {
+ super(delegate);
+ }
+
+ @Nullable
+ public RoleFacade find(String name) {
+ for (RoleFacade facade: values()) {
+ if (name.equals(facade.getName()))
+ return facade;
+ }
+ return null;
+ }
+
+ @Override
+ public RoleCache clone() {
+ return new RoleCache(new HashMap<>(delegate));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
index bcbbfd2662..281c07b5f1 100644
--- a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
@@ -74,7 +74,7 @@ public class VariableInterpolator {
List<String> paramValues = new ArrayList<>();
for (String value: entry.getValue().getValues()) {
if (paramType.equals(ParamSpec.SECRET))
- value = build.getJobSecretAuthorizationContext().getSecretValue(value);
+ value = build.getJobAuthorizationContext().getSecretValue(value);
paramValues.add(value);
}
return StringUtils.join(paramValues, ",");
@@ -102,7 +102,7 @@ public class VariableInterpolator {
secretName = t.substring(PREFIX_SECRET.length());
else
secretName = t.substring("secrets:".length());
- return build.getJobSecretAuthorizationContext().getSecretValue(secretName);
+ return build.getJobAuthorizationContext().getSecretValue(secretName);
} else if (t.startsWith(PREFIX_SCRIPT) || t.startsWith("scripts:")) {
String scriptName;
if (t.startsWith(PREFIX_SCRIPT))
diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
index fcb9316443..214a832dd7 100644
--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4
@@ -5,9 +5,7 @@ requirement: WS* criteria (WS+ 'and' WS+ criteria)* WS* EOF;
criteria: userCriteria | groupCriteria;
userCriteria: USER Value;
-groupCriteria: GROUP Value (':' count)?;
-
-count: 'all' | DIGIT;
+groupCriteria: GROUP Value (':' DIGIT)?;
DIGIT: [1-9][0-9]*;
diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
index dab4a8e886..9ba9f056ec 100644
--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java
@@ -1,21 +1,5 @@
package io.onedev.server.util.reviewrequirement;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
@@ -24,9 +8,13 @@ import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Group;
import io.onedev.server.model.User;
-import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;
import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CriteriaContext;
import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.RequirementContext;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import javax.annotation.Nullable;
+import java.util.*;
public class ReviewRequirement {
@@ -39,7 +27,7 @@ public class ReviewRequirement {
this.groups = groups;
}
- public static ReviewRequirement parse(@Nullable String requirementString, boolean validate) {
+ public static ReviewRequirement parse(@Nullable String requirementString) {
List<User> users = new ArrayList<>();
Map<Group, Integer> groups = new LinkedHashMap<>();
@@ -70,9 +58,9 @@ public class ReviewRequirement {
if (user != null) {
if (!users.contains(user))
users.add(user);
- else if (validate)
+ else
throw new ExplicitException("User '" + userName + "' is included multiple times");
- } else if (validate) {
+ } else {
throw new ExplicitException("Unable to find user '" + userName + "'");
}
} else if (criteria.groupCriteria() != null) {
@@ -80,19 +68,15 @@ public class ReviewRequirement {
Group group = OneDev.getInstance(GroupManager.class).find(groupName);
if (group != null) {
if (!groups.containsKey(group)) {
- CountContext count = criteria.groupCriteria().count();
- if (count != null) {
- if (count.DIGIT() != null)
- groups.put(group, Integer.parseInt(count.DIGIT().getText()));
- else
- groups.put(group, 0);
- } else {
+ TerminalNode digit = criteria.groupCriteria().DIGIT();
+ if (digit != null)
+ groups.put(group, Integer.parseInt(digit.getText()));
+ else
groups.put(group, 1);
- }
- } else if (validate) {
+ } else {
throw new ExplicitException("Group '" + groupName + "' is included multiple times");
}
- } else if (validate) {
+ } else {
throw new ExplicitException("Unable to find group '" + groupName + "'");
}
}
@@ -116,7 +100,7 @@ public class ReviewRequirement {
@Nullable
public static String onRenameGroup(@Nullable String reviewRequirementString, String oldName, String newName) {
- ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);
+ ReviewRequirement reviewRequirement = parse(reviewRequirementString);
for (Group group: reviewRequirement.getGroups().keySet()) {
if (group.getName().equals(oldName))
group.setName(newName);
@@ -125,7 +109,7 @@ public class ReviewRequirement {
}
public static String onRenameUser(@Nullable String reviewRequirementString, String oldName, String newName) {
- ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);
+ ReviewRequirement reviewRequirement = parse(reviewRequirementString);
for (User user: reviewRequirement.getUsers()) {
if (user.getName().equals(oldName))
user.setName(newName);
@@ -134,7 +118,7 @@ public class ReviewRequirement {
}
public static boolean isUsingUser(@Nullable String reviewRequirementString, String userName) {
- ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);
+ ReviewRequirement reviewRequirement = parse(reviewRequirementString);
for (User user: reviewRequirement.getUsers()) {
if (user.getName().equals(userName))
return true;
@@ -143,7 +127,7 @@ public class ReviewRequirement {
}
public static boolean isUsingGroup(@Nullable String reviewRequirementString, String groupName) {
- ReviewRequirement reviewRequirement = parse(reviewRequirementString, false);
+ ReviewRequirement reviewRequirement = parse(reviewRequirementString);
for (Group group: reviewRequirement.getGroups().keySet()) {
if (group.getName().equals(groupName))
return true;
@@ -154,29 +138,28 @@ public class ReviewRequirement {
@Nullable
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- for (User user: users)
- builder.append("user(").append(StringUtils.escape(user.getName(), "()")).append(") ");
- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
+ List<String> criterias = new ArrayList<>();
+ for (var user: getUsers())
+ criterias.add("user(" + StringUtils.escape(user.getName(), "()") + ")");
+ for (var entry: getGroups().entrySet()) {
+ StringBuilder builder = new StringBuilder();
builder.append("group(").append(StringUtils.escape(entry.getKey().getName(), "()")).append(")");
- if (entry.getValue() == 0)
- builder.append(":all");
- else if (entry.getValue() != 1)
+ if (entry.getValue() != 1)
builder.append(":").append(entry.getValue());
- builder.append(" ");
+ criterias.add(builder.toString());
}
- if (builder.length() != 0)
- return builder.toString().trim();
+ if (!criterias.isEmpty())
+ return StringUtils.join(criterias, " and ");
else
return null;
}
public void mergeWith(ReviewRequirement requirement) {
- for (User user: requirement.getUsers()) {
+ for (var user: requirement.getUsers()) {
if (!users.contains(user))
users.add(user);
}
- for (Map.Entry<Group, Integer> entry: requirement.getGroups().entrySet()) {
+ for (var entry: requirement.getGroups().entrySet()) {
Integer count = groups.get(entry.getKey());
if (count == null || count < entry.getValue())
groups.put(entry.getKey(), entry.getValue());
@@ -184,9 +167,9 @@ public class ReviewRequirement {
}
public boolean covers(ReviewRequirement requirement) {
- if (users.containsAll(requirement.getUsers())
- && groups.keySet().containsAll(requirement.getGroups().keySet())) {
- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
+ if (new HashSet<>(getUsers()).containsAll(requirement.getUsers())
+ && getGroups().keySet().containsAll(requirement.getGroups().keySet())) {
+ for (var entry: getGroups().entrySet()) {
Integer count = requirement.getGroups().get(entry.getKey());
if (count != null && count > entry.getValue())
return false;
diff --git a/server-core/src/main/java/io/onedev/server/util/script/identity/JobIdentity.java b/server-core/src/main/java/io/onedev/server/util/script/identity/JobIdentity.java
deleted file mode 100644
index ef1e2005e6..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/script/identity/JobIdentity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.onedev.server.util.script.identity;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-import io.onedev.server.model.Project;
-
-public class JobIdentity implements ScriptIdentity {
-
- private final Project project;
-
- private final ObjectId commitId;
-
- public JobIdentity(Project project, @Nullable ObjectId commitId) {
- this.project = project;
- this.commitId = commitId;
- }
-
- public Project getProject() {
- return project;
- }
-
- @Nullable
- public ObjectId getCommitId() {
- return commitId;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentity.java b/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentity.java
deleted file mode 100644
index 7b7e24a4da..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.onedev.server.util.script.identity;
-
-import java.util.Stack;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.util.ComponentContext;
-import io.onedev.server.web.util.WicketUtils;
-
-public interface ScriptIdentity {
-
- static ThreadLocal<Stack<ScriptIdentity>> stack = new ThreadLocal<Stack<ScriptIdentity>>() {
-
- @Override
- protected Stack<ScriptIdentity> initialValue() {
- return new Stack<ScriptIdentity>();
- }
-
- };
-
- public static void push(ScriptIdentity scriptIdentity) {
- stack.get().push(scriptIdentity);
- }
-
- public static void pop() {
- stack.get().pop();
- }
-
- @Nullable
- public static ScriptIdentity get() {
- if (!stack.get().isEmpty()) {
- return stack.get().peek();
- } else {
- ComponentContext componentContext = ComponentContext.get();
- if (componentContext != null) {
- ScriptIdentityAware scriptIdentityAware = WicketUtils.findInnermost(componentContext.getComponent(), ScriptIdentityAware.class);
- if (scriptIdentityAware != null)
- return scriptIdentityAware.getScriptIdentity();
- }
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentityAware.java b/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentityAware.java
deleted file mode 100644
index 6c0b901a42..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/script/identity/ScriptIdentityAware.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.onedev.server.util.script.identity;
-
-import javax.annotation.Nullable;
-
-public interface ScriptIdentityAware {
-
- @Nullable
- ScriptIdentity getScriptIdentity();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/script/identity/SiteAdministrator.java b/server-core/src/main/java/io/onedev/server/util/script/identity/SiteAdministrator.java
deleted file mode 100644
index 21f9a4e9a0..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/script/identity/SiteAdministrator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package io.onedev.server.util.script.identity;
-
-public class SiteAdministrator implements ScriptIdentity {
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/GroupCriteria.java b/server-core/src/main/java/io/onedev/server/util/usermatch/GroupCriteria.java
new file mode 100644
index 0000000000..53abf06d51
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/GroupCriteria.java
@@ -0,0 +1,32 @@
+package io.onedev.server.util.usermatch;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+
+public class GroupCriteria implements UserMatchCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Group group;
+
+ public GroupCriteria(Group group) {
+ this.group = group;
+ }
+
+ public Group getGroup() {
+ return group;
+ }
+
+ @Override
+ public boolean matches(Project project, User user) {
+ return group.getMembers().contains(user);
+ }
+
+ @Override
+ public String toString() {
+ return "group(" + StringUtils.escape(group.getName(), "()") + ")";
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedGroup.java b/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedGroup.java
deleted file mode 100644
index baf7293c39..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedGroup.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.onedev.server.util.usermatch;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-
-public class SpecifiedGroup implements UserMatchCriteria {
-
- private static final long serialVersionUID = 1L;
-
- private String groupName;
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- @Override
- public boolean matches(Project project, User user) {
- GroupManager groupManager = OneDev.getInstance(GroupManager.class);
- Group group = Preconditions.checkNotNull(groupManager.find(groupName));
- return group.getMembers().contains(user);
- }
-
- @Override
- public String toString() {
- return "group(" + StringUtils.escape(groupName, "()") + ")";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedUser.java b/server-core/src/main/java/io/onedev/server/util/usermatch/UserCriteria.java
similarity index 50%
rename from server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedUser.java
rename to server-core/src/main/java/io/onedev/server/util/usermatch/UserCriteria.java
index be195c6645..12a3b3b84f 100644
--- a/server-core/src/main/java/io/onedev/server/util/usermatch/SpecifiedUser.java
+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserCriteria.java
@@ -8,30 +8,28 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-public class SpecifiedUser implements UserMatchCriteria {
+public class UserCriteria implements UserMatchCriteria {
private static final long serialVersionUID = 1L;
- private String userName;
+ private final User user;
- public String getUserName() {
- return userName;
+ public UserCriteria(User user) {
+ this.user = user;
}
-
- public void setUserName(String userName) {
- this.userName = userName;
+
+ public User getUser() {
+ return user;
}
@Override
public boolean matches(Project project, User user) {
- UserManager userManager = OneDev.getInstance(UserManager.class);
- User specifiedUser = Preconditions.checkNotNull(userManager.findByName(userName));
- return specifiedUser.equals(user);
+ return this.user.equals(user);
}
@Override
public String toString() {
- return "user(" + StringUtils.escape(userName, "()") + ")";
+ return "user(" + StringUtils.escape(user.getName(), "()") + ")";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.g4 b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.g4
index 2c255690af..f77b4a2725 100644
--- a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.g4
+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.g4
@@ -40,7 +40,11 @@ USER
GROUP
: 'group'
- ;
+ ;
+
+ROLE
+ : 'role'
+ ;
EXCEPT
: 'except'
diff --git a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java
index 5eb681f846..1c8a8152ab 100644
--- a/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java
+++ b/server-core/src/main/java/io/onedev/server/util/usermatch/UserMatch.java
@@ -1,29 +1,25 @@
package io.onedev.server.util.usermatch;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Group;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.util.usermatch.UserMatchParser.CriteriaContext;
import io.onedev.server.util.usermatch.UserMatchParser.ExceptCriteriaContext;
import io.onedev.server.util.usermatch.UserMatchParser.UserMatchContext;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
public class UserMatch implements Serializable {
@@ -63,14 +59,18 @@ public class UserMatch implements Serializable {
return new Anyone();
} else if (criteriaContext.userCriteria() != null) {
String userName = getValue(criteriaContext.userCriteria().Value());
- SpecifiedUser specifiedUser = new SpecifiedUser();
- specifiedUser.setUserName(userName);
- return specifiedUser;
+ User user = OneDev.getInstance(UserManager.class).findByName(userName);
+ if (user != null)
+ return new UserCriteria(user);
+ else
+ throw new ExplicitException("Unable to find user with login: " + userName);
} else if (criteriaContext.groupCriteria() != null) {
String groupName = getValue(criteriaContext.groupCriteria().Value());
- SpecifiedGroup specifiedGroup = new SpecifiedGroup();
- specifiedGroup.setGroupName(groupName);
- return specifiedGroup;
+ Group group = OneDev.getInstance(GroupManager.class).find(groupName);
+ if (group != null)
+ return new GroupCriteria(group);
+ else
+ throw new ExplicitException("Unable to find group: " + groupName);
} else {
throw new ExplicitException("Unrecognized user match criteria");
}
@@ -118,11 +118,11 @@ public class UserMatch implements Serializable {
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
- List<String> criteriaStrings = criterias.stream().map(it->it.toString()).collect(Collectors.toList());
+ List<String> criteriaStrings = criterias.stream().map(Object::toString).collect(Collectors.toList());
builder.append(StringUtils.join(criteriaStrings, " or "));
if (!exceptCriterias.isEmpty()) {
- List<String> exceptCriteriaStrings = exceptCriterias.stream().map(it->it.toString()).collect(Collectors.toList());
+ List<String> exceptCriteriaStrings = exceptCriterias.stream().map(Object::toString).collect(Collectors.toList());
if (builder.length() != 0)
builder.append(" ");
builder.append("except ").append(StringUtils.join(exceptCriteriaStrings, " and "));
@@ -136,10 +136,10 @@ public class UserMatch implements Serializable {
private static void onRenameGroup(List<UserMatchCriteria> criterias, String oldName, String newName) {
for (UserMatchCriteria criteria: criterias) {
- if (criteria instanceof SpecifiedGroup) {
- SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
- if (specifiedGroup.getGroupName().equals(oldName))
- specifiedGroup.setGroupName(newName);
+ if (criteria instanceof GroupCriteria) {
+ GroupCriteria groupCriteria = (GroupCriteria) criteria;
+ if (groupCriteria.getGroup().getName().equals(oldName))
+ groupCriteria.getGroup().setName(newName);
}
}
}
@@ -150,13 +150,13 @@ public class UserMatch implements Serializable {
onRenameGroup(userMatch.getExceptCriterias(), oldName, newName);
return userMatch.toString();
}
-
+
private static void onRenameUser(List<UserMatchCriteria> criterias, String oldName, String newName) {
for (UserMatchCriteria criteria: criterias) {
- if (criteria instanceof SpecifiedUser) {
- SpecifiedUser specifiedUser = (SpecifiedUser) criteria;
- if (specifiedUser.getUserName().equals(oldName))
- specifiedUser.setUserName(newName);
+ if (criteria instanceof UserCriteria) {
+ UserCriteria userCriteria = (UserCriteria) criteria;
+ if (userCriteria.getUser().getName().equals(oldName))
+ userCriteria.getUser().setName(newName);
}
}
}
@@ -170,9 +170,9 @@ public class UserMatch implements Serializable {
private static boolean isUsingUser(List<UserMatchCriteria> criterias, String userName) {
for (UserMatchCriteria criteria: criterias) {
- if (criteria instanceof SpecifiedUser) {
- SpecifiedUser specifiedUser = (SpecifiedUser) criteria;
- if (specifiedUser.getUserName().equals(userName))
+ if (criteria instanceof UserCriteria) {
+ UserCriteria userCriteria = (UserCriteria) criteria;
+ if (userCriteria.getUser().getName().equals(userName))
return true;
}
}
@@ -187,9 +187,9 @@ public class UserMatch implements Serializable {
private static boolean isUsingGroup(List<UserMatchCriteria> criterias, String groupName) {
for (UserMatchCriteria criteria: criterias) {
- if (criteria instanceof SpecifiedGroup) {
- SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;
- if (specifiedGroup.getGroupName().equals(groupName))
+ if (criteria instanceof GroupCriteria) {
+ GroupCriteria groupCriteria = (GroupCriteria) criteria;
+ if (groupCriteria.getGroup().getName().equals(groupName))
return true;
}
}
@@ -201,5 +201,4 @@ public class UserMatch implements Serializable {
return isUsingGroup(userMatch.getCriterias(), groupName)
|| isUsingGroup(userMatch.getExceptCriterias(), groupName);
}
-
}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/JobAuthorizationValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
similarity index 57%
rename from server-core/src/main/java/io/onedev/server/util/validation/JobAuthorizationValidator.java
rename to server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
index c1de8d3729..008b2e08ce 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/JobAuthorizationValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
@@ -1,42 +1,48 @@
-package io.onedev.server.util.validation;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.web.editable.annotation.JobAuthorization;
-
-public class JobAuthorizationValidator implements ConstraintValidator<JobAuthorization, String> {
-
- private String message;
-
- @Override
- public void initialize(JobAuthorization constaintAnnotation) {
- message = constaintAnnotation.message();
- }
-
- @Override
- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
- if (value == null) {
- return true;
- } else {
- try {
- io.onedev.server.job.authorization.JobAuthorization.parse(value);
- return true;
- } catch (Exception e) {
- constraintContext.disableDefaultConstraintViolation();
- String message = this.message;
- if (message.length() == 0) {
- if (StringUtils.isNotBlank(e.getMessage()))
- message = e.getMessage();
- else
- message = "Malformed job authorization";
- }
-
- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
- return false;
- }
- }
- }
-
-}
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.web.editable.annotation.JobMatch;
+
+public class JobMatchValidator implements ConstraintValidator<JobMatch, String> {
+
+ private String message;
+
+ private boolean withProjectCriteria;
+
+ private boolean withJobCriteria;
+
+ @Override
+ public void initialize(JobMatch constaintAnnotation) {
+ message = constaintAnnotation.message();
+ withProjectCriteria = constaintAnnotation.withProjectCriteria();
+ withJobCriteria = constaintAnnotation.withJobCriteria();
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ io.onedev.server.job.match.JobMatch.parse(value, withProjectCriteria, withJobCriteria);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = this.message;
+ if (message.length() == 0) {
+ if (StringUtils.isNotBlank(e.getMessage()))
+ message = e.getMessage();
+ else
+ message = "Malformed job match";
+ }
+
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
index 5a1c1fe364..c3cdf46f74 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/ReviewRequirementValidator.java
@@ -22,7 +22,7 @@ public class ReviewRequirementValidator implements ConstraintValidator<ReviewReq
return true;
} else {
try {
- io.onedev.server.util.reviewrequirement.ReviewRequirement.parse(value, true);
+ io.onedev.server.util.reviewrequirement.ReviewRequirement.parse(value);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
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/JobMatchBehavior.java
similarity index 52%
rename from server-core/src/main/java/io/onedev/server/web/behavior/JobAuthorizationBehavior.java
rename to server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
index b5fb8e1238..6a805205b6 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/JobMatchBehavior.java
@@ -1,14 +1,7 @@
package io.onedev.server.web.behavior;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.codeassist.InputSuggestion;
@@ -17,18 +10,32 @@ import io.onedev.commons.codeassist.parser.Element;
import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.job.authorization.JobAuthorization;
-import io.onedev.server.job.authorization.JobAuthorizationLexer;
-import io.onedev.server.job.authorization.JobAuthorizationParser;
+import io.onedev.server.job.match.JobMatch;
+import io.onedev.server.job.match.JobMatchParser;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static io.onedev.commons.codeassist.AntlrUtils.getLexerRule;
+import static io.onedev.server.job.match.JobMatchLexer.*;
@SuppressWarnings("serial")
-public class JobAuthorizationBehavior extends ANTLRAssistBehavior {
+public class JobMatchBehavior extends ANTLRAssistBehavior {
- public JobAuthorizationBehavior() {
- super(JobAuthorizationParser.class, "jobAuthorization", false);
+ private final boolean withProjectCriteria;
+
+ private final boolean withJobCriteria;
+
+ public JobMatchBehavior(boolean withProjectCriteria, boolean withJobCriteria) {
+ super(JobMatchParser.class, "jobMatch", false);
+ this.withProjectCriteria = withProjectCriteria;
+ this.withJobCriteria = withJobCriteria;
}
@Override
@@ -41,24 +48,35 @@ public class JobAuthorizationBehavior extends ANTLRAssistBehavior {
@Override
protected List<InputSuggestion> match(String matchWith) {
if ("criteriaField".equals(spec.getLabel())) {
- List<String> fields = Lists.newArrayList(Build.NAME_PROJECT, Build.NAME_JOB);
+ List<String> fields = new ArrayList<>();
+ if (withProjectCriteria)
+ fields.add(Build.NAME_PROJECT);
+ if (withJobCriteria)
+ fields.add(Build.NAME_JOB);
return SuggestionUtils.suggest(fields, matchWith);
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
Preconditions.checkState(operatorElements.size() == 1);
String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
- int operator = AntlrUtils.getLexerRule(JobAuthorizationLexer.ruleNames, operatorName);
- if (operator == JobAuthorizationLexer.Is) {
+ int operator = getLexerRule(ruleNames, operatorName);
+ if (operator == Is) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
Preconditions.checkState(fieldElements.size() == 1);
- String fieldName = JobAuthorization.getValue(fieldElements.get(0).getMatchedText());
+ String fieldName = JobMatch.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Build.NAME_PROJECT)) {
if (!matchWith.contains("*") && !matchWith.contains("?"))
return SuggestionUtils.suggestProjectPaths(matchWith);
- else
- return null;
+ } else if (fieldName.equals(Build.NAME_JOB) && Project.get() != null) {
+ return SuggestionUtils.suggestJobs(Project.get(), matchWith);
}
- }
+ } else if (operator == OnBranch) {
+ if (Project.get() != null)
+ return SuggestionUtils.suggestBranches(Project.get(), matchWith);
+ } else if (operator == SubmittedByUser) {
+ return SuggestionUtils.suggestUsers(matchWith);
+ } else if (operator == SubmittedByGroup) {
+ return SuggestionUtils.suggestGroups(matchWith);
+ }
}
return null;
}
@@ -80,9 +98,9 @@ public class JobAuthorizationBehavior extends ANTLRAssistBehavior {
if (parseExpect != null) {
List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
if (!fieldElements.isEmpty()) {
- String fieldName = JobAuthorization.getValue(fieldElements.iterator().next().getMatchedText());
+ String fieldName = JobMatch.getValue(fieldElements.iterator().next().getMatchedText());
try {
- JobAuthorization.checkField(fieldName, AntlrUtils.getLexerRule(JobAuthorizationLexer.ruleNames, suggestedLiteral));
+ JobMatch.checkField(fieldName, withProjectCriteria, withJobCriteria);
} catch (ExplicitException e) {
return null;
}
@@ -97,7 +115,21 @@ public class JobAuthorizationBehavior extends ANTLRAssistBehavior {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if ("criteriaValue".equals(spec.getLabel())) {
- hints.add("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>");
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
+ if (fieldName.equals(Build.NAME_PROJECT))
+ hints.add("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>");
+ else if (fieldName.equals(Build.NAME_JOB))
+ hints.add("Use '*' or '?' for wildcard match");
+ } else {
+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
+ Preconditions.checkState(operatorElements.size() == 1);
+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
+ int operator = AntlrUtils.getLexerRule(ruleNames, operatorName);
+ if (operator == OnBranch)
+ hints.add("Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>");
+ }
}
}
return hints;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java
index 395128ad0c..f90208f90c 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatchBehavior.java
@@ -1,51 +1,54 @@
-package io.onedev.server.web.behavior;
-
-import java.util.List;
-
-import io.onedev.commons.codeassist.FenceAware;
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.commons.codeassist.parser.TerminalExpect;
-import io.onedev.server.util.usermatch.UserMatchParser;
-import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
-import io.onedev.server.web.util.SuggestionUtils;
-
-@SuppressWarnings("serial")
-public class UserMatchBehavior extends ANTLRAssistBehavior {
-
- public UserMatchBehavior() {
- super(UserMatchParser.class, "userMatch", false);
- }
-
- @Override
- protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
- if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
- if (spec.getRuleName().equals("Value")) {
- return new FenceAware(codeAssist.getGrammar(), '(', ')') {
-
- @Override
- protected List<InputSuggestion> match(String matchWith) {
- int tokenType = terminalExpect.getState().getLastMatchedToken().getType();
- switch (tokenType) {
- case UserMatchParser.USER:
- return SuggestionUtils.suggestUsers(matchWith);
- case UserMatchParser.GROUP:
- return SuggestionUtils.suggestGroups(matchWith);
- default:
- return null;
- }
- }
-
- @Override
- protected String getFencingDescription() {
- return "value needs to be enclosed in parenthesis";
- }
-
- }.suggest(terminalExpect);
- }
- }
- return null;
- }
-
-}
+package io.onedev.server.web.behavior;
+
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.server.util.usermatch.UserMatchParser;
+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.util.SuggestionUtils;
+
+import java.util.List;
+
+import static io.onedev.server.util.usermatch.UserMatchLexer.GROUP;
+import static io.onedev.server.util.usermatch.UserMatchLexer.USER;
+
+@SuppressWarnings("serial")
+public class UserMatchBehavior extends ANTLRAssistBehavior {
+
+ public UserMatchBehavior() {
+ super(UserMatchParser.class, "userMatch", false);
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (spec.getRuleName().equals("Value")) {
+ return new FenceAware(codeAssist.getGrammar(), '(', ')') {
+
+ @Override
+ protected List<InputSuggestion> match(String matchWith) {
+ int tokenType = terminalExpect.getState().getLastMatchedToken().getType();
+ switch (tokenType) {
+ case USER:
+ return SuggestionUtils.suggestUsers(matchWith);
+ case GROUP:
+ return SuggestionUtils.suggestGroups(matchWith);
+ default:
+ return null;
+ }
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "value needs to be enclosed in parenthesis";
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java
index f8a9fc9fb9..7b0b85a541 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java
@@ -5,7 +5,7 @@ import org.apache.wicket.model.Model;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.util.Input;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
index 8a8ad23ea0..b57eee709f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
@@ -1,12 +1,18 @@
package io.onedev.server.web.component.commit.status;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
+import com.google.common.collect.Sets;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.job.JobAuthorizationContext;
+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.web.component.build.status.BuildStatusIcon;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.job.joblist.JobListPanel;
+import io.onedev.server.web.component.link.DropdownLink;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
@@ -21,19 +27,11 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
-
-import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.buildspec.job.Job;
-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.util.JobSecretAuthorizationContext;
-import io.onedev.server.web.component.build.status.BuildStatusIcon;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.job.joblist.JobListPanel;
-import io.onedev.server.web.component.link.DropdownLink;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
@SuppressWarnings("serial")
public abstract class CommitStatusLink extends DropdownLink {
@@ -49,8 +47,7 @@ public abstract class CommitStatusLink extends DropdownLink {
@Override
protected List<Job> load() {
List<Job> jobs = new ArrayList<>();
- JobSecretAuthorizationContext.push(
- new JobSecretAuthorizationContext(getProject(), commitId, getPullRequest()));
+ JobAuthorizationContext.push(new JobAuthorizationContext(getProject(), commitId, SecurityUtils.getUser(), getPullRequest()));
try {
BuildSpec buildSpec = getProject().getBuildSpec(commitId);
if (buildSpec != null)
@@ -59,7 +56,7 @@ public abstract class CommitStatusLink extends DropdownLink {
logger.error("Error retrieving build spec (project: {}, commit: {})",
getProject().getPath(), commitId.name(), e);
} finally {
- JobSecretAuthorizationContext.pop();
+ JobAuthorizationContext.pop();
}
return jobs;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index ae9eacfd63..f47326171d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -10,8 +10,8 @@ import io.onedev.server.model.IssueSchedule;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.IssueTemplate;
import io.onedev.server.model.support.issue.field.FieldUtils;
import io.onedev.server.search.entity.issue.IssueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 7b6d34db83..139e5d2e96 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -45,10 +45,10 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.SecretInput;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.model.support.issue.field.FieldUtils;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index a1f31d6ad4..cb53e2c0e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -39,8 +39,8 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.FieldUtils;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java
index a0904fc011..669416f70e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/BuildOptionModalPanel.java
@@ -1,53 +1,50 @@
-package io.onedev.server.web.component.job;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.web.component.modal.ModalPanel;
-
-@SuppressWarnings("serial")
-public abstract class BuildOptionModalPanel extends ModalPanel
- implements InputContext, ScriptIdentityAware {
-
- private final List<String> refNames;
-
- private final Serializable paramBean;
-
- public BuildOptionModalPanel(AjaxRequestTarget target, List<String> refNames, Serializable paramBean) {
- super(target);
- this.refNames = refNames;
- this.paramBean = paramBean;
- }
-
- @Override
- protected Component newContent(String id) {
- return new BuildOptionContentPanel(id, refNames, paramBean) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,
- Serializable populatedParamBean) {
- BuildOptionModalPanel.this.onSave(target, selectedRefNames, populatedParamBean);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close();
- BuildOptionModalPanel.this.onCancel(target);
- }
-
- };
- }
-
- protected abstract void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,
- Serializable populatedParamBean);
-
- protected void onCancel(AjaxRequestTarget target) {
- }
-
-}
+package io.onedev.server.web.component.job;
+
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.web.component.modal.ModalPanel;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+@SuppressWarnings("serial")
+public abstract class BuildOptionModalPanel extends ModalPanel implements InputContext {
+
+ private final List<String> refNames;
+
+ private final Serializable paramBean;
+
+ public BuildOptionModalPanel(AjaxRequestTarget target, List<String> refNames, Serializable paramBean) {
+ super(target);
+ this.refNames = refNames;
+ this.paramBean = paramBean;
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new BuildOptionContentPanel(id, refNames, paramBean) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,
+ Serializable populatedParamBean) {
+ BuildOptionModalPanel.this.onSave(target, selectedRefNames, populatedParamBean);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close();
+ BuildOptionModalPanel.this.onCancel(target);
+ }
+
+ };
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, Collection<String> selectedRefNames,
+ Serializable populatedParamBean);
+
+ protected void onCancel(AjaxRequestTarget target) {
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index cd6b63073e..60951a91f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -1,31 +1,11 @@
package io.onedev.server.web.component.job;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.basic.Label;
-import org.eclipse.jgit.lib.ObjectId;
-
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.buildspec.job.SubmitReason;
import io.onedev.server.buildspec.param.ParamUtils;
import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.git.service.RefFacade;
@@ -35,10 +15,20 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.script.identity.JobIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.web.component.modal.message.MessageModal;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.basic.Label;
+import org.eclipse.jgit.lib.ObjectId;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.stream.Collectors;
@SuppressWarnings("serial")
public abstract class RunJobLink extends AjaxLink<Void> {
@@ -111,26 +101,9 @@ public abstract class RunJobLink extends AjaxLink<Void> {
String pipeline = getPipeline();
List<Build> builds = new ArrayList<>();
for (String refName: selectedRefNames) {
- SubmitReason reason = new SubmitReason() {
-
- @Override
- public String getRefName() {
- return refName;
- }
-
- @Override
- public PullRequest getPullRequest() {
- return RunJobLink.this.getPullRequest();
- }
-
- @Override
- public String getDescription() {
- return "Submitted manually";
- }
-
- };
builds.add(getJobManager().submit(getProject(), commitId, job.getName(),
- paramMap, pipeline, reason));
+ paramMap, pipeline, refName, SecurityUtils.getUser(),
+ getPullRequest(), "Submitted manually"));
}
if (builds.size() == 1)
setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));
@@ -150,33 +123,11 @@ public abstract class RunJobLink extends AjaxLink<Void> {
return Preconditions.checkNotNull(job.getParamSpecMap().get(paramName));
}
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new JobIdentity(getProject(), commitId);
- }
-
};
} else {
- SubmitReason reason = new SubmitReason() {
-
- @Override
- public String getRefName() {
- return refNames.iterator().next();
- }
-
- @Override
- public PullRequest getPullRequest() {
- return RunJobLink.this.getPullRequest();
- }
-
- @Override
- public String getDescription() {
- return "Submitted manually";
- }
-
- };
Build build = getJobManager().submit(getProject(), commitId, job.getName(),
- new HashMap<>(), getPipeline(), reason);
+ new HashMap<>(), getPipeline(), refNames.iterator().next(),
+ SecurityUtils.getUser(), getPullRequest(), "Submitted manually");
setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));
if (build.isFinished())
Session.get().warn("Build already fired in current pipeline");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.java b/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.java
index a9e3b22fed..c2c6f63672 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/milestone/burndown/MilestoneBurndownPanel.java
@@ -26,7 +26,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.model.support.issue.field.spec.WorkingPeriodField;
import io.onedev.server.util.Day;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobAuthorizationEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java
similarity index 71%
rename from server-core/src/main/java/io/onedev/server/web/editable/JobAuthorizationEditSupport.java
rename to server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java
index c47781e0d7..4ae3c7a057 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/JobAuthorizationEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobMatchEditSupport.java
@@ -1,25 +1,25 @@
package io.onedev.server.web.editable;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-
+import io.onedev.server.web.behavior.JobMatchBehavior;
+import io.onedev.server.web.editable.annotation.JobMatch;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import io.onedev.server.web.behavior.JobAuthorizationBehavior;
-import io.onedev.server.web.editable.annotation.JobAuthorization;
-import io.onedev.server.web.editable.string.StringPropertyEditor;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
@SuppressWarnings("serial")
-public class JobAuthorizationEditSupport implements EditSupport {
+public class JobMatchEditSupport implements EditSupport {
@Override
public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(JobAuthorization.class) != null) {
+ JobMatch jobMatch = propertyGetter.getAnnotation(JobMatch.class);
+ if (jobMatch != null) {
if (propertyGetter.getReturnType() != String.class) {
- throw new RuntimeException("Annotation 'JobAuthorization' should be applied to property "
+ throw new RuntimeException("Annotation 'JobMatch' should be applied to property "
+ "with type 'String'");
}
return new PropertyContext<String>(descriptor) {
@@ -30,9 +30,9 @@ public class JobAuthorizationEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- String jobAuthorization = model.getObject();
- if (jobAuthorization != null) {
- return new Label(id, jobAuthorization);
+ String jobMatch = model.getObject();
+ if (jobMatch != null) {
+ return new Label(id, jobMatch);
} else {
return new EmptyValueLabel(id) {
@@ -51,7 +51,7 @@ public class JobAuthorizationEditSupport implements EditSupport {
@Override
public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
return new StringPropertyEditor(componentId, descriptor, model)
- .setInputAssist(new JobAuthorizationBehavior());
+ .setInputAssist(new JobMatchBehavior(jobMatch.withProjectCriteria(), jobMatch.withJobCriteria()));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java
index 62eb66ec34..28b6a1c347 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/UserMatchEditSupport.java
@@ -1,47 +1,46 @@
-package io.onedev.server.web.editable;
-
-import java.lang.reflect.Method;
-
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.web.behavior.UserMatchBehavior;
-import io.onedev.server.web.editable.annotation.UserMatch;
-import io.onedev.server.web.editable.string.StringPropertyEditor;
-import io.onedev.server.web.editable.string.StringPropertyViewer;
-
-@SuppressWarnings("serial")
-public class UserMatchEditSupport implements EditSupport {
-
- @Override
- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
- Method propertyGetter = descriptor.getPropertyGetter();
- if (propertyGetter.getAnnotation(UserMatch.class) != null) {
- if (propertyGetter.getReturnType() != String.class) {
- throw new RuntimeException("Annotation 'UserMatch' should be applied to property "
- + "of type 'String'.");
- }
- return new PropertyContext<String>(descriptor) {
-
- @Override
- public PropertyViewer renderForView(String componentId, IModel<String> model) {
- return new StringPropertyViewer(componentId, descriptor, model.getObject());
- }
-
- @Override
- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new StringPropertyEditor(componentId, descriptor, model)
- .setInputAssist(new UserMatchBehavior());
- }
-
- };
- } else {
- return null;
- }
- }
-
- @Override
- public int getPriority() {
- return DEFAULT_PRIORITY;
- }
-
-}
+package io.onedev.server.web.editable;
+
+import io.onedev.server.web.behavior.UserMatchBehavior;
+import io.onedev.server.web.editable.annotation.UserMatch;
+import io.onedev.server.web.editable.string.StringPropertyEditor;
+import io.onedev.server.web.editable.string.StringPropertyViewer;
+import org.apache.wicket.model.IModel;
+
+import java.lang.reflect.Method;
+
+@SuppressWarnings("serial")
+public class UserMatchEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ if (propertyGetter.getAnnotation(UserMatch.class) != null) {
+ if (propertyGetter.getReturnType() != String.class) {
+ throw new RuntimeException("Annotation 'UserMatch' should be applied to property "
+ + "of type 'String'.");
+ }
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, IModel<String> model) {
+ return new StringPropertyViewer(componentId, descriptor, model.getObject());
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new StringPropertyEditor(componentId, descriptor, model)
+ .setInputAssist(new UserMatchBehavior());
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobAuthorization.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java
similarity index 63%
rename from server-core/src/main/java/io/onedev/server/web/editable/annotation/JobAuthorization.java
rename to server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java
index 02858b5fc5..e4c1426109 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/JobMatch.java
@@ -8,14 +8,18 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-import io.onedev.server.util.validation.JobAuthorizationValidator;
+import io.onedev.server.util.validation.JobMatchValidator;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=JobAuthorizationValidator.class)
-public @interface JobAuthorization {
-
- String message() default "";
+@Constraint(validatedBy = JobMatchValidator.class)
+public @interface JobMatch {
+
+ boolean withProjectCriteria() default false;
+
+ boolean withJobCriteria() default false;
+
+ String message() default "";
Class<?>[] groups() default {};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatch.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatch.java
index c3d148449b..1bbb58c447 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatch.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/UserMatch.java
@@ -1,24 +1,23 @@
-package io.onedev.server.web.editable.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import io.onedev.server.util.validation.UserMatchValidator;
-
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=UserMatchValidator.class)
-public @interface UserMatch {
-
- String message() default "";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-
-}
+package io.onedev.server.web.editable.annotation;
+
+import io.onedev.server.util.validation.UserMatchValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=UserMatchValidator.class)
+public @interface UserMatch {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.java
index 11c13f9be4..4c100c610a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/param/spec/ParamSpecEditPanel.java
@@ -1,147 +1,147 @@
-package io.onedev.server.web.editable.buildspec.param.spec;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.util.Path;
-import io.onedev.server.util.PathNode;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
-
-@SuppressWarnings("serial")
-abstract class ParamSpecEditPanel extends Panel implements InputContext {
-
- private final List<ParamSpec> paramSpecs;
-
- private final int paramSpecIndex;
-
- public ParamSpecEditPanel(String id, List<ParamSpec> paramSpecs, int paramSpecIndex) {
- super(id);
-
- this.paramSpecs = paramSpecs;
- this.paramSpecIndex = paramSpecIndex;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- ParamSpecBean bean = new ParamSpecBean();
- if (paramSpecIndex != -1)
- bean.setParamSpec(paramSpecs.get(paramSpecIndex));
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onError() {
- super.onError();
- RequestCycle.get().find(AjaxRequestTarget.class).add(this);
- }
-
- };
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ParamSpecEditPanel.this));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
-
- BeanEditor editor = BeanContext.edit("editor", bean);
- form.add(editor);
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- ParamSpec param = bean.getParamSpec();
- if (paramSpecIndex != -1) {
- ParamSpec oldParam = paramSpecs.get(paramSpecIndex);
- if (!param.getName().equals(oldParam.getName()) && getInputSpec(param.getName()) != null) {
- editor.error(new Path(new PathNode.Named("paramSpec"), new PathNode.Named("name")),
- "This name has already been used by another parameter");
- }
- } else if (getInputSpec(param.getName()) != null) {
- editor.error(new Path(new PathNode.Named("paramSpec"), new PathNode.Named("name")),
- "This name has already been used by another parameter");
- }
-
- if (editor.isValid()) {
- if (paramSpecIndex != -1) {
- paramSpecs.set(paramSpecIndex, param);
- } else {
- paramSpecs.add(param);
- }
- onSave(target);
- } else {
- target.add(form);
- }
- }
-
- });
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ParamSpecEditPanel.this));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- form.setOutputMarkupId(true);
-
- add(form);
- }
-
- protected abstract void onSave(AjaxRequestTarget target);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
- @Override
- public List<String> getInputNames() {
- List<String> paramNames = new ArrayList<>();
- int currentIndex = 0;
- for (ParamSpec param: paramSpecs) {
- if (currentIndex != paramSpecIndex)
- paramNames.add(param.getName());
- currentIndex++;
- }
- return paramNames;
- }
-
- @Override
- public ParamSpec getInputSpec(String paramName) {
- for (ParamSpec param: paramSpecs) {
- if (paramName.equals(param.getName()))
- return param;
- }
- return null;
- }
-
-}
+package io.onedev.server.web.editable.buildspec.param.spec;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.util.Path;
+import io.onedev.server.util.PathNode;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+
+@SuppressWarnings("serial")
+abstract class ParamSpecEditPanel extends Panel implements InputContext {
+
+ private final List<ParamSpec> paramSpecs;
+
+ private final int paramSpecIndex;
+
+ public ParamSpecEditPanel(String id, List<ParamSpec> paramSpecs, int paramSpecIndex) {
+ super(id);
+
+ this.paramSpecs = paramSpecs;
+ this.paramSpecIndex = paramSpecIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ ParamSpecBean bean = new ParamSpecBean();
+ if (paramSpecIndex != -1)
+ bean.setParamSpec(paramSpecs.get(paramSpecIndex));
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ParamSpecEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.edit("editor", bean);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ ParamSpec param = bean.getParamSpec();
+ if (paramSpecIndex != -1) {
+ ParamSpec oldParam = paramSpecs.get(paramSpecIndex);
+ if (!param.getName().equals(oldParam.getName()) && getInputSpec(param.getName()) != null) {
+ editor.error(new Path(new PathNode.Named("paramSpec"), new PathNode.Named("name")),
+ "This name has already been used by another parameter");
+ }
+ } else if (getInputSpec(param.getName()) != null) {
+ editor.error(new Path(new PathNode.Named("paramSpec"), new PathNode.Named("name")),
+ "This name has already been used by another parameter");
+ }
+
+ if (editor.isValid()) {
+ if (paramSpecIndex != -1) {
+ paramSpecs.set(paramSpecIndex, param);
+ } else {
+ paramSpecs.add(param);
+ }
+ onSave(target);
+ } else {
+ target.add(form);
+ }
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(ParamSpecEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+ @Override
+ public List<String> getInputNames() {
+ List<String> paramNames = new ArrayList<>();
+ int currentIndex = 0;
+ for (ParamSpec param: paramSpecs) {
+ if (currentIndex != paramSpecIndex)
+ paramNames.add(param.getName());
+ currentIndex++;
+ }
+ return paramNames;
+ }
+
+ @Override
+ public ParamSpec getInputSpec(String paramName) {
+ for (ParamSpec param: paramSpecs) {
+ if (paramName.equals(param.getName()))
+ return param;
+ }
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java
index 219f104ee6..58fb67ef18 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/scriptchoice/ScriptChoiceEditor.java
@@ -14,7 +14,7 @@ import org.apache.wicket.util.convert.ConversionException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GroovyScript;
-import io.onedev.server.util.script.ScriptContribution;
+import io.onedev.server.util.ScriptContribution;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index 38896a3cd0..ce4a9ae21c 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -371,7 +371,6 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new ProjectPageMapper("${project}/~settings/pull-request", PullRequestSettingPage.class));
add(new ProjectPageMapper("${project}/~settings/build/job-secrets", JobSecretsPage.class));
add(new ProjectPageMapper("${project}/~settings/build/job-properties", JobPropertiesPage.class));
- add(new ProjectPageMapper("${project}/~settings/build/action-authorizations", ActionAuthorizationsPage.class));
add(new ProjectPageMapper("${project}/~settings/build/build-preserve-rules", BuildPreservationsPage.class));
add(new ProjectPageMapper("${project}/~settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));
add(new ProjectPageMapper("${project}/~settings/service-desk", ProjectServiceDeskSettingPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
index 086e8ccb44..3ee2438bba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
@@ -1,17 +1,13 @@
package io.onedev.server.web.page.admin;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.page.layout.LayoutPage;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.util.script.identity.SiteAdministrator;
-import io.onedev.server.web.page.layout.LayoutPage;
-
@SuppressWarnings("serial")
-public abstract class AdministrationPage extends LayoutPage implements ScriptIdentityAware {
+public abstract class AdministrationPage extends LayoutPage {
public AdministrationPage(PageParameters params) {
super(params);
@@ -37,11 +33,5 @@ public abstract class AdministrationPage extends LayoutPage implements ScriptIde
protected String getPageTitle() {
return "Administration - OneDev";
}
-
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new SiteAdministrator();
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java
index a804c911ce..1d60e73d0a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/FieldEditPanel.java
@@ -16,9 +16,9 @@ import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.util.Path;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
index 1535820ce2..ad14acbc47 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
@@ -14,8 +14,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.editable.BeanContext;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
index 0284117c90..851d03e6ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
@@ -1,22 +1,5 @@
package io.onedev.server.web.page.issues;
-import java.io.Serializable;
-import java.util.ArrayList;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.util.script.identity.SiteAdministrator;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
@@ -38,9 +21,21 @@ import io.onedev.server.web.page.layout.LayoutPage;
import io.onedev.server.web.util.NamedIssueQueriesBean;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.ArrayList;
@SuppressWarnings("serial")
-public class IssueListPage extends LayoutPage implements ScriptIdentityAware {
+public class IssueListPage extends LayoutPage {
private static final String PARAM_PAGE = "page";
@@ -255,11 +250,5 @@ public class IssueListPage extends LayoutPage implements ScriptIdentityAware {
protected String getPageTitle() {
return "Issues - OneDev";
}
-
- @org.jetbrains.annotations.Nullable
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new SiteAdministrator();
- }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 3d289a3f62..3cd3dbdd4b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -280,8 +280,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
JobSecretsPage.class, JobSecretsPage.paramsOf(getProject())));
buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Job Properties",
JobPropertiesPage.class, JobPropertiesPage.paramsOf(getProject())));
- buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Action Authorizations",
- ActionAuthorizationsPage.class, ActionAuthorizationsPage.paramsOf(getProject())));
buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Build Preserve Rules",
BuildPreservationsPage.class, BuildPreservationsPage.paramsOf(getProject())));
buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Fixed Issue Filters",
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index af0b2c8edc..06584f2cc2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -19,6 +19,8 @@ import io.onedev.server.git.exception.NotTreeException;
import io.onedev.server.git.exception.ObjectAlreadyExistsException;
import io.onedev.server.git.exception.ObsoleteCommitException;
import io.onedev.server.git.service.GitService;
+import io.onedev.server.job.JobAuthorizationContext;
+import io.onedev.server.job.JobAuthorizationContextAware;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -30,11 +32,6 @@ import io.onedev.server.search.code.query.BlobQuery;
import io.onedev.server.search.code.query.TextQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.FilenameUtils;
-import io.onedev.server.util.JobSecretAuthorizationContext;
-import io.onedev.server.util.JobSecretAuthorizationContextAware;
-import io.onedev.server.util.script.identity.JobIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -117,7 +114,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@SuppressWarnings("serial")
public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
- ScriptIdentityAware, EditParamsAware, JobSecretAuthorizationContextAware {
+ EditParamsAware, JobAuthorizationContextAware {
private static final String PARAM_INITIAL_NEW_PATH = "initial-new-path";
@@ -204,7 +201,11 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
String path = state.blobIdent.path;
if (path != null && state.blobIdent.isTree())
path += "/";
- if (!SecurityUtils.canModify(getProject(), state.blobIdent.revision, path))
+
+ var revision = state.blobIdent.revision;
+ if (revision == null)
+ revision = "main";
+ if (!SecurityUtils.canModify(getProject(), revision, path))
unauthorized();
}
@@ -370,25 +371,26 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
blobOperations.setOutputMarkupId(true);
String revision = state.blobIdent.revision;
+ if (revision == null)
+ revision = "main";
AtomicBoolean reviewRequired = new AtomicBoolean(true);
try {
- reviewRequired.set(revision!=null && getProject().isReviewRequiredForModification(getLoginUser(), revision, null));
+ reviewRequired.set(getProject().isReviewRequiredForModification(getLoginUser(), revision, null));
} catch (Exception e) {
logger.error("Error checking review requirement", e);
}
AtomicBoolean buildRequired = new AtomicBoolean(true);
try {
- buildRequired.set(revision!=null && getProject().isBuildRequiredForModification(getLoginUser(), revision, null));
+ buildRequired.set(getProject().isBuildRequiredForModification(getLoginUser(), revision, null));
} catch (Exception e) {
logger.error("Error checking build requirement", e);
}
AtomicBoolean signatureRequiredButNoSigningKey = new AtomicBoolean(true);
try {
- signatureRequiredButNoSigningKey.set(revision!=null
- && getProject().isCommitSignatureRequiredButNoSigningKey(getLoginUser(), revision));
+ signatureRequiredButNoSigningKey.set(getProject().isCommitSignatureRequiredButNoSigningKey(getLoginUser(), revision));
} catch (Exception e) {
logger.error("Error checking signature requirement", e);
}
@@ -1611,14 +1613,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
else
return state.blobIdent.path + " at " + state.blobIdent.revision + " - " + getProject().getPath();
}
-
- @Override
- public ScriptIdentity getScriptIdentity() {
- if (getBlobIdent().revision != null)
- return new JobIdentity(getProject(), getCommit().copy());
- else // when we add file to an empty project
- return new JobIdentity(getProject(), null);
- }
@Override
protected Component newProjectTitle(String componentId) {
@@ -1634,16 +1628,18 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
}
@Override
- public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
- return new JobSecretAuthorizationContext(getProject(), getCommit(), null);
+ public JobAuthorizationContext getJobAuthorizationContext() {
+ return new JobAuthorizationContext(getProject(), getCommit(), SecurityUtils.getUser(), null);
}
@Override
protected BookmarkablePageLink<Void> navToProject(String componentId, Project project) {
- if (project.isCodeManagement() && SecurityUtils.canReadCode(project))
+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project)) {
return new ViewStateAwarePageLink<Void>(componentId, ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
- else
- return new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));
+ } else {
+ return new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class,
+ ProjectDashboardPage.paramsOf(project.getId()));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.java
index f30e647d73..04f9c211da 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.java
@@ -46,7 +46,7 @@ public class NoCommitsPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- if (SecurityUtils.canWriteCode(context.getProject())) {
+ if (SecurityUtils.canModify(context.getProject(), "main", null)) {
add(new MenuLink("addFiles") {
@Override
@@ -118,15 +118,27 @@ public class NoCommitsPanel extends Panel {
}
});
-
- add(new AjaxLink<Void>("setupBuildSpec") {
- @Override
- public void onClick(AjaxRequestTarget target) {
- context.onModeChange(target, Mode.ADD, BuildSpec.BLOB_PATH);
- }
-
- });
+ if (SecurityUtils.canModify(context.getProject(), "main", BuildSpec.BLOB_PATH)) {
+ add(new AjaxLink<Void>("setupBuildSpec") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ context.onModeChange(target, Mode.ADD, BuildSpec.BLOB_PATH);
+ }
+
+ });
+ } else {
+ add(new WebMarkupContainer("setupBuildSpec") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ }
add(new DropdownLink("pushInstructions") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
index 2a8e41d34b..c2a3613f8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
@@ -1,84 +1,82 @@
-package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
-
-import java.util.List;
-import java.util.stream.IntStream;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-
-import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.buildspec.NamedElement;
-import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.source.SourceEditPanel;
-import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;
-import io.onedev.server.web.page.project.blob.render.BlobRenderer;
-
-public class BuildSpecRenderer implements BlobRenderer {
-
- private static final long serialVersionUID = 1L;
-
- private static final String POSITION_PREFIX = "buildspec-";
-
- private boolean isBuildSpec(@Nullable String blobPath) {
- return BuildSpec.BLOB_PATH.equals(blobPath) || ".onedev-buildspec".equals(blobPath);
- }
-
- @Nullable
- public static String getPosition(@Nullable String selection) {
- return selection!=null? POSITION_PREFIX + selection: null;
- }
-
- @Nullable
- public static String getSelection(@Nullable String position) {
- if (position != null && position.startsWith(POSITION_PREFIX))
- return position.substring(POSITION_PREFIX.length());
- else
- return null;
- }
-
- public static String getUrlSegment(Class<?> namedElementClass) {
- return EditableUtils.getDisplayName(namedElementClass).replace(' ', '-').toLowerCase();
- }
-
- public static <T extends NamedElement> int getActiveElementIndex(BlobRenderContext context,
- Class<T> namedElementClass, List<T> elements, int defaultIndex) {
- String selection = getSelection(context.getPosition());
- String urlSegment = getUrlSegment(namedElementClass) + "s/";
-
- if (selection != null && selection.startsWith(urlSegment)) {
- String activeElementName = selection.substring(urlSegment.length());
- return IntStream.range(0, elements.size())
- .filter(i -> activeElementName.equals(elements.get(i).getName()))
- .findFirst()
- .orElse(defaultIndex);
- } else {
- return defaultIndex;
- }
- }
-
- @Override
- public Component render(String componentId, BlobRenderContext context) {
- if (context.getMode() == Mode.ADD && isBuildSpec(context.getNewPath())
- || context.getMode() == Mode.EDIT && isBuildSpec(context.getBlobIdent().path)) {
- if (BlobRenderer.getSourceRange(context.getPosition()) != null)
- return new SourceEditPanel(componentId, context);
- else
- return new BuildSpecBlobEditPanel(componentId, context);
- } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)
- && context.getBlobIdent().isFile()
- && isBuildSpec(context.getBlobIdent().path)) {
- if (BlobRenderer.getSourceRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)
- return new SourceViewPanel(componentId, context, false);
- else if (context.isViewPlain())
- return new SourceViewPanel(componentId, context, true);
- else
- return new BuildSpecBlobViewPanel(componentId, context);
- } else {
- return null;
- }
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
+
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.NamedElement;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.blob.render.BlobRenderer;
+import io.onedev.server.web.page.project.blob.render.source.SourceEditPanel;
+import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;
+import org.apache.wicket.Component;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.stream.IntStream;
+
+public class BuildSpecRenderer implements BlobRenderer {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String POSITION_PREFIX = "buildspec-";
+
+ private boolean isBuildSpec(@Nullable String blobPath) {
+ return BuildSpec.BLOB_PATH.equals(blobPath) || ".onedev-buildspec".equals(blobPath);
+ }
+
+ @Nullable
+ public static String getPosition(@Nullable String selection) {
+ return selection!=null? POSITION_PREFIX + selection: null;
+ }
+
+ @Nullable
+ public static String getSelection(@Nullable String position) {
+ if (position != null && position.startsWith(POSITION_PREFIX))
+ return position.substring(POSITION_PREFIX.length());
+ else
+ return null;
+ }
+
+ public static String getUrlSegment(Class<?> namedElementClass) {
+ return EditableUtils.getDisplayName(namedElementClass).replace(' ', '-').toLowerCase();
+ }
+
+ public static <T extends NamedElement> int getActiveElementIndex(BlobRenderContext context,
+ Class<T> namedElementClass, List<T> elements, int defaultIndex) {
+ String selection = getSelection(context.getPosition());
+ String urlSegment = getUrlSegment(namedElementClass) + "s/";
+
+ if (selection != null && selection.startsWith(urlSegment)) {
+ String activeElementName = selection.substring(urlSegment.length());
+ return IntStream.range(0, elements.size())
+ .filter(i -> activeElementName.equals(elements.get(i).getName()))
+ .findFirst()
+ .orElse(defaultIndex);
+ } else {
+ return defaultIndex;
+ }
+ }
+
+ @Override
+ public Component render(String componentId, BlobRenderContext context) {
+ if (context.getMode() == Mode.ADD && isBuildSpec(context.getNewPath())
+ || context.getMode() == Mode.EDIT && isBuildSpec(context.getBlobIdent().path)) {
+ if (BlobRenderer.getSourceRange(context.getPosition()) != null)
+ return new SourceEditPanel(componentId, context);
+ else
+ return new BuildSpecBlobEditPanel(componentId, context);
+ } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)
+ && context.getBlobIdent().isFile()
+ && isBuildSpec(context.getBlobIdent().path)) {
+ if (BlobRenderer.getSourceRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)
+ return new SourceViewPanel(componentId, context, false);
+ else if (context.isViewPlain())
+ return new SourceViewPanel(componentId, context, true);
+ else
+ return new BuildSpecBlobViewPanel(componentId, context);
+ } else {
+ return null;
+ }
+ }
+
+}
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 3652faae36..8a2cf57065 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
@@ -8,24 +8,21 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.build.BuildUpdated;
+import io.onedev.server.job.JobAuthorizationContext;
+import io.onedev.server.job.JobAuthorizationContextAware;
import io.onedev.server.job.JobContext;
import io.onedev.server.job.JobManager;
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.model.support.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.terminal.TerminalManager;
-import io.onedev.server.util.JobSecretAuthorizationContext;
-import io.onedev.server.util.JobSecretAuthorizationContextAware;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.script.identity.JobIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -89,7 +86,7 @@ import java.util.List;
@SuppressWarnings("serial")
public abstract class BuildDetailPage extends ProjectPage
- implements InputContext, ScriptIdentityAware, BuildAware, JobSecretAuthorizationContextAware {
+ implements InputContext, BuildAware, JobAuthorizationContextAware {
public static final String PARAM_BUILD = "build";
@@ -628,11 +625,6 @@ public abstract class BuildDetailPage extends ProjectPage
return null;
}
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new JobIdentity(getBuild().getProject(), getBuild().getCommitId());
- }
-
@Override
protected Component newProjectTitle(String componentId) {
Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
@@ -651,8 +643,9 @@ public abstract class BuildDetailPage extends ProjectPage
}
@Override
- public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
- return new JobSecretAuthorizationContext(getProject(), getBuild().getCommitId(), getBuild().getRequest());
+ public JobAuthorizationContext getJobAuthorizationContext() {
+ return new JobAuthorizationContext(getProject(), getBuild().getCommitId(),
+ getBuild().getSubmitter(), getBuild().getRequest());
}
}
diff --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.java
index bd7131bcfa..818efbdcf9 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
@@ -1,48 +1,8 @@
package io.onedev.server.web.page.project.commits;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
-
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
@@ -59,18 +19,13 @@ import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.RefFacade;
import io.onedev.server.infomanager.CommitInfoManager;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentReply;
-import io.onedev.server.model.CodeCommentStatusChange;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.Mark;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.JobSecretAuthorizationContext;
-import io.onedev.server.util.JobSecretAuthorizationContextAware;
import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.job.JobAuthorizationContext;
+import io.onedev.server.job.JobAuthorizationContextAware;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.AjaxLazyLoadPanel;
import io.onedev.server.web.component.branch.create.CreateBranchLink;
@@ -88,9 +43,40 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import io.onedev.server.web.util.ReferenceTransformer;
import io.onedev.server.web.util.RevisionDiff;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.*;
+import java.util.stream.Collectors;
@SuppressWarnings("serial")
-public class CommitDetailPage extends ProjectPage implements RevisionDiff.AnnotationSupport, JobSecretAuthorizationContextAware {
+public class CommitDetailPage extends ProjectPage implements RevisionDiff.AnnotationSupport, JobAuthorizationContextAware {
private static final Logger logger = LoggerFactory.getLogger(CommitDetailPage.class);
@@ -855,8 +841,8 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
}
@Override
- public JobSecretAuthorizationContext getJobSecretAuthorizationContext() {
- return new JobSecretAuthorizationContext(getProject(), getCommit(), getPullRequest());
+ public JobAuthorizationContext getJobAuthorizationContext() {
+ return new JobAuthorizationContext(getProject(), getCommit(), SecurityUtils.getUser(), getPullRequest());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java
index d93f8f4274..42e8e837a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java
@@ -1,19 +1,15 @@
package io.onedev.server.web.page.project.issues;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.util.script.identity.SiteAdministrator;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.page.project.ProjectPage;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
@SuppressWarnings("serial")
-public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIdentityAware {
+public abstract class ProjectIssuesPage extends ProjectPage {
public ProjectIssuesPage(PageParameters params) {
super(params);
@@ -37,11 +33,6 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIde
});
}
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new SiteAdministrator();
- }
-
@Override
protected String getPageTitle() {
return "Issues - " + getProject().getPath();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index 88206d86b7..f36299182a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -43,9 +43,9 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
-import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.model.support.issue.TransitionSpec;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index f221fe9dc8..59dc939810 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -24,8 +24,8 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.infomanager.VisitInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.FixedIssueCriteria;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index 0216dcf78a..f2358a20ca 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -16,8 +16,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.field.FieldUtils;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index b195e5e304..5d3a6a3416 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -1,18 +1,5 @@
package io.onedev.server.web.page.project.issues.create;
-import java.util.List;
-
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
@@ -21,24 +8,33 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputContext;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.util.script.identity.SiteAdministrator;
import io.onedev.server.web.component.issue.create.NewIssueEditor;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.page.simple.security.LoginPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.List;
@SuppressWarnings("serial")
-public class NewIssuePage extends ProjectPage implements InputContext, ScriptIdentityAware {
+public class NewIssuePage extends ProjectPage implements InputContext {
private static final String PARAM_TEMPLATE = "query";
@@ -132,11 +128,6 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde
return getIssueSetting().getFieldSpec(inputName);
}
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new SiteAdministrator();
- }
-
public static PageParameters paramsOf(Project project, String template) {
PageParameters params = paramsOf(project);
if (template != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 5f7220fc17..ab7a00f530 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -39,7 +39,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.infomanager.VisitInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
index 2a15566d30..838c5913ed 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
@@ -1,8 +1,22 @@
package io.onedev.server.web.page.project.issues.milestones;
-import java.util.ArrayList;
-import java.util.List;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.MilestoneManager;
+import io.onedev.server.model.Milestone;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.WebSession;
+import io.onedev.server.web.component.MultilineLabel;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.milestone.MilestoneDateLabel;
+import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
+import io.onedev.server.web.component.milestone.actions.MilestoneActionsPanel;
+import io.onedev.server.web.component.tabbable.PageTab;
+import io.onedev.server.web.component.tabbable.PageTabHead;
+import io.onedev.server.web.component.tabbable.Tab;
+import io.onedev.server.web.component.tabbable.Tabbable;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -21,29 +35,11 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.MilestoneManager;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.Project;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.script.identity.ScriptIdentity;
-import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.util.script.identity.SiteAdministrator;
-import io.onedev.server.web.WebSession;
-import io.onedev.server.web.component.MultilineLabel;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.milestone.MilestoneDateLabel;
-import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
-import io.onedev.server.web.component.milestone.actions.MilestoneActionsPanel;
-import io.onedev.server.web.component.tabbable.PageTab;
-import io.onedev.server.web.component.tabbable.PageTabHead;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
+import java.util.ArrayList;
+import java.util.List;
@SuppressWarnings("serial")
-public abstract class MilestoneDetailPage extends ProjectPage implements ScriptIdentityAware {
+public abstract class MilestoneDetailPage extends ProjectPage {
public static final String PARAM_MILESTONE = "milestone";
@@ -135,11 +131,6 @@ public abstract class MilestoneDetailPage extends ProjectPage implements ScriptI
milestoneModel.detach();
super.onDetach();
}
-
- @Override
- public ScriptIdentity getScriptIdentity() {
- return new SiteAdministrator();
- }
public static PageParameters paramsOf(Project project, Milestone milestone) {
PageParameters params = paramsOf(project);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationBean.java
deleted file mode 100644
index a5ea242498..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationBean.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.onedev.server.web.page.project.setting.build;
-
-import java.io.Serializable;
-
-import javax.validation.constraints.NotNull;
-
-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-public class ActionAuthorizationBean implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private ActionAuthorization authorization;
-
- @Editable(name="Action")
- @NotNull
- public ActionAuthorization getAuthorization() {
- return authorization;
- }
-
- public void setAuthorization(ActionAuthorization authorization) {
- this.authorization = authorization;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html
deleted file mode 100644
index 5ed8142a20..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<wicket:panel>
- <div class="action-authorization-edit">
- <form wicket:id="form" class="leave-confirm">
- <div class="modal-header">
- <h5 id="modal-title" class="modal-title">Edit Action Authorization</h5>
- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
- </div>
- <div class="modal-body">
- <div wicket:id="editor"></div>
- </div>
- <div class="modal-footer">
- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save">
- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
- </div>
- </form>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.java
deleted file mode 100644
index 80dc7da106..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationEditPanel.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package io.onedev.server.web.page.project.setting.build;
-
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
-
-@SuppressWarnings("serial")
-public abstract class ActionAuthorizationEditPanel extends Panel {
-
- private final int index;
-
- public ActionAuthorizationEditPanel(String id, int index) {
- super(id);
- this.index = index;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
-
- ActionAuthorizationBean bean = new ActionAuthorizationBean();
- if (index != -1)
- bean.setAuthorization(getProject().getBuildSetting().getActionAuthorizations().get(index));
-
- BeanEditor editor = BeanContext.edit("editor", bean);
- form.add(editor);
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancelled(target);
- }
-
- });
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- List<ActionAuthorization> authorizations = getProject().getBuildSetting().getActionAuthorizations();
- if (index == -1)
- authorizations.add(bean.getAuthorization());
- else
- authorizations.set(index, bean.getAuthorization());
-
- OneDev.getInstance(ProjectManager.class).save(getProject());
- onSaved(target);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancelled(target);
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- });
- add(form);
- }
-
- protected abstract Project getProject();
-
- protected abstract void onCancelled(AjaxRequestTarget target);
-
- protected abstract void onSaved(AjaxRequestTarget target);
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
deleted file mode 100644
index 728952cae7..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<wicket:extend>
- <div class="alert alert-notice bg-white shadow mb-5 text-gray">
- <wicket:svg href="bulb" class="icon mr-2"/> Define rules to authorize build actions. A build action will be allowed as long as one rule
- defined here or in parent projects allows it
- </div>
- <div class="card">
- <div class="card-body">
- <a wicket:id="addNew" class="btn btn-primary btn-icon mb-4" title="Add new action authorzation"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- <table wicket:id="authorizations" class="authorizations table"></table>
- </div>
- </div>
- <wicket:fragment wicket:id="actionFrag">
- <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit this authorization"><wicket:svg href="edit" class="icon"></wicket:svg></a>
- <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete this authorization"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- </wicket:fragment>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
deleted file mode 100644
index 77ab6de8be..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package io.onedev.server.web.page.project.setting.build;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.component.datatable.DefaultDataTable;
-import io.onedev.server.web.component.modal.ModalPanel;
-
-@SuppressWarnings("serial")
-public class ActionAuthorizationsPage extends ProjectBuildSettingPage {
-
- private DataTable<ActionAuthorization, Void> authorizationsTable;
-
- public ActionAuthorizationsPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new AjaxLink<Void>("addNew") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new ActionAuthorizationEditPanel(id, -1) {
-
- @Override
- protected Project getProject() {
- return ActionAuthorizationsPage.this.getProject();
- }
-
- @Override
- protected void onCancelled(AjaxRequestTarget target) {
- close();
- }
-
- @Override
- protected void onSaved(AjaxRequestTarget target) {
- target.add(authorizationsTable);
- close();
- }
-
- };
- }
-
- };
- }
-
- });
-
- List<IColumn<ActionAuthorization, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Action")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId,
- IModel<ActionAuthorization> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getActionDescription()));
- }
-
- });
-
- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("Authorized Branches")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId,
- IModel<ActionAuthorization> rowModel) {
- if (rowModel.getObject().getAuthorizedBranches() != null)
- cellItem.add(new Label(componentId, rowModel.getObject().getAuthorizedBranches()));
- else
- cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));
- }
-
- });
-
- columns.add(new AbstractColumn<ActionAuthorization, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<ActionAuthorization>> cellItem, String componentId,
- IModel<ActionAuthorization> rowModel) {
- Fragment fragment = new Fragment(componentId, "actionFrag", ActionAuthorizationsPage.this);
-
- int index = cellItem.findParent(Item.class).getIndex();
-
- fragment.add(new AjaxLink<Void>("edit") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new ActionAuthorizationEditPanel(id, index) {
-
- @Override
- protected Project getProject() {
- return ActionAuthorizationsPage.this.getProject();
- }
-
- @Override
- protected void onCancelled(AjaxRequestTarget target) {
- close();
- }
-
- @Override
- protected void onSaved(AjaxRequestTarget target) {
- target.add(authorizationsTable);
- close();
- }
-
- };
- }
-
- };
- }
-
- });
-
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- String message = "Do you really want to delete this authorization?";
- attributes.getAjaxCallListeners().add(new ConfirmClickListener(message));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- getProject().getBuildSetting().getActionAuthorizations().remove(index);
- OneDev.getInstance(ProjectManager.class).save(getProject());
- Session.get().success("Action authorization deleted");
- target.add(authorizationsTable);
- }
-
- });
-
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "actions";
- }
-
- });
-
- SortableDataProvider<ActionAuthorization, Void> dataProvider = new SortableDataProvider<ActionAuthorization, Void>() {
-
- @Override
- public Iterator<? extends ActionAuthorization> iterator(long first, long count) {
- return getProject().getBuildSetting().getActionAuthorizations().iterator();
- }
-
- @Override
- public long size() {
- return getProject().getBuildSetting().getActionAuthorizations().size();
- }
-
- @Override
- public IModel<ActionAuthorization> model(ActionAuthorization object) {
- return Model.of(object);
- }
- };
-
- add(authorizationsTable = new DefaultDataTable<>("authorizations", columns, dataProvider,
- Integer.MAX_VALUE, null));
- authorizationsTable.setOutputMarkupId(true);
- }
-
- @Override
- protected Component newProjectTitle(String componentId) {
- return new Label(componentId, "Action Authorizations");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
index 71276701ac..4c7262bf96 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
@@ -1,9 +1,14 @@
package io.onedev.server.web.page.project.setting.build;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.build.JobSecret;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -21,15 +26,9 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.build.JobSecret;
-import io.onedev.server.model.support.inputspec.SecretInput;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.component.datatable.DefaultDataTable;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.svg.SpriteImage;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
@SuppressWarnings("serial")
public class JobSecretsPage extends ProjectBuildSettingPage {
@@ -99,19 +98,19 @@ public class JobSecretsPage extends ProjectBuildSettingPage {
});
- columns.add(new AbstractColumn<JobSecret, Void>(Model.of("Authorized Branches")) {
+ columns.add(new AbstractColumn<JobSecret, Void>(Model.of("Authorization")) {
@Override
public void populateItem(Item<ICellPopulator<JobSecret>> cellItem, String componentId,
IModel<JobSecret> rowModel) {
- if (rowModel.getObject().getAuthorizedBranches() != null)
- cellItem.add(new Label(componentId, rowModel.getObject().getAuthorizedBranches()));
+ if (rowModel.getObject().getAuthorization() != null)
+ cellItem.add(new Label(componentId, rowModel.getObject().getAuthorization()));
else
- cellItem.add(new Label(componentId, "<i>All</i>").setEscapeModelStrings(false));
+ cellItem.add(new Label(componentId, "<i>All Branches</i>").setEscapeModelStrings(false));
}
});
-
+
columns.add(new AbstractColumn<JobSecret, Void>(Model.of("")) {
@Override
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 3528991349..039b3ea717 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
@@ -1,22 +1,6 @@
package io.onedev.server.web.util;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.StringUtils;
-
import com.google.common.base.Preconditions;
-
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.LinearRange;
@@ -25,39 +9,28 @@ import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobVariable;
import io.onedev.server.buildspec.param.spec.ParamSpec;
-import io.onedev.server.entitymanager.AgentAttributeManager;
-import io.onedev.server.entitymanager.AgentManager;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.BuildMetricManager;
-import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.LabelManager;
-import io.onedev.server.entitymanager.LinkSpecManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entitymanager.*;
import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.CommitInfoManager;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.facade.ProjectCache;
-import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.facade.UserCache;
+import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.util.interpolative.VariableInterpolator;
import io.onedev.server.util.match.PatternApplied;
import io.onedev.server.util.match.WildcardUtils;
-import io.onedev.server.util.script.ScriptContribution;
+import io.onedev.server.util.ScriptContribution;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.annotation.Nullable;
+import java.util.*;
+import java.util.stream.Collectors;
public class SuggestionUtils {
@@ -404,6 +377,15 @@ public class SuggestionUtils {
.collect(Collectors.toList());
return suggest(groupNames, matchWith);
}
+
+ public static List<InputSuggestion> suggestRoles(String matchWith) {
+ List<String> roleNames = OneDev.getInstance(RoleManager.class).query()
+ .stream()
+ .map(it->it.getName())
+ .sorted()
+ .collect(Collectors.toList());
+ return suggest(roleNames, matchWith);
+ }
public static List<InputSuggestion> suggestBlobs(Project project, String matchWith) {
CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
diff --git a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.java b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.java
index 75605d62a2..26477db1fd 100644
--- a/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.java
+++ b/server-plugin/server-plugin-buildspec-gradle/src/main/java/io/onedev/server/plugin/buildspec/gradle/GradleModule.java
@@ -1,37 +1,37 @@
-package io.onedev.server.plugin.buildspec.gradle;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.commons.loader.AbstractPluginModule;
-import io.onedev.server.buildspec.job.JobSuggestion;
-import io.onedev.server.model.support.administration.GroovyScript;
-import io.onedev.server.util.script.ScriptContribution;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class GradleModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- // put your guice bindings here
- contribute(JobSuggestion.class, GradleJobSuggestion.class);
-
- contribute(ScriptContribution.class, new ScriptContribution() {
-
- @Override
- public GroovyScript getScript() {
- GroovyScript script = new GroovyScript();
- script.setName(GradleJobSuggestion.DETERMINE_DOCKER_IMAGE);
- script.setContent(Lists.newArrayList("io.onedev.server.plugin.buildspec.gradle.GradleJobSuggestion.determineDockerImage()"));
- return script;
- }
-
- });
-
- }
-
-}
+package io.onedev.server.plugin.buildspec.gradle;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.loader.AbstractPluginModule;
+import io.onedev.server.buildspec.job.JobSuggestion;
+import io.onedev.server.model.support.administration.GroovyScript;
+import io.onedev.server.util.ScriptContribution;
+
+/**
+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
+ *
+ */
+public class GradleModule extends AbstractPluginModule {
+
+ @Override
+ protected void configure() {
+ super.configure();
+
+ // put your guice bindings here
+ contribute(JobSuggestion.class, GradleJobSuggestion.class);
+
+ contribute(ScriptContribution.class, new ScriptContribution() {
+
+ @Override
+ public GroovyScript getScript() {
+ GroovyScript script = new GroovyScript();
+ script.setName(GradleJobSuggestion.DETERMINE_DOCKER_IMAGE);
+ script.setContent(Lists.newArrayList("io.onedev.server.plugin.buildspec.gradle.GradleJobSuggestion.determineDockerImage()"));
+ return script;
+ }
+
+ });
+
+ }
+
+}
diff --git a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java
index 256402d7c4..0aa01808d6 100644
--- a/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java
+++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java
@@ -5,7 +5,7 @@ import com.google.common.collect.Lists;
import io.onedev.commons.loader.AbstractPluginModule;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.model.support.administration.GroovyScript;
-import io.onedev.server.util.script.ScriptContribution;
+import io.onedev.server.util.ScriptContribution;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java
index cf5d78094a..fe4a4b1250 100644
--- a/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java
+++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java
@@ -5,7 +5,7 @@ import com.google.common.collect.Lists;
import io.onedev.commons.loader.AbstractPluginModule;
import io.onedev.server.buildspec.job.JobSuggestion;
import io.onedev.server.model.support.administration.GroovyScript;
-import io.onedev.server.util.script.ScriptContribution;
+import io.onedev.server.util.ScriptContribution;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 43d4744986..2820ab4439 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -26,7 +26,7 @@ import io.onedev.server.model.support.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.jobexecutor.NodeSelectorEntry;
import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator;
-import io.onedev.server.model.support.inputspec.SecretInput;
+import io.onedev.server.buildspecmodel.inputspec.SecretInput;
import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;
import io.onedev.server.terminal.CommandlineShell;
import io.onedev.server.terminal.Shell;
diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java
index 7e9c906bbc..bd157574f3 100644
--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java
+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java
@@ -32,8 +32,7 @@ import java.util.concurrent.TimeoutException;
@Editable(order=500, name="Remote Shell Executor", description=""
+ "This executor runs build jobs with remote machines's shell facility via <a href='/~administration/agents' target='_blank'>agents</a><br>"
+ "<b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission "
- + "as corresponding agent process. Make sure it can only be used by trusted jobs via job "
- + "authorization setting")
+ + "as corresponding agent process. Make sure it can only be used by trusted jobs via job requirement setting")
@Horizontal
public class RemoteShellExecutor extends ServerShellExecutor {
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index ca5fa65c69..7760ea714c 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -106,8 +106,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
@Editable(order=500, group="More Settings", description="Whether or not to mount docker sock into job container to "
+ "support docker operations in job commands, for instance to build docker image.<br>"
+ "<b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev "
- + "by operating the mounted docker sock. You should configure job authorization "
- + "to make sure the executor can only be used by trusted jobs if this option is enabled")
+ + "by operating the mounted docker sock. You should configure job requirement above to make sure the " +
+ "executor can only be used by trusted jobs if this option is enabled")
public boolean isMountDockerSock() {
return mountDockerSock;
}
@@ -486,7 +486,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
} catch (Exception e) {
if (ExceptionUtils.find(e, InterruptedException.class) == null) {
long duration = System.currentTimeMillis() - time;
- jobLogger.error("Step \"" + stepNames + "\" is failed: (" + DateUtils.formatDuration(duration) + ")" + getErrorMessage(e));
+ jobLogger.error("Step \"" + stepNames + "\" is failed: (" + DateUtils.formatDuration(duration) + ") " + getErrorMessage(e));
}
return false;
}
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index d9105afff3..f192f5125f 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -46,11 +46,11 @@ import java.util.Map;
import static io.onedev.agent.ShellExecutorUtils.testCommands;
import static io.onedev.k8shelper.KubernetesHelper.*;
-@Editable(order=ServerShellExecutor.ORDER, name="Server Shell Executor", description=""
- + "This executor runs build jobs with OneDev server's shell facility.<br>"
- + "<b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission "
- + "as OneDev server process. Make sure it can only be used by trusted jobs via job "
- + "authorization setting")
+@Editable(order=ServerShellExecutor.ORDER, name="Server Shell Executor", description="" +
+ "This executor runs build jobs with OneDev server's shell facility.<br>" +
+ "<b class='text-danger'>WARNING</b>: Jobs running with this executor has same " +
+ "permission as OneDev server process. Make sure it can only be used by trusted " +
+ "jobs via job requirement setting")
@Horizontal
public class ServerShellExecutor extends JobExecutor implements Testable<TestData> {
@@ -265,7 +265,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
} catch (Exception e) {
if (ExceptionUtils.find(e, InterruptedException.class) == null) {
long duration = System.currentTimeMillis() - time;
- jobLogger.error("Step \"" + stepNames + "\" is failed: (" + DateUtils.formatDuration(duration) + ")" + getErrorMessage(e));
+ jobLogger.error("Step \"" + stepNames + "\" is failed: (" + DateUtils.formatDuration(duration) + ") " + getErrorMessage(e));
}
return false;
}
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
index 704c5f0ae8..cd4e07b014 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java
@@ -15,7 +15,7 @@ import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.DateUtils;
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java
index d956bfeb87..71f085daa0 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportOption.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java
index 960db3445a..0dee672195 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueLabelMapping.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
index 4de10fb44e..8f9f1fb929 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
@@ -15,7 +15,7 @@ import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.JerseyUtils;
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java
index cf2d2c3165..a7608c18c3 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportOption.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java
index e8648f73be..307f470df8 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueLabelMapping.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
index 9ad0514b34..4263a5fa87 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
@@ -16,7 +16,7 @@ import io.onedev.server.git.command.LsRemoteCommand;
import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.*;
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java
index 3d1488838e..0c0a3d8779 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportOption.java
@@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java
index ed428b3386..00b76bb61d 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueLabelMapping.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java
index 4862b25219..9f0a70bc42 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportOption.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
index 1a00876bb1..603491b293 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java
@@ -35,7 +35,6 @@ import javax.ws.rs.core.Response;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.project.issue.IssuesImported;
-import io.onedev.server.security.SecurityUtils;
import org.apache.http.client.utils.URIBuilder;
import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
@@ -66,7 +65,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.DateUtils;
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java
index 3e50bc9299..20551718bd 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssuePriorityMapping.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java
index 1d7475deae..b91d2b962e 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueTypeMapping.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
index d94f10754e..692a5f9a16 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
@@ -14,7 +14,7 @@ import io.onedev.server.event.project.issue.IssuesImported;
import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.model.support.issue.field.spec.*;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java
index 62c1d9c9b9..54c1b68e8a 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueFieldMapping.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java
index c15e786c80..940477845a 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/IssueTagMapping.java
@@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;