Fix SshAgentSessionFactory setting

Author: eed3si9n

build.sbt

@@ -142,6 +142,7 @@ lazy val gitsupport = (project in file("cli-git"))
       jsch,
       jschSshAgent,
       jschConnectorFactory,
+      jgitJsch,
       commonsIo,
       scalatest % Test,
       scalamock % Test

cli-git/src/main/scala/ConsoleCredentialsProvider.scala

@@ -26,26 +26,29 @@ object ConsoleCredentialsProvider extends CredentialsProvider {
   def supports(items: CredentialItem*) = true
 
   def get(uri: URIish, items: CredentialItem*): Boolean = {
-    items foreach {
-      case i: CredentialItem.Username =>
-        val username = System.console.readLine("%s: ", i.getPromptText)
-        i.setValue(username)
-
-      case i: CredentialItem.Password =>
-        val password = System.console.readPassword("%s: ", i.getPromptText)
-        i.setValueNoCopy(password)
-
-      case i: CredentialItem.InformationalMessage =>
-        System.console.printf("%s\n", i.getPromptText)
-
-      case i: CredentialItem.YesNoType =>
-        i.setValue(askYesNo(i.getPromptText))
-
-      case i: CredentialItem.StringType if uri.getScheme == "ssh" =>
-        val password = String.valueOf(System.console.readPassword("%s: ", i.getPromptText))
-        i.setValue(password)
+    if (System.console == null) false
+    else {
+      items foreach {
+        case i: CredentialItem.Username =>
+          val username = System.console.readLine("%s: ", i.getPromptText)
+          i.setValue(username)
+
+        case i: CredentialItem.Password =>
+          val password = System.console.readPassword("%s: ", i.getPromptText)
+          i.setValueNoCopy(password)
+
+        case i: CredentialItem.InformationalMessage =>
+          System.console.printf("%s\n", i.getPromptText)
+
+        case i: CredentialItem.YesNoType =>
+          i.setValue(askYesNo(i.getPromptText))
+
+        case i: CredentialItem.StringType if uri.getScheme == "ssh" =>
+          val password = String.valueOf(System.console.readPassword("%s: ", i.getPromptText))
+          i.setValue(password)
+      }
+      true
     }
-    true
   }
 
   @scala.annotation.tailrec

cli-git/src/main/scala/GitInteractor.scala

@@ -21,7 +21,7 @@ import java.io.File
 
 import giter8.GitInteractor.TransportError
 import org.eclipse.jgit.api.errors.TransportException
-import org.eclipse.jgit.transport.{CredentialsProvider, SshSessionFactory}
+import org.eclipse.jgit.transport.{CredentialsProvider, SshSessionFactory, SshTransport}
 import org.eclipse.jgit.api.{Git => JGit}
 
 import scala.util.{Failure, Success, Try}
@@ -42,14 +42,17 @@ object GitInteractor {
 
 class JGitInteractor(knownHosts: Option[String]) extends GitInteractor {
   CredentialsProvider.setDefault(ConsoleCredentialsProvider)
-  SshSessionFactory.setInstance(new SshAgentSessionFactory(knownHosts))
 
   override def cloneRepository(url: String, dest: File): Try[Unit] = Try {
     JGit
       .cloneRepository()
       .setURI(url)
       .setDirectory(dest)
       .setCredentialsProvider(ConsoleCredentialsProvider)
+      .setTransportConfigCallback({
+        case sshTransport: SshTransport => sshTransport.setSshSessionFactory(new SshAgentSessionFactory(knownHosts))
+        case x                          => x
+      })
       .call()
       .close()
   }

launcher/src/test/scala/LauncherTest.scala

@@ -21,4 +21,13 @@ object LauncherTest extends BasicTestSuite {
       assert((dir / "hello" / "build.sbt").exists)
     }
   }
+
+  /*
+  test("runs git@github.com:scala/scala-seed.g8.git") {
+    IO.withTemporaryDirectory { dir =>
+      launcher.run(Array("git@github.com:scala/scala-seed.g8.git", "--name=hello"), dir)
+      assert((dir / "hello" / "build.sbt").exists)
+    }
+  }
+ */
 }

project/Dependencies.scala

@@ -14,6 +14,7 @@ object Dependencies {
     ExclusionRule("com.sun.jdmk", "jmxtools"),
     ExclusionRule("com.sun.jmx", "jmxri")
   )
+  val jgitJsch             = "org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "5.8.0.202006091008-r"
   val jsch                 = "com.jcraft" % "jsch.agentproxy.jsch" % "0.0.9"
   val jschSshAgent         = "com.jcraft" % "jsch.agentproxy.sshagent" % "0.0.9"
   val jschConnectorFactory = "com.jcraft" % "jsch.agentproxy.connector-factory" % "0.0.9"