The Unified and Autonomous Development Platform
feat: Disable insecure SSH algorithms (OD-1897)
Robin Shenceefc4a33eff
diff --git a/pom.xml b/pom.xmlindex ac50892740..fd50f63275 100644--- a/pom.xml+++ b/pom.xml@@ -540,7 +540,7 @@<dependency><groupId>org.apache.sshd</groupId><artifactId>sshd-core</artifactId>- <version>2.9.2</version>+ <version>2.12.1</version></dependency><dependency><groupId>org.json</groupId>diff --git a/server-core/src/main/java/io/onedev/server/ServerConfig.java b/server-core/src/main/java/io/onedev/server/ServerConfig.javaindex b4513d4161..ca547c4ba4 100644--- a/server-core/src/main/java/io/onedev/server/ServerConfig.java+++ b/server-core/src/main/java/io/onedev/server/ServerConfig.java@@ -25,17 +25,17 @@ public class ServerConfig {private static final String PROP_HTTP_PORT = "http_port";private static final String PROP_SSH_PORT = "ssh_port";-+private static final String PROP_SERVER_NAME = "server_name";private static final String PROP_CLUSTER_IP = "cluster_ip";private static final String PROP_CLUSTER_PORT = "cluster_port";-+private final int httpPort;private final int sshPort;-+private final String serverName;private final String clusterIp;diff --git a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshManager.java b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshManager.javaindex 3b448bc069..93a44b7b6f 100644--- a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshManager.java+++ b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshManager.java@@ -1,5 +1,6 @@package io.onedev.server.ssh;+import com.google.crypto.tink.subtle.EngineWrapper;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.server.ServerConfig;import io.onedev.server.cluster.ClusterManager;@@ -14,22 +15,26 @@ import io.onedev.server.persistence.TransactionManager;import org.apache.sshd.client.SshClient;import org.apache.sshd.client.keyverifier.RequiredServerKeyVerifier;import org.apache.sshd.client.session.ClientSession;+import org.apache.sshd.common.PropertyResolver;+import org.apache.sshd.common.PropertyResolverUtils;import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.sshd.common.keyprovider.KeyIdentityProvider;+import org.apache.sshd.server.ServerBuilder;import org.apache.sshd.server.SshServer;import org.apache.sshd.server.auth.pubkey.CachingPublicKeyAuthenticator;import org.apache.sshd.server.command.Command;+import org.apache.sshd.server.config.SshServerConfigFileReader;import org.apache.sshd.server.shell.UnknownCommand;import javax.inject.Inject;import javax.inject.Singleton;-import java.io.IOException;-import java.io.ObjectStreamException;-import java.io.Serializable;+import java.io.*;import java.security.GeneralSecurityException;import java.security.KeyPair;import java.security.PrivateKey;import java.security.PublicKey;+import java.util.Map;+import java.util.Properties;import java.util.Set;import static com.google.common.collect.Lists.newArrayList;@@ -85,7 +90,36 @@ public class DefaultSshManager implements SshManager, Serializable {if (server == null) {server = SshServer.setUpDefaultServer();++ var kexFactories = server.getKeyExchangeFactories();+ for (var it = kexFactories.iterator(); it.hasNext();) {+ var kexFactory = it.next();+ if (kexFactory.getName().equals("ecdh-sha2-nistp521")+ || kexFactory.getName().equals("ecdh-sha2-nistp384")+ || kexFactory.getName().equals("ecdh-sha2-nistp256")) {+ it.remove();+ }+ }+ server.setKeyExchangeFactories(kexFactories);+ var sigFactories = server.getSignatureFactories();+ for (var it = sigFactories.iterator(); it.hasNext();) {+ var sigFactory = it.next();+ if (sigFactory.getName().equals("ssh-rsa"))+ it.remove();+ }+ server.setSignatureFactories(sigFactories);++ var macFactories = server.getMacFactories();+ for (var it = macFactories.iterator(); it.hasNext();) {+ var macFactory = it.next();+ if (macFactory.getName().equals("[email protected]")+ || macFactory.getName().equals("hmac-sha1")) {+ it.remove();+ }+ }+ server.setMacFactories(macFactories);+server.setPort(serverConfig.getSshPort());server.setKeyPairProvider(session -> newArrayList(new KeyPair(publicKey, privateKey)));