Add missing snippet

line · Aug 18, 2023 · c103d33 · c103d33
1 parent 7d13815
commit c103d33
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/dependencies.toml b/dependencies.toml
@@ -67,7 +67,7 @@ junit5 = { module = "org.junit:junit-bom", version.ref = "junit5" }
 
 [libraries.armeria]
 module = "com.linecorp.armeria:armeria"
-javadocs = "https://www.javadoc.io/doc/com.linecorp.armeria/armeria-javadoc/1.24.0/"
+javadocs = "https://www.javadoc.io/doc/com.linecorp.armeria/armeria-javadoc/1.24.3/"
 [libraries.armeria-junit5]
 module = "com.linecorp.armeria:armeria-junit5"
 [libraries.armeria-logback]
@@ -264,11 +264,11 @@ javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.2.12/"
 [libraries.micrometer-core]
 module = "io.micrometer:micrometer-core"
 version.ref = "micrometer"
-javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-core/1.10.5/"
+javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-core/1.11.1/"
 [libraries.micrometer-prometheus]
 module = "io.micrometer:micrometer-registry-prometheus"
 version.ref = "micrometer"
-javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-registry-prometheus/1.10.5/"
+javadocs = "https://www.javadoc.io/doc/io.micrometer/micrometer-registry-prometheus/1.11.1/"
 
 [libraries.mockito-core]
 module = "org.mockito:mockito-core"

diff --git a/...irror-git/src/main/java/com/linecorp/centraldogma/server/internal/mirror/GitWithAuth.java b/...irror-git/src/main/java/com/linecorp/centraldogma/server/internal/mirror/GitWithAuth.java
@@ -43,6 +43,7 @@
 import org.eclipse.jgit.transport.SshTransport;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory;
+import org.eclipse.jgit.transport.ssh.jsch.OpenSshConfig;
 import org.eclipse.jgit.transport.ssh.jsch.OpenSshConfig.Host;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -70,6 +71,7 @@ final class GitWithAuth extends Git {
 
     private static final Logger logger = LoggerFactory.getLogger(GitWithAuth.class);
 
+    private static final OpenSshConfig EMPTY_CONFIG = emptySshConfig();
     /**
      * One of the Locks in this array is locked while a Git repository is accessed so that other GitMirrors
      * that access the same repository cannot access it at the same time. The lock is chosen based on the
@@ -186,7 +188,7 @@ public LsRemoteCommand lsRemote() {
     private static <T extends TransportCommand<?, ?>> void configureSsh(T cmd, PublicKeyMirrorCredential cred) {
         cmd.setTransportConfigCallback(transport -> {
             final SshTransport sshTransport = (SshTransport) transport;
-            sshTransport.setSshSessionFactory(new JschConfigSessionFactory() {
+            final JschConfigSessionFactory sessionFactory = new JschConfigSessionFactory() {
                 @Override
                 protected void configure(Host host, Session session) {
                     try {
@@ -199,14 +201,18 @@ protected void configure(Host host, Session session) {
                         throw new MirrorException(e);
                     }
                 }
-            });
+            };
+
+            // Disable the default SSH config file lookup.
+            sessionFactory.setConfig(EMPTY_CONFIG);
+            sshTransport.setSshSessionFactory(sessionFactory);
         });
     }
 
     private static <T extends TransportCommand<?, ?>> void configureSsh(T cmd, PasswordMirrorCredential cred) {
         cmd.setTransportConfigCallback(transport -> {
             final SshTransport sshTransport = (SshTransport) transport;
-            sshTransport.setSshSessionFactory(new JschConfigSessionFactory() {
+            final JschConfigSessionFactory sessionFactory = new JschConfigSessionFactory() {
                 @Override
                 protected void configure(Host host, Session session) {
                     try {
@@ -218,7 +224,11 @@ protected void configure(Host host, Session session) {
                         throw new MirrorException(e);
                     }
                 }
-            });
+            };
+
+            // Disable the default SSH config file lookup.
+            sessionFactory.setConfig(EMPTY_CONFIG);
+            sshTransport.setSshSessionFactory(sessionFactory);
         });
     }
 
@@ -373,4 +383,24 @@ public void removeAll() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Returns an empty {@link OpenSshConfig}.
+     *
+     * <p>The default {@link OpenSshConfig} reads the SSH config in `~/.ssh/config` and converts the identity
+     * files into {@code com.jcraft.jsch.KeyPair}. Since JSch does not support Ed25519, `KeyPair.load()`
+     * raise an exception if Ed25519 is used locally. Plus, Central Dogma uses
+     * {@link PublicKeyMirrorCredential}, we need to provide an empty config for an isolated environment.
+     */
+    private static OpenSshConfig emptySshConfig() {
+        final File emptyConfigFile;
+        try {
+            emptyConfigFile = File.createTempFile("dogma", "empty-ssh-config");
+            emptyConfigFile.deleteOnExit();
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+
+        return new OpenSshConfig(emptyConfigFile.getParentFile(), emptyConfigFile);
+    }
 }