Skip to content

The Unified and Autonomous Development Platform

chore: Do not auto-discover shell executor for security reason

Robin Shenc3ee58f52de5
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 1d30786164..8d68a68437 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
@@ -136,9 +136,8 @@ public class Job implements NamedElement, Validatable {
return new ArrayList<>();
}
- @Editable(order=200, placeholderProvider="getJobExecutorPlaceholder", description="Optionally specify authorized " +
- "executor for this job. Leave empty to use first applicable executor (or use auto-discovered executor if " +
- "no executors are defined)")
+ @Editable(order=200, placeholderProvider="getJobExecutorPlaceholder", description="Optionally specify executor for this job. " +
+ "Leave empty to use first matching executor (or use auto-discovered executor if no executors are defined)")
@Interpolative(literalSuggester="suggestJobExecutors", variableSuggester="suggestVariables")
public String getJobExecutor() {
return jobExecutor;
@@ -153,7 +152,7 @@ public class Job implements NamedElement, Validatable {
if (OneDev.getInstance(SettingManager.class).getJobExecutors().isEmpty())
return _T("Auto-discovered executor");
else
- return _T("First applicable executor");
+ return _T("First matching executor");
}
@SuppressWarnings("unused")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
index 20fe3a2145..43b017db3c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
@@ -1,23 +1,28 @@
package io.onedev.server.buildspec.step;
+import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;
+import static java.util.stream.Collectors.toList;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.BuildImageFacade;
import io.onedev.k8shelper.StepFacade;
-import io.onedev.server.annotation.*;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.NoSpace;
+import io.onedev.server.annotation.ReservedOptions;
+import io.onedev.server.annotation.SubPath;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;
-import static java.util.stream.Collectors.toList;
-
@Editable(order=160, name="Build Image", group = DOCKER_IMAGE, description="Build docker image with docker buildx. " +
"This step can only be executed by server docker executor or remote docker executor, and it uses the buildx " +
"builder specified in these executors to do the job. To build image with Kubernetes executor, please use kaniko " +
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
index ad743944bd..c785d5acf1 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java
@@ -10,7 +10,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;
import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.model.support.administration.jobexecutor.RegistryLoginAware;
+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@@ -128,8 +128,8 @@ public class BuildImageWithKanikoStep extends CommandStep {
List<RegistryLoginFacade> registryLogins, Map<String, String> envMap,
boolean useTTY) {
var commandsBuilder = new StringBuilder();
- if (jobExecutor instanceof RegistryLoginAware) {
- RegistryLoginAware registryLoginAware = (RegistryLoginAware) jobExecutor;
+ if (jobExecutor instanceof DockerAware) {
+ DockerAware registryLoginAware = (DockerAware) jobExecutor;
commandsBuilder.append("cat <<EOF>> /kaniko/.docker/config.json\n");
var mergedRegistryLogins = merge(registryLogins, registryLoginAware.getRegistryLogins(jobToken));
commandsBuilder.append(buildDockerConfig(mergedRegistryLogins)).append("\n");
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
index 802d834832..c882bb016b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
@@ -1,5 +1,9 @@
package io.onedev.server.buildspec.step;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.CheckoutFacade;
import io.onedev.k8shelper.StepFacade;
@@ -13,9 +17,6 @@ import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
@Editable(order=50, name="Checkout Code")
public class CheckoutStep extends Step {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
index 133694696f..8b59002549 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java
@@ -146,5 +146,5 @@ public class CommandStep extends Step {
return getInterpreter().getExecutable(jobExecutor, jobToken, null, null, new ArrayList<>(), envMap, isUseTTY());
}
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java
index 14ad1f626f..e869cebed9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CraneStep.java
@@ -8,7 +8,7 @@ import io.onedev.server.annotation.Multiline;
import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;
import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.model.support.administration.jobexecutor.RegistryLoginAware;
+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;
import java.util.List;
import java.util.Map;
@@ -78,8 +78,8 @@ public abstract class CraneStep extends CommandStep {
public CommandFacade getExecutable(JobExecutor jobExecutor, String jobToken, String image, String runAs,
List<RegistryLoginFacade> registryLogins, Map<String, String> envMap, boolean useTTY) {
var commandsBuilder = new StringBuilder();
- if (jobExecutor instanceof RegistryLoginAware) {
- RegistryLoginAware registryLoginAware = (RegistryLoginAware) jobExecutor;
+ if (jobExecutor instanceof DockerAware) {
+ DockerAware registryLoginAware = (DockerAware) jobExecutor;
commandsBuilder.append("mkdir /root/.docker\n");
commandsBuilder.append("cat <<EOF>> /root/.docker/config.json\n");
var mergedRegistryLogins = merge(registryLogins, registryLoginAware.getRegistryLogins(jobToken));
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.java
index 250fc444bc..e61a71405f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PruneBuilderCacheStep.java
@@ -1,14 +1,15 @@
package io.onedev.server.buildspec.step;
+import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;
+
import io.onedev.k8shelper.PruneBuilderCacheFacade;
import io.onedev.k8shelper.StepFacade;
-import io.onedev.server.annotation.*;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.ReservedOptions;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;
-
@Editable(order=260, name="Prune Builder Cache", group = DOCKER_IMAGE, description="" +
"Prune image cache of docker buildx builder. This step calls docker builder prune command " +
"to remove cache of buildx builder specified in server docker executor or remote docker executor")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java
index b20d7ec76b..5aecd6b583 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishReportStep.java
@@ -6,12 +6,12 @@ import javax.validation.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.ExecuteCondition;
-import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.annotation.PathSegment;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.PathSegment;
import io.onedev.server.annotation.Patterns;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.util.patternset.PatternSet;
@Editable
public abstract class PublishReportStep extends ServerSideStep {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java
index 83d8d1544d..e942e7b053 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishSiteStep.java
@@ -1,5 +1,12 @@
package io.onedev.server.buildspec.step;
+import static io.onedev.server.buildspec.step.StepGroup.PUBLISH;
+
+import java.io.File;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
@@ -7,7 +14,11 @@ import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.ServerStepResult;
import io.onedev.server.OneDev;
-import io.onedev.server.annotation.*;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.Patterns;
+import io.onedev.server.annotation.ProjectChoice;
+import io.onedev.server.annotation.SubPath;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -18,12 +29,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.util.patternset.PatternSet;
-import javax.validation.constraints.NotEmpty;
-import java.io.File;
-import java.util.List;
-
-import static io.onedev.server.buildspec.step.StepGroup.PUBLISH;
-
@Editable(order=1060, name="Site", group = PUBLISH, description="This step publishes specified files to be served as project web site. "
+ "Project web site can be accessed publicly via <code>http://&lt;onedev base url&gt;/path/to/project/~site</code>")
public class PublishSiteStep extends ServerSideStep {
@@ -119,5 +124,5 @@ public class PublishSiteStep extends ServerSideStep {
return new ServerStepResult(true);
});
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java
index 401b055edc..80ba36c81f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java
@@ -1,5 +1,13 @@
package io.onedev.server.buildspec.step;
+import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.RunImagetoolsFacade;
import io.onedev.k8shelper.StepFacade;
@@ -10,13 +18,6 @@ import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import javax.validation.constraints.NotEmpty;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;
-import static java.util.stream.Collectors.toList;
-
@Editable(order=230, name="Run Buildx Image Tools", group = DOCKER_IMAGE, description="Run docker buildx imagetools " +
"command with specified arguments. This step can only be executed by server docker executor " +
"or remote docker executor")
@@ -60,5 +61,5 @@ public class RunImagetoolsStep extends Step {
var registryLogins = getRegistryLogins().stream().map(it->it.getFacade(build)).collect(toList());
return new RunImagetoolsFacade(getArguments(), registryLogins);
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java
index 6818fba61f..a66fb9e9e6 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java
@@ -1,9 +1,24 @@
package io.onedev.server.buildspec.step;
+import static io.onedev.k8shelper.SetupCacheFacade.UploadStrategy.UPLOAD_IF_CHANGED;
+import static io.onedev.k8shelper.SetupCacheFacade.UploadStrategy.UPLOAD_IF_NOT_HIT;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.k8shelper.SetupCacheFacade;
import io.onedev.k8shelper.StepFacade;
-import io.onedev.server.annotation.*;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.ProjectChoice;
+import io.onedev.server.annotation.ShowCondition;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
@@ -11,16 +26,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.util.EditContext;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.k8shelper.SetupCacheFacade.UploadStrategy.UPLOAD_IF_CHANGED;
-import static io.onedev.k8shelper.SetupCacheFacade.UploadStrategy.UPLOAD_IF_NOT_HIT;
-import static java.util.stream.Collectors.toList;
-
@Editable(order=55, name="Set Up Cache", description = "Set up job cache to speed up job execution. " +
"Check <a href='https://docs.onedev.io/tutorials/cicd/job-cache' target='_blank'>this tutorial</a> " +
"on how to use job cache")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
index e7c8d5f3a1..a72bfb5eaf 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/Step.java
@@ -4,16 +4,15 @@ import static io.onedev.k8shelper.ExecuteCondition.SUCCESSFUL;
import java.io.Serializable;
-import javax.validation.constraints.NotNull;
-
import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import io.onedev.k8shelper.Action;
import io.onedev.k8shelper.ExecuteCondition;
import io.onedev.k8shelper.StepFacade;
+import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
-import io.onedev.server.annotation.Editable;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
@Editable
@@ -68,5 +67,5 @@ public abstract class Step implements Serializable {
}
public abstract StepFacade getFacade(Build build, JobExecutor jobExecutor, String jobToken, ParamCombination paramCombination);
-
+
}
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 b77aa6487e..5c6a2675eb 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
@@ -538,15 +538,15 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
if (!jobExecutor.isEnabled())
throw new ExplicitException("Specified job executor '" + jobExecutorName + "' is disabled");
else if (!isApplicable(jobExecutor, build))
- throw new ExplicitException("Specified job executor '" + jobExecutorName + "' is not authorized for current job");
- else
+ throw new ExplicitException("Specified job executor '" + jobExecutorName + "' is not applicable for current job");
+ else
return jobExecutor;
} else {
throw new ExplicitException("Unable to find specified job executor '" + jobExecutorName + "'");
}
} else {
if (!settingManager.getJobExecutors().isEmpty()) {
- for (JobExecutor executor : settingManager.getJobExecutors()) {
+ for (var executor : settingManager.getJobExecutors()) {
if (executor.isEnabled() && isApplicable(executor, build))
return executor;
}
@@ -555,21 +555,20 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
jobLogger.log("No job executor defined, auto-discovering...");
List<JobExecutorDiscoverer> discoverers = new ArrayList<>(OneDev.getExtensions(JobExecutorDiscoverer.class));
discoverers.sort(Comparator.comparing(JobExecutorDiscoverer::getOrder));
- for (JobExecutorDiscoverer discoverer : discoverers) {
+ for (var discoverer : discoverers) {
JobExecutor jobExecutor = discoverer.discover();
if (jobExecutor != null) {
jobExecutor.setName("auto-discovered");
- jobLogger.log("Discovered job executor type: "
- + EditableUtils.getDisplayName(jobExecutor.getClass()));
+ jobLogger.log("Discovered " + EditableUtils.getDisplayName(jobExecutor.getClass()).toLowerCase());
return jobExecutor;
}
}
- throw new ExplicitException("No job executor discovered");
+ throw new ExplicitException("No applicable job executor discovered");
}
}
}
- private Future<Boolean> execute(Build build) {
+ private Future<Boolean> execute(Build build) {
String jobToken = build.getJobToken();
VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLoginAware.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/DockerAware.java
similarity index 84%
rename from server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLoginAware.java
rename to server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/DockerAware.java
index 1cf678b268..ede9eee96e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/RegistryLoginAware.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/DockerAware.java
@@ -4,8 +4,8 @@ import io.onedev.k8shelper.RegistryLoginFacade;
import java.util.List;
-public interface RegistryLoginAware {
+public interface DockerAware {
List<RegistryLoginFacade> getRegistryLogins(String jobToken);
-
+
}
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 5aa2282a5e..61fe108e8b 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
@@ -59,7 +59,7 @@ public abstract class JobExecutor implements Serializable {
this.name = name;
}
- @Editable(order=30, group = "Privilege Settings", description="Enable this to allow to run site publish step. OneDev will serve project "
+ @Editable(order=30, name="Enable Site Publish", group = "Privilege Settings", description="Enable this to allow to run site publish step. OneDev will serve project "
+ "site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs")
public boolean isSitePublishEnabled() {
return sitePublishEnabled;
@@ -69,7 +69,7 @@ public abstract class JobExecutor implements Serializable {
this.sitePublishEnabled = sitePublishEnabled;
}
- @Editable(order=40, group = "Privilege Settings", description = "Enable this to allow to run html report publish step. To avoid XSS attach, " +
+ @Editable(order=40, name="Enable Html Report Publish", group = "Privilege Settings", description = "Enable this to allow to run html report publish step. To avoid XSS attack, " +
"make sure this executor can only be used by trusted jobs")
public boolean isHtmlReportPublishEnabled() {
return htmlReportPublishEnabled;
@@ -84,7 +84,7 @@ public abstract class JobExecutor implements Serializable {
return WicketUtils.isSubscriptionActive();
}
- @Editable(order=10000, placeholder="Any job", description="Optionally specify job requirement of this executor")
+ @Editable(order=10000, name="Applicable Jobs", placeholder="Any job", description="Optionally specify applicable jobs of this executor")
@io.onedev.server.annotation.JobMatch(withProjectCriteria = true, withJobCriteria = true)
@Nullable
public String getJobRequirement() {
@@ -100,7 +100,7 @@ public abstract class JobExecutor implements Serializable {
public Usage onDeleteProject(String projectPath) {
Usage usage = new Usage();
if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingProject(projectPath)) {
- usage.add("job requirement" );
+ usage.add("applicable jobs" );
}
return usage;
}
@@ -116,7 +116,7 @@ public abstract class JobExecutor implements Serializable {
public Usage onDeleteUser(String userName) {
Usage usage = new Usage();
if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingUser(userName)) {
- usage.add("job requirement");
+ usage.add("applicable jobs");
}
return usage;
}
@@ -132,7 +132,7 @@ public abstract class JobExecutor implements Serializable {
public Usage onDeleteGroup(String groupName) {
Usage usage = new Usage();
if (jobRequirement != null && JobMatch.parse(jobRequirement, true, true).isUsingGroup(groupName)) {
- usage.add("job requirement");
+ usage.add("applicable jobs");
}
return usage;
}
@@ -144,22 +144,6 @@ public abstract class JobExecutor implements Serializable {
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();
- }
- }
protected void notifyJobRunning(Long buildId, @Nullable Long agentId) {
OneDev.getInstance(TransactionManager.class).run(() -> {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/KubernetesAware.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/KubernetesAware.java
new file mode 100644
index 0000000000..80ee086922
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/KubernetesAware.java
@@ -0,0 +1,5 @@
+package io.onedev.server.model.support.administration.jobexecutor;
+
+public interface KubernetesAware extends DockerAware {
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
index bdbaf9006f..48d059ecf3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
@@ -2,12 +2,15 @@
<div class="job-executors">
<div class="body">
<div wicket:id="jobExecutorSetting">
+ <div wicket:id="withExecutors" class="alert alert-info mb-5">
+ <wicket:t>For a particular job, the first matching executor will be used</wicket:t>
+ </div>
+ <div wicket:id="withoutExecutors" class="alert alert-info mb-5">
+ <wicket:t>No executors defined. Jobs will use auto-discovered executors</wicket:t>
+ </div>
<ul class="list-unstyled">
<li wicket:id="executors" class="executor mb-5"><div wicket:id="executor"></div></li>
</ul>
- <div wicket:id="noExecutors" class="alert alert-info mb-5">
- <wicket:t>No executors defined. Jobs will use auto-discovered executor</wicket:t>
- </div>
<div wicket:id="newExecutor"></div>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
index c29a66d2b4..966b90d57a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
@@ -93,7 +93,14 @@ public class JobExecutorsPage extends AdministrationPage {
}.items("li.executor").handle(".card-header"));
container.add(newAddNewFrag());
- container.add(new WebMarkupContainer("noExecutors") {
+ container.add(new WebMarkupContainer("withExecutors") {
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getSettingManager().getJobExecutors().isEmpty());
+ }
+ });
+ container.add(new WebMarkupContainer("withoutExecutors") {
@Override
protected void onConfigure() {
super.onConfigure();
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java
index 634dad68e8..5dbfe3046b 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java
@@ -1130,8 +1130,8 @@ public class Translation_zh extends TranslationResourceBundle {
m.put("Enable this if the access token has same permissions as the owner", "如果访问令牌具有与所有者相同的权限,则启用");
m.put("Enable this option to merge the pull request automatically when ready (all reviewers approved, all required jobs passed etc.)",
"启用此选项以在准备好时自动合并合并请求(所有审查者批准,所有必需的任务通过等)");
- m.put("Enable this to allow to run html report publish step. To avoid XSS attach, make sure this executor can only be used by trusted jobs",
- "启用此选项以允许运行 HTML 报告发布步骤。为避免 XSS 附件,请确保此执行器只能由受信任的任务使用");
+ m.put("Enable this to allow to run html report publish step. To avoid XSS attack, make sure this executor can only be used by trusted jobs",
+ "启用此选项以允许运行 HTML 报告发布步骤。为避免 XSS 攻击,请确保此执行器只能由受信任的任务使用");
m.put("Enable this to allow to run site publish step. OneDev will serve project site files as is. To avoid XSS attack, make sure this executor can only be used by trusted jobs",
"启用此选项以允许运行站点发布步骤。OneDev 将按原样提供项目站点文件。为避免 XSS 攻击,请确保此执行器只能由受信任的任务使用");
m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",
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 73c2ce0ad3..c9cd67d519 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
@@ -66,7 +66,7 @@ import static org.apache.commons.codec.binary.Base64.encodeBase64String;
+ "No any agents are required."
+ "<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system "
+ "settings as job pods need to access it to download source and artifacts")
-public class KubernetesExecutor extends JobExecutor implements RegistryLoginAware, Testable<TestData> {
+public class KubernetesExecutor extends JobExecutor implements KubernetesAware, Testable<TestData> {
private static final long serialVersionUID = 1L;
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 0e461dac7f..b1da96d55a 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
@@ -29,8 +29,8 @@ import static io.onedev.agent.WebsocketUtils.call;
@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 requirement setting")
+ + "<b class='text-danger'>WARNING</b>: Jobs running with this executor has same permission as OneDev agent process. "
+ + "Make sure it can only be used by trusted jobs")
public class RemoteShellExecutor extends ServerShellExecutor {
private static final long serialVersionUID = 1L;
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 642ee91523..53130a3682 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
@@ -85,7 +85,7 @@ import io.onedev.server.job.ResourceAllocator;
import io.onedev.server.job.ServerCacheHelper;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.jobexecutor.RegistryLogin;
-import io.onedev.server.model.support.administration.jobexecutor.RegistryLoginAware;
+import io.onedev.server.model.support.administration.jobexecutor.DockerAware;
import io.onedev.server.plugin.executor.serverdocker.ServerDockerExecutor.TestData;
import io.onedev.server.terminal.CommandlineShell;
import io.onedev.server.terminal.Shell;
@@ -96,7 +96,7 @@ import io.onedev.server.web.util.Testable;
@Editable(order=ServerDockerExecutor.ORDER, name="Server Docker Executor",
description="This executor runs build jobs as docker containers on OneDev server")
@ClassValidating
-public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAware, Testable<TestData>, Validatable {
+public class ServerDockerExecutor extends JobExecutor implements DockerAware, Testable<TestData>, Validatable {
private static final long serialVersionUID = 1L;
@@ -192,8 +192,8 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAw
@Editable(order=520, group="Privilege Settings", description="Whether or not to mount docker sock into job container to "
+ "support docker operations in job commands<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 requirement above to make sure the " +
- "executor can only be used by trusted jobs if this option is enabled")
+ + "by operating the mounted docker sock. Make sure this executor can only be used by "
+ + "trusted jobs if this option is enabled")
public boolean isMountDockerSock() {
return mountDockerSock;
}
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 9aa74ae228..54f5b4e415 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
@@ -65,8 +65,7 @@ import io.onedev.server.web.util.Testable;
@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")
+ "permission as OneDev server process. Make sure it can only be used by trusted jobs")
public class ServerShellExecutor extends JobExecutor implements Testable<TestData> {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java
index 7b0975cc4f..258b912ba7 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java
@@ -7,7 +7,6 @@ import com.google.common.collect.Sets;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AbstractPluginModule;
import io.onedev.commons.loader.ImplementationProvider;
-import io.onedev.server.buildspec.job.JobExecutorDiscoverer;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
/**
@@ -35,20 +34,7 @@ public class ServerShellModule extends AbstractPluginModule {
}
});
-
- contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {
-
- @Override
- public JobExecutor discover() {
- return new ServerShellExecutor();
- }
-
- @Override
- public int getOrder() {
- return ServerShellExecutor.ORDER;
- }
-
- });
+
}
}
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java
index c76366929f..0718814237 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/PublishHtmlReportStep.java
@@ -1,5 +1,13 @@
package io.onedev.server.plugin.report.html;
+import static io.onedev.commons.utils.LockUtils.write;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.TaskLogger;
@@ -17,13 +25,6 @@ import io.onedev.server.job.JobManager;
import io.onedev.server.model.Build;
import io.onedev.server.persistence.SessionManager;
-import javax.validation.constraints.NotEmpty;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import static io.onedev.commons.utils.LockUtils.write;
-
@Editable(order=1070, group= StepGroup.PUBLISH, name="Html Report")
public class PublishHtmlReportStep extends PublishReportStep {