From ec6891a2c439cde382bf4e5e43cf0bb7e64cdf6d Mon Sep 17 00:00:00 2001 From: Robin Shen Date: Sun, 5 Feb 2023 11:29:08 +0800 Subject: [PATCH] Remove custom keystore config as it is no longer supported --- .../java/io/onedev/server/ServerConfig.java | 8 +------- .../jobexecutor/JobExecutor.java | 9 --------- .../kubernetes/KubernetesExecutor.java | 6 ------ .../server/product/DefaultServerConfig.java | 18 ------------------ 4 files changed, 1 insertion(+), 40 deletions(-) diff --git a/server-core/src/main/java/io/onedev/server/ServerConfig.java b/server-core/src/main/java/io/onedev/server/ServerConfig.java index b6552724e8..8e4c32bdf9 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,7 @@ package io.onedev.server; -import java.io.File; - import javax.annotation.Nullable; +import java.io.File; public interface ServerConfig { @@ -14,11 +13,6 @@ public interface ServerConfig { */ int getHttpPort(); - @Nullable - File getKeystoreFile(); - - String getKeystorePassword(); - @Nullable File getTrustCertsDir(); 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 9b7e284f26..45eb21f922 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 @@ -1,6 +1,5 @@ package io.onedev.server.model.support.administration.jobexecutor; -import com.google.common.base.Splitter; import com.google.common.base.Throwables; import io.onedev.commons.loader.ExtensionPoint; import io.onedev.commons.utils.FileUtils; @@ -16,7 +15,6 @@ import io.onedev.server.model.Build; import io.onedev.server.persistence.TransactionManager; import io.onedev.server.terminal.TerminalManager; import io.onedev.server.util.ExceptionUtils; -import io.onedev.server.util.PKCS12CertExtractor; import io.onedev.server.util.usage.Usage; import io.onedev.server.util.validation.annotation.DnsName; import io.onedev.server.web.editable.annotation.Editable; @@ -32,7 +30,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import static java.nio.charset.StandardCharsets.UTF_8; @@ -183,12 +180,6 @@ public abstract class JobExecutor implements Serializable { protected List getTrustCertContent() { List trustCertContent = new ArrayList<>(); ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class); - File keystoreFile = serverConfig.getKeystoreFile(); - if (keystoreFile != null) { - String password = serverConfig.getKeystorePassword(); - for (Map.Entry entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet()) - trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue())); - } if (serverConfig.getTrustCertsDir() != null) { for (File file: serverConfig.getTrustCertsDir().listFiles()) { if (file.isFile()) { 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 9a4aa983c0..2399793d5a 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 @@ -32,7 +32,6 @@ import io.onedev.server.terminal.CommandlineShell; import io.onedev.server.terminal.Shell; import io.onedev.server.terminal.Terminal; import io.onedev.server.util.CollectionUtils; -import io.onedev.server.util.PKCS12CertExtractor; import io.onedev.server.web.editable.annotation.Editable; import io.onedev.server.web.editable.annotation.Horizontal; import io.onedev.server.web.editable.annotation.OmitName; @@ -619,11 +618,6 @@ public class KubernetesExecutor extends JobExecutor implements Testable configMapData = new LinkedHashMap<>(); ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class); - File keystoreFile = serverConfig.getKeystoreFile(); - if (keystoreFile != null) { - String password = serverConfig.getKeystorePassword(); - configMapData.putAll(new PKCS12CertExtractor(keystoreFile, password).extact()); - } File trustCertsDir = serverConfig.getTrustCertsDir(); if (trustCertsDir != null) { for (File file: trustCertsDir.listFiles()) { 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.java index 2e090e876c..17c5b31ad1 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 @@ -38,18 +38,10 @@ public class DefaultServerConfig implements ServerConfig { private File trustCertsDir; - private File keystoreFile; - - private String keystorePassword; - private String clusterIp; private int clusterPort; - private int serverCpu; - - private int serverMemory; - @Inject public DefaultServerConfig(ServerProperties props, HibernateConfig hibernateConfig) { String httpPortStr = System.getenv(PROP_HTTP_PORT); @@ -139,16 +131,6 @@ public class DefaultServerConfig implements ServerConfig { return httpPort; } - @Override - public File getKeystoreFile() { - return keystoreFile; - } - - @Override - public String getKeystorePassword() { - return keystorePassword; - } - @Override public File getTrustCertsDir() { return trustCertsDir;