The Unified and Autonomous Development Platform
Fix issue #798 - Option to trust self-signed certificates
Robin Shen2092e752dabe
diff --git a/pom.xml b/pom.xmlindex 59a9db605d..366c847d9a 100644--- a/pom.xml+++ b/pom.xml@@ -619,8 +619,8 @@</repository></repositories><properties>- <commons.version>2.7.10</commons.version>- <agent.version>1.7.27</agent.version>+ <commons.version>2.7.11</commons.version>+ <agent.version>1.8.1</agent.version><slf4j.version>1.7.36</slf4j.version><logback.version>1.2.11</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 1ecc91671a..d311fdc249 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -28,8 +28,10 @@ import javax.validation.Validation;import javax.validation.Validator;import javax.validation.ValidatorFactory;+import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.entitymanager.*;import io.onedev.server.entitymanager.impl.*;+import nl.altindag.ssl.SSLFactory;import org.apache.shiro.authc.credential.PasswordService;import org.apache.shiro.guice.aop.ShiroAopModule;import org.apache.shiro.mgt.RememberMeManager;@@ -286,15 +288,16 @@ public class CoreModule extends AbstractPluginModule {configureSecurity();configureRestful();configureWeb();- configureSsh();configureGit();configureBuild();configureCluster();-+/** Declare bindings explicitly instead of using ImplementedBy annotation as* HK2 to guice bridge can only search in explicit bindings in Guice*/+ bind(SshAuthenticator.class).to(DefaultSshAuthenticator.class);+ bind(SshManager.class).to(DefaultSshManager.class);bind(MarkdownManager.class).to(DefaultMarkdownManager.class);bind(StorageManager.class).to(DefaultStorageManager.class);bind(SettingManager.class).to(DefaultSettingManager.class);@@ -462,11 +465,6 @@ public class CoreModule extends AbstractPluginModule {bind(ClusterManager.class).to(DefaultClusterManager.class);}- private void configureSsh() {- bind(SshAuthenticator.class).to(DefaultSshAuthenticator.class);- bind(SshManager.class).to(DefaultSshManager.class);- }-private void configureSecurity() {contributeFromPackage(Realm.class, AbstractAuthorizingRealm.class);@@ -490,6 +488,10 @@ public class CoreModule extends AbstractPluginModule {});contributeFromPackage(Authenticator.class, Authenticator.class);++ bind(SSLFactory.class).toProvider(() -> {+ return KubernetesHelper.buildSSLFactory(Bootstrap.getTrustCertsDir());+ }).in(Singleton.class);}private void configureGit() {diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 117b606d7a..ba186a02b8 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -1,42 +1,8 @@package io.onedev.server;-import java.io.File;-import java.io.IOException;-import java.io.ObjectStreamException;-import java.io.Serializable;-import java.net.DatagramSocket;-import java.net.InetAddress;-import java.net.InetSocketAddress;-import java.net.ServerSocket;-import java.net.Socket;-import java.net.UnknownHostException;-import java.nio.charset.Charset;-import java.sql.Connection;-import java.util.Date;-import java.util.List;-import java.util.Properties;-import java.util.Set;-import java.util.concurrent.Callable;-import java.util.concurrent.ExecutorService;-import java.util.concurrent.atomic.AtomicReference;--import javax.annotation.Nullable;-import javax.inject.Inject;--import io.onedev.server.exception.SystemNotReadyException;-import org.apache.commons.lang.math.RandomUtils;-import org.apache.commons.lang3.StringUtils;-import org.apache.commons.lang3.SystemUtils;-import org.apache.wicket.request.Url;-import org.eclipse.jgit.util.FS.FileStoreAttributes;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import com.google.inject.Provider;import com.hazelcast.core.HazelcastInstance;import com.hazelcast.cp.IAtomicLong;--import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AbstractPlugin;import io.onedev.commons.loader.AppLoader;import io.onedev.commons.loader.ManagedSerializedForm;@@ -50,18 +16,38 @@ import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStarting;import io.onedev.server.event.system.SystemStopped;import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.exception.SystemNotReadyException;import io.onedev.server.jetty.JettyLauncher;-import io.onedev.server.persistence.ConnectionCallable;-import io.onedev.server.persistence.DataManager;-import io.onedev.server.persistence.IdManager;-import io.onedev.server.persistence.SessionFactoryManager;-import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.*;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.UrlUtils;import io.onedev.server.util.init.InitStage;import io.onedev.server.util.init.ManualConfig;import io.onedev.server.util.schedule.TaskScheduler;+import org.apache.commons.lang.math.RandomUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.request.Url;+import org.eclipse.jgit.util.FS.FileStoreAttributes;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.inject.Inject;+import java.io.File;+import java.io.IOException;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.net.ServerSocket;+import java.nio.charset.Charset;+import java.sql.Connection;+import java.util.Date;+import java.util.List;+import java.util.Properties;+import java.util.Set;+import java.util.concurrent.Callable;+import java.util.concurrent.ExecutorService;+import java.util.concurrent.atomic.AtomicReference;public class OneDev extends AbstractPlugin implements Serializable {@@ -112,7 +98,7 @@ public class OneDev extends AbstractPlugin implements Serializable {this.idManager = idManager;this.settingManager = settingManager;this.sessionFactoryManager = sessionFactoryManager;-+initStage = new InitStage("Server is Starting...");}diff --git a/server-core/src/main/java/io/onedev/server/ServerConfig.java b/server-core/src/main/java/io/onedev/server/ServerConfig.javaindex 8e4c32bdf9..9b44c62f87 100644--- a/server-core/src/main/java/io/onedev/server/ServerConfig.java+++ b/server-core/src/main/java/io/onedev/server/ServerConfig.java@@ -1,8 +1,5 @@package io.onedev.server;-import javax.annotation.Nullable;-import java.io.File;-public interface ServerConfig {/**@@ -13,9 +10,6 @@ public interface ServerConfig {*/int getHttpPort();- @Nullable- File getTrustCertsDir();-/*** Get ssh port configured for the server.* <p>diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 43f05a05a0..d50c38574c 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@@ -73,6 +73,7 @@ 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;+import nl.altindag.ssl.SSLFactory;import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;import org.eclipse.jgit.lib.ObjectId;@@ -157,6 +158,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final StorageManager storageManager;private final GitService gitService;++ private final SSLFactory sslFactory;private volatile Thread thread;@@ -172,7 +175,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager,ProjectManager projectManager, Validator validator, TaskScheduler taskScheduler,ClusterManager clusterManager, CodeIndexManager codeIndexManager, StorageManager storageManager,- PullRequestManager pullRequestManager, GitService gitService) {+ PullRequestManager pullRequestManager, GitService gitService, SSLFactory sslFactory) {this.settingManager = settingManager;this.buildManager = buildManager;this.userManager = userManager;@@ -190,6 +193,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthis.storageManager = storageManager;this.pullRequestManager = pullRequestManager;this.gitService = gitService;+ this.sslFactory = sslFactory;}public Object writeReplace() throws ObjectStreamException {@@ -1531,7 +1535,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizboolean callByAgent, TaskLogger logger) {UUID storageServerUUID = projectManager.getStorageServerUUID(jobContext.getProjectId(), true);if (storageServerUUID.equals(clusterManager.getLocalServerUUID())) {-// Some steps need the commit to be indexed, for instance various// report publishing steps need to query the full blob path based// on a partial path (java package/class etc)@@ -1584,8 +1587,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});} else {String serverUrl = clusterManager.getServerUrl(storageServerUUID);- return KubernetesHelper.runServerStep(serverUrl, jobContext.getJobToken(), stepPosition,- inputDir, Lists.newArrayList("**"), Lists.newArrayList(), placeholderValues, logger);+ return KubernetesHelper.runServerStep(sslFactory, serverUrl, jobContext.getJobToken(),+ stepPosition, inputDir, Lists.newArrayList("**"), Lists.newArrayList(),+ placeholderValues, logger);}}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.javaindex 45eb21f922..ddb70c4d52 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@@ -2,10 +2,8 @@ package io.onedev.server.model.support.administration.jobexecutor;import com.google.common.base.Throwables;import io.onedev.commons.loader.ExtensionPoint;-import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;-import io.onedev.server.ServerConfig;import io.onedev.server.entitymanager.AgentManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.ListenerRegistry;@@ -24,14 +22,8 @@ import io.onedev.server.web.editable.annotation.ShowCondition;import javax.annotation.Nullable;import javax.validation.constraints.NotEmpty;import javax.ws.rs.core.Response;-import java.io.File;-import java.io.IOException;import java.io.Serializable;-import java.util.ArrayList;import java.util.Date;-import java.util.List;--import static java.nio.charset.StandardCharsets.UTF_8;@ExtensionPoint@Editable@@ -177,23 +169,6 @@ public abstract class JobExecutor implements Serializable {});}- protected List<String> getTrustCertContent() {- List<String> trustCertContent = new ArrayList<>();- ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);- if (serverConfig.getTrustCertsDir() != null) {- for (File file: serverConfig.getTrustCertsDir().listFiles()) {- if (file.isFile()) {- try {- trustCertContent.addAll(FileUtils.readLines(file, UTF_8));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }- }- return trustCertContent;- }-protected String getErrorMessage(Exception exception) {Response response = ExceptionUtils.buildResponse(exception);if (response != null)diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.javaindex 0fba627513..150997e93a 100644--- a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapAuthenticator.java@@ -1,35 +1,5 @@package io.onedev.server.plugin.authenticator.ldap;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.Hashtable;-import java.util.List;--import javax.annotation.Nullable;-import javax.naming.AuthenticationException;-import javax.naming.CompositeName;-import javax.naming.Context;-import javax.naming.InvalidNameException;-import javax.naming.Name;-import javax.naming.NamingEnumeration;-import javax.naming.NamingException;-import javax.naming.PartialResultException;-import javax.naming.directory.Attribute;-import javax.naming.directory.Attributes;-import javax.naming.directory.DirContext;-import javax.naming.directory.InitialDirContext;-import javax.naming.directory.SearchControls;-import javax.naming.directory.SearchResult;-import javax.validation.constraints.NotEmpty;-import javax.validation.constraints.NotNull;--import org.apache.shiro.authc.AccountException;-import org.apache.shiro.authc.UnknownAccountException;-import org.apache.shiro.authc.UsernamePasswordToken;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.support.administration.authenticator.Authenticated;import io.onedev.server.model.support.administration.authenticator.Authenticator;@@ -37,6 +7,18 @@ import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;import io.onedev.server.web.editable.annotation.ShowCondition;+import org.apache.shiro.authc.AccountException;+import org.apache.shiro.authc.UnknownAccountException;+import org.apache.shiro.authc.UsernamePasswordToken;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import javax.annotation.Nullable;+import javax.naming.*;+import javax.naming.directory.*;+import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.NotNull;+import java.util.*;@Editable(name="Generic LDAP", order=200)public class LdapAuthenticator extends Authenticator {@@ -227,6 +209,8 @@ public class LdapAuthenticator extends Authenticator {searchControls.setReturningObjFlag(true);Hashtable<String, String> ldapEnv = new Hashtable<>();+ if (getLdapUrl().trim().startsWith("ldaps"))+ ldapEnv.put("java.naming.ldap.factory.socket", LdapSSLSocketFactory.class.getName());ldapEnv.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");ldapEnv.put(Context.PROVIDER_URL, getLdapUrl());ldapEnv.put(Context.SECURITY_AUTHENTICATION, "simple");diff --git a/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapSSLSocketFactory.java b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapSSLSocketFactory.javanew file mode 100644index 0000000000..d54f9aac71--- /dev/null+++ b/server-plugin/server-plugin-authenticator-ldap/src/main/java/io/onedev/server/plugin/authenticator/ldap/LdapSSLSocketFactory.java@@ -0,0 +1,14 @@+package io.onedev.server.plugin.authenticator.ldap;++import io.onedev.server.OneDev;+import nl.altindag.ssl.SSLFactory;++import javax.net.ssl.SSLSocketFactory;++public abstract class LdapSSLSocketFactory extends SSLSocketFactory {++ public static SSLSocketFactory getDefault() {+ return OneDev.getInstance(SSLFactory.class).getSslSocketFactory();+ }++}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.javaindex 2399793d5a..fa685ffba6 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@@ -8,13 +8,13 @@ import com.google.common.base.Splitter;import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.agent.job.FailedException;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.utils.*;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.ExecutionResult;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.k8shelper.*;import io.onedev.server.OneDev;-import io.onedev.server.ServerConfig;import io.onedev.server.buildspec.Service;import io.onedev.server.buildspec.job.EnvVar;import io.onedev.server.cluster.ClusterManager;@@ -617,14 +617,13 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData@Nullableprivate String createTrustCertsConfigMap(String namespace, TaskLogger jobLogger) {Map<String, String> configMapData = new LinkedHashMap<>();- ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);- File trustCertsDir = serverConfig.getTrustCertsDir();- if (trustCertsDir != null) {+ File trustCertsDir = new File(Bootstrap.getConfDir(), "trust-certs");+ if (trustCertsDir.exists()) {for (File file: trustCertsDir.listFiles()) {- if (file.isFile()) {+ if (file.isFile() && !file.isHidden()) {try {- configMapData.put("specified-cert-" + file.getName(),- FileUtils.readFileToString(file, StandardCharsets.UTF_8));+ byte[] fileContent = FileUtils.readFileToByteArray(file);+ configMapData.put(file.getName(), Base64.encodeBase64String(fileContent));} catch (IOException e) {throw new RuntimeException(e);}@@ -638,7 +637,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"metadata", CollectionUtils.newLinkedHashMap("name", "trust-certs","namespace", namespace),- "data", configMapData);+ "binaryData", configMapData);return createResource(configMapDef, new HashSet<>(), jobLogger);} else {return null;@@ -865,10 +864,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataList<Map<Object, Object>> containerSpecs = new ArrayList<>();String containerBuildHome;- String containerCommandHome;+ String containerCommandDir;String containerCacheHome;- String containerAuthInfoHome;- String trustCertsHome;+ String containerAuthInfoDir;+ String containerTrustCertsDir;String dockerSock;String containerdSock;String containerWorkspace;@@ -876,18 +875,18 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDatacontainerBuildHome = "C:\\onedev-build";containerWorkspace = containerBuildHome + "\\workspace";containerCacheHome = containerBuildHome + "\\cache";- containerCommandHome = containerBuildHome + "\\command";- containerAuthInfoHome = "C:\\Users\\ContainerAdministrator\\auth-info";- trustCertsHome = containerBuildHome + "\\trust-certs";+ containerCommandDir = containerBuildHome + "\\command";+ containerAuthInfoDir = "C:\\Users\\ContainerAdministrator\\auth-info";+ containerTrustCertsDir = containerBuildHome + "\\trust-certs";dockerSock = "\\\\.\\pipe\\docker_engine";containerdSock = "\\\\.\\pipe\\containerd-containerd";} else {containerBuildHome = "/onedev-build";containerWorkspace = containerBuildHome +"/workspace";containerCacheHome = containerBuildHome + "/cache";- containerCommandHome = containerBuildHome + "/command";- containerAuthInfoHome = "/root/auth-info";- trustCertsHome = containerBuildHome + "/trust-certs";+ containerCommandDir = containerBuildHome + "/command";+ containerAuthInfoDir = "/root/auth-info";+ containerTrustCertsDir = containerBuildHome + "/trust-certs";dockerSock = "/var/run/docker.sock";containerdSock = "/run/containerd/containerd.sock";}@@ -896,20 +895,20 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"name", "build-home","mountPath", containerBuildHome);Map<String, String> authInfoMount = CollectionUtils.newLinkedHashMap(- "name", "auth-info-home",- "mountPath", containerAuthInfoHome);+ "name", "auth-info",+ "mountPath", containerAuthInfoDir);// Windows nanoserver default user is ContainerUserMap<String, String> authInfoMount2 = CollectionUtils.newLinkedHashMap(- "name", "auth-info-home",+ "name", "auth-info","mountPath", "C:\\Users\\ContainerUser\\auth-info");Map<String, String> cacheHomeMount = CollectionUtils.newLinkedHashMap("name", "cache-home","mountPath", containerCacheHome);Map<String, String> trustCertsMount = CollectionUtils.newLinkedHashMap(- "name", "trust-certs-home",- "mountPath", trustCertsHome);+ "name", "trust-certs",+ "mountPath", containerTrustCertsDir);Map<String, String> dockerSockMount = CollectionUtils.newLinkedHashMap("name", "docker-sock","mountPath", dockerSock);@@ -1041,10 +1040,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataString positionStr = stringifyStepPosition(position);if (osInfo.isLinux()) {stepContainerSpec.put("command", Lists.newArrayList("sh"));- stepContainerSpec.put("args", Lists.newArrayList(containerCommandHome + "/" + positionStr + ".sh"));+ stepContainerSpec.put("args", Lists.newArrayList(containerCommandDir + "/" + positionStr + ".sh"));} else {stepContainerSpec.put("command", Lists.newArrayList("cmd"));- stepContainerSpec.put("args", Lists.newArrayList("/c", containerCommandHome + "\\" + positionStr + ".bat"));+ stepContainerSpec.put("args", Lists.newArrayList("/c", containerCommandDir + "\\" + positionStr + ".bat"));}Map<Object, Object> requestsSpec = CollectionUtils.newLinkedHashMap(@@ -1132,7 +1131,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData"name", "build-home","emptyDir", CollectionUtils.newLinkedHashMap());Map<Object, Object> userHomeVolume = CollectionUtils.newLinkedHashMap(- "name", "auth-info-home",+ "name", "auth-info","emptyDir", CollectionUtils.newLinkedHashMap());Map<Object, Object> cacheHomeVolume = CollectionUtils.newLinkedHashMap("name", "cache-home",@@ -1142,7 +1141,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataList<Object> volumes = Lists.<Object>newArrayList(buildHomeVolume, userHomeVolume, cacheHomeVolume);if (trustCertsConfigMapName != null) {volumes.add(CollectionUtils.newLinkedHashMap(- "name", "trust-certs-home",+ "name", "trust-certs","configMap", CollectionUtils.newLinkedHashMap("name", trustCertsConfigMapName)));}diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.javaindex 59d91b795a..fb1881aefa 100644--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java@@ -117,11 +117,10 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {services.add(service.toMap());String jobToken = jobContext.getJobToken();- List<String> trustCertContent = getTrustCertContent();DockerJobData jobData = new DockerJobData(jobToken, getName(), jobContext.getProjectPath(),jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),jobContext.getBuildNumber(), jobContext.getActions(), jobContext.getRetried(),- services, registryLogins, isMountDockerSock(), getDockerSockPath(), trustCertContent,+ services, registryLogins, isMountDockerSock(), getDockerSockPath(),getCpuLimit(), getMemoryLimit(), getRunOptions());try {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.javaindex 18d7b483c1..7e9c906bbc 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@@ -26,7 +26,6 @@ import io.onedev.server.web.editable.annotation.Numeric;import org.eclipse.jetty.websocket.api.Session;import java.io.File;-import java.util.List;import java.util.UUID;import java.util.concurrent.TimeoutException;@@ -110,10 +109,9 @@ public class RemoteShellExecutor extends ServerShellExecutor {}String jobToken = jobContext.getJobToken();- List<String> trustCertContent = getTrustCertContent();ShellJobData jobData = new ShellJobData(jobToken, getName(), jobContext.getProjectPath(),jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),- jobContext.getBuildNumber(), jobContext.getActions(), trustCertContent);+ jobContext.getBuildNumber(), jobContext.getActions());try {WebsocketUtils.call(agentSession, jobData, 0);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.javaindex 8de168cab0..15fd1bcc13 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@@ -269,7 +269,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaFile hostWorkspace = new File(hostBuildHome, "workspace");FileUtils.createDir(hostWorkspace);- AtomicReference<File> hostAuthInfoHome = new AtomicReference<>(null);+ AtomicReference<File> hostAuthInfoDir = new AtomicReference<>(null);try {cache.installSymbolinks(hostWorkspace);@@ -278,12 +278,15 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaString containerBuildHome;String containerWorkspace;+ String containerTrustCerts;if (SystemUtils.IS_OS_WINDOWS) {containerBuildHome = "C:\\onedev-build";containerWorkspace = "C:\\onedev-build\\workspace";+ containerTrustCerts = "C:\\onedev-build\\trust-certs.pem";} else {containerBuildHome = "/onedev-build";containerWorkspace = "/onedev-build/workspace";+ containerTrustCerts = "/onedev-build/trust-certs.pem";}getJobManager().reportJobWorkspace(jobContext, containerWorkspace);@@ -344,8 +347,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa}}- if (hostAuthInfoHome.get() != null) {- String hostPath = getHostPath(hostAuthInfoHome.get().getAbsolutePath());+ if (hostAuthInfoDir.get() != null) {+ String hostPath = getHostPath(hostAuthInfoDir.get().getAbsolutePath());if (SystemUtils.IS_OS_WINDOWS) {docker.addArgs("-v", hostPath + ":C:\\Users\\ContainerAdministrator\\auth-info");docker.addArgs("-v", hostPath + ":C:\\Users\\ContainerUser\\auth-info");@@ -397,7 +400,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa}Commandline entrypoint = DockerExecutorUtils.getEntrypoint(- hostBuildHome, commandFacade, osInfo, hostAuthInfoHome.get() != null);+ hostBuildHome, commandFacade, osInfo, hostAuthInfoDir.get() != null);int exitCode = runStepContainer(execution.getImage(), entrypoint.executable(),entrypoint.arguments(), new HashMap<>(), null, new HashMap<>(),@@ -429,9 +432,9 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaCommandline git = new Commandline(AppLoader.getInstance(GitLocation.class).getExecutable());- if (hostAuthInfoHome.get() == null)- hostAuthInfoHome.set(FileUtils.createTempDir());- git.environments().put("HOME", hostAuthInfoHome.get().getAbsolutePath());+ if (hostAuthInfoDir.get() == null)+ hostAuthInfoDir.set(FileUtils.createTempDir());+ git.environments().put("HOME", hostAuthInfoDir.get().getAbsolutePath());checkoutFacade.setupWorkingDir(git, hostWorkspace);if (!Bootstrap.isInDocker()) {@@ -439,17 +442,20 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDanewInfoLogger(jobLogger), newErrorLogger(jobLogger));}- List<String> trustCertContent = getTrustCertContent();- if (!trustCertContent.isEmpty()) {- installGitCert(new File(hostAuthInfoHome.get(), "trust-cert.pem"), trustCertContent,- git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));- }+ File trustCertsFile = new File(hostBuildHome, "trust-certs.pem");+ installGitCert(git, Bootstrap.getTrustCertsDir(),+ trustCertsFile, containerTrustCerts,+ ExecutorUtils.newInfoLogger(jobLogger),+ ExecutorUtils.newWarningLogger(jobLogger));CloneInfo cloneInfo = checkoutFacade.getCloneInfo();- cloneInfo.writeAuthData(hostAuthInfoHome.get(), git, true,+ cloneInfo.writeAuthData(hostAuthInfoDir.get(), git, true,ExecutorUtils.newInfoLogger(jobLogger),ExecutorUtils.newWarningLogger(jobLogger));+ if (trustCertsFile.exists())+ git.addArgs("-c", "http.sslCAInfo=" + trustCertsFile.getAbsolutePath());+int cloneDepth = checkoutFacade.getCloneDepth();cloneRepository(git, jobContext.getProjectGitDir(), cloneInfo.getCloneUrl(),@@ -499,8 +505,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa// Fix https://code.onedev.io/onedev/server/~issues/597if (SystemUtils.IS_OS_WINDOWS)FileUtils.deleteDir(hostWorkspace);- if (hostAuthInfoHome.get() != null)- FileUtils.deleteDir(hostAuthInfoHome.get());+ if (hostAuthInfoDir.get() != null)+ FileUtils.deleteDir(hostAuthInfoDir.get());}} finally {deleteNetwork(newDocker(), network, jobLogger);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.javaindex fd0aa06a3b..5a46145f5f 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@@ -63,7 +63,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatprivate transient volatile LeafFacade runningStep;- private transient volatile File buildDir;+ private transient volatile File buildHome;@Editable(order=1000, placeholder = "Number of server cpu",description = "Specify max number of jobs this executor can run concurrently")@@ -123,8 +123,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat+ "directly on bare metal/virtual machine");}- buildDir = FileUtils.createTempDir("onedev-build");- File workspaceDir = new File(buildDir, "workspace");+ buildHome = FileUtils.createTempDir("onedev-build");+ File workspaceDir = new File(buildHome, "workspace");try {Member server = getClusterManager().getHazelcastInstance().getCluster().getLocalMember();jobLogger.log(String.format("Executing job (executor: %s, server: %s)...", getName(),@@ -161,8 +161,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatjobLogger.log("Copying job dependencies...");getJobManager().copyDependencies(jobContext, workspaceDir);- File userDir = new File(buildDir, "user");- FileUtils.createDir(userDir);+ File userHome = new File(buildHome, "user");+ FileUtils.createDir(userHome);getJobManager().reportJobWorkspace(jobContext, workspaceDir.getAbsolutePath());@@ -186,13 +186,13 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat+ "remote docker executor, or kubernetes executor");}- commandFacade.generatePauseCommand(buildDir);+ commandFacade.generatePauseCommand(buildHome);- File jobScriptFile = new File(buildDir, "job-commands" + commandFacade.getScriptExtension());+ File jobScriptFile = new File(buildHome, "job-commands" + commandFacade.getScriptExtension());try {FileUtils.writeLines(jobScriptFile,- new ArrayList<>(replacePlaceholders(execution.getCommands(), buildDir)),+ new ArrayList<>(replacePlaceholders(execution.getCommands(), buildHome)),commandFacade.getEndOfLine());} catch (IOException e) {throw new RuntimeException(e);@@ -200,7 +200,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatCommandline interpreter = commandFacade.getScriptInterpreter();Map<String, String> environments = new HashMap<>();- environments.put("GIT_HOME", userDir.getAbsolutePath());+ environments.put("GIT_HOME", userHome.getAbsolutePath());environments.put("ONEDEV_WORKSPACE", workspaceDir.getAbsolutePath());interpreter.workingDir(workspaceDir).environments(environments);interpreter.addArgs(jobScriptFile.getAbsolutePath());@@ -221,19 +221,19 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatCommandline git = new Commandline(AppLoader.getInstance(GitLocation.class).getExecutable());Map<String, String> environments = new HashMap<>();- environments.put("HOME", userDir.getAbsolutePath());+ environments.put("HOME", userHome.getAbsolutePath());git.environments(environments);checkoutFacade.setupWorkingDir(git, workspaceDir);- List<String> trustCertContent = getTrustCertContent();- if (!trustCertContent.isEmpty()) {- installGitCert(new File(userDir, "trust-cert.pem"), trustCertContent,- git, ExecutorUtils.newInfoLogger(jobLogger), ExecutorUtils.newWarningLogger(jobLogger));- }+ File trustCertsFile = new File(buildHome, "trust-certs.pem");+ installGitCert(git, Bootstrap.getTrustCertsDir(), trustCertsFile,+ trustCertsFile.getAbsolutePath(),+ ExecutorUtils.newInfoLogger(jobLogger),+ ExecutorUtils.newWarningLogger(jobLogger));CloneInfo cloneInfo = checkoutFacade.getCloneInfo();- cloneInfo.writeAuthData(userDir, git, false,+ cloneInfo.writeAuthData(userHome, git, false,ExecutorUtils.newInfoLogger(jobLogger),ExecutorUtils.newWarningLogger(jobLogger));@@ -249,7 +249,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat} else {ServerSideFacade serverSideFacade = (ServerSideFacade) facade;try {- serverSideFacade.execute(buildDir, new ServerSideFacade.Runner() {+ serverSideFacade.execute(buildHome, new ServerSideFacade.Runner() {@Overridepublic Map<String, byte[]> run(File inputDir, Map<String, String> placeholderValues) {@@ -284,23 +284,23 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat// Fix https://code.onedev.io/onedev/server/~issues/597if (SystemUtils.IS_OS_WINDOWS && workspaceDir.exists())FileUtils.deleteDir(workspaceDir);- synchronized (buildDir) {- FileUtils.deleteDir(buildDir);+ synchronized (buildHome) {+ FileUtils.deleteDir(buildHome);}}}@Overridepublic void resume(JobContext jobContext) {- if (buildDir != null) synchronized (buildDir) {- if (buildDir.exists())- FileUtils.touchFile(new File(buildDir, "continue"));+ if (buildHome != null) synchronized (buildHome) {+ if (buildHome.exists())+ FileUtils.touchFile(new File(buildHome, "continue"));}}@Overridepublic Shell openShell(JobContext jobContext, Terminal terminal) {- if (buildDir != null) {+ if (buildHome != null) {Commandline shell;if (runningStep instanceof CommandFacade) {CommandFacade commandStep = (CommandFacade) runningStep;@@ -310,7 +310,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat} else {shell = new Commandline("sh");}- shell.workingDir(new File(buildDir, "workspace"));+ shell.workingDir(new File(buildHome, "workspace"));return new CommandlineShell(terminal, shell);} else {throw new ExplicitException("Shell not ready");diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.javaindex 17c5b31ad1..be13746716 100644--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java@@ -1,17 +1,14 @@package io.onedev.server.product;import com.google.common.base.Splitter;-import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.server.ServerConfig;import io.onedev.server.persistence.HibernateConfig;import org.apache.commons.lang3.StringUtils;-import org.glassfish.jersey.internal.guava.Preconditions;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import javax.inject.Inject;import javax.inject.Singleton;-import java.io.File;import java.io.IOException;import java.net.InetSocketAddress;import java.net.Socket;@@ -26,8 +23,6 @@ public class DefaultServerConfig implements ServerConfig {private static final String PROP_SSH_PORT = "ssh_port";- private static final String PROP_TRUST_CERTS = "trust_certs";-private static final String PROP_CLUSTER_IP = "cluster_ip";private static final String PROP_CLUSTER_PORT = "cluster_port";@@ -36,8 +31,6 @@ public class DefaultServerConfig implements ServerConfig {private int sshPort;- private File trustCertsDir;-private String clusterIp;private int clusterPort;@@ -64,17 +57,6 @@ public class DefaultServerConfig implements ServerConfig {sshPort = 6611;}- String trustCerts = System.getenv(PROP_TRUST_CERTS);- if (StringUtils.isBlank(trustCerts))- trustCerts = props.getProperty(PROP_TRUST_CERTS);- if (StringUtils.isNotBlank(trustCerts)) {- trustCertsDir = new File(trustCerts.trim());- if (!trustCertsDir.isAbsolute())- trustCertsDir = new File(Bootstrap.getConfDir(), trustCerts);- Preconditions.checkState(trustCertsDir.exists(),- "Trust certs directory not exist: " + trustCertsDir.getAbsolutePath());- }-clusterIp = System.getenv(PROP_CLUSTER_IP);if (StringUtils.isBlank(clusterIp))clusterIp = props.getProperty(PROP_CLUSTER_IP);@@ -131,11 +113,6 @@ public class DefaultServerConfig implements ServerConfig {return httpPort;}- @Override- public File getTrustCertsDir() {- return trustCertsDir;- }-@Overridepublic int getSshPort() {return sshPort;