Merge pull request #16956 from iterate-ch/bugfix/GH-16953

Update dependency.

Author: dkocher

ssh/pom.xml

@@ -24,7 +24,7 @@
     <packaging>jar</packaging>
     <properties>
         <sshj-version>0.38.0</sshj-version>
-        <jsch-agentproxy-version>0.0.10</jsch-agentproxy-version>
+        <jsch-agentproxy-version>0.0.11</jsch-agentproxy-version>
     </properties>
     <dependencies>
         <dependency>

ssh/src/main/java/ch/cyberduck/core/sftp/SFTPSession.java

@@ -71,7 +71,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.jcraft.jsch.agentproxy.AgentProxyException;
 import net.schmizz.concurrent.Promise;
 import net.schmizz.keepalive.KeepAlive;
 import net.schmizz.keepalive.KeepAliveProvider;
@@ -283,27 +282,19 @@ private void authenticate(final SSHClient client, final Host host, final LoginCa
         // Ordered list of preferred authentication methods
         final List<AuthenticationProvider<Boolean>> defaultMethods = new ArrayList<>();
         if(preferences.getBoolean("ssh.authentication.agent.enable")) {
-            final String identityAgent = new OpenSSHIdentityAgentConfigurator().getIdentityAgent(host.getHostname());
-            log.debug("Determined identity agent {} for {}", identityAgent, host.getHostname());
-            switch(Platform.getDefault()) {
-                case windows:
-                    defaultMethods.add(new SFTPAgentAuthentication(client, new PageantAuthenticator()));
-                    try {
-                        defaultMethods.add(new SFTPAgentAuthentication(client,
-                                new WindowsOpenSSHAgentAuthenticator(identityAgent)));
-                    }
-                    catch(AgentProxyException e) {
-                        log.warn("Agent proxy failed with {}", e.getMessage());
-                    }
-                    break;
-                default:
-                    try {
+            final String configuration = new OpenSSHIdentityAgentConfigurator().getIdentityAgent(host.getHostname());
+            if(configuration != null) {
+                final String identityAgent = LocalFactory.get(configuration).getAbsolute();
+                log.debug("Determined identity agent {} for {}", identityAgent, host.getHostname());
+                switch(Platform.getDefault()) {
+                    case windows:
+                        defaultMethods.add(new SFTPAgentAuthentication(client, new PageantAuthenticator()));
+                        defaultMethods.add(new SFTPAgentAuthentication(client, new WindowsOpenSSHAgentAuthenticator(identityAgent)));
+                        break;
+                    default:
                         defaultMethods.add(new SFTPAgentAuthentication(client, new OpenSSHAgentAuthenticator(identityAgent)));
-                    }
-                    catch(AgentProxyException e) {
-                        log.warn("Agent proxy failed with {}", e.getMessage());
-                    }
-                    break;
+                        break;
+                }
             }
         }
         defaultMethods.add(new SFTPPublicKeyAuthentication(client));

ssh/src/main/java/ch/cyberduck/core/sftp/auth/SFTPPublicKeyAuthentication.java

@@ -24,8 +24,8 @@
 import ch.cyberduck.core.LoginCallback;
 import ch.cyberduck.core.LoginOptions;
 import ch.cyberduck.core.exception.BackgroundException;
-import ch.cyberduck.core.exception.InteroperabilityException;
 import ch.cyberduck.core.exception.LoginCanceledException;
+import ch.cyberduck.core.exception.LoginFailureException;
 import ch.cyberduck.core.sftp.SFTPExceptionMappingService;
 import ch.cyberduck.core.threading.CancelCallback;
 
@@ -106,7 +106,8 @@ public Boolean authenticate(final Host bookmark, final LoginCallback prompt, fin
                         pubKey = null;
                         break;
                     default:
-                        throw new InteroperabilityException(String.format("Unknown key format for file %s", privKey.getName()));
+                        log.warn("Unknown key format for file {}", privKey.getName());
+                        throw new LoginFailureException(String.format("Unknown key format for file %s", privKey.getName()));
                 }
                 provider.init(new InputStreamReader(privKey.getInputStream(), StandardCharsets.UTF_8),
                         pubKey != null ? new InputStreamReader(pubKey.getInputStream(), StandardCharsets.UTF_8) : null,

ssh/src/main/java/ch/cyberduck/core/sftp/openssh/OpenSSHAgentAuthenticator.java

@@ -29,7 +29,6 @@
 import java.util.List;
 
 import com.jcraft.jsch.agentproxy.AgentProxy;
-import com.jcraft.jsch.agentproxy.AgentProxyException;
 import com.jcraft.jsch.agentproxy.Identity;
 import com.jcraft.jsch.agentproxy.connector.SSHAgentConnector;
 import com.jcraft.jsch.agentproxy.usocket.JNAUSocketFactory;
@@ -39,7 +38,7 @@ public class OpenSSHAgentAuthenticator extends AgentAuthenticator {
 
     private final AgentProxy proxy;
 
-    public OpenSSHAgentAuthenticator(final String socket) throws AgentProxyException {
+    public OpenSSHAgentAuthenticator(final String socket) {
         this(new AgentProxy(new SSHAgentConnector(new JNAUSocketFactory(), socket)));
     }
 

ssh/src/main/java/ch/cyberduck/core/sftp/openssh/WindowsOpenSSHAgentAuthenticator.java

@@ -20,14 +20,13 @@
 import java.io.RandomAccessFile;
 
 import com.jcraft.jsch.agentproxy.AgentProxy;
-import com.jcraft.jsch.agentproxy.AgentProxyException;
 import com.jcraft.jsch.agentproxy.USocketFactory;
 import com.jcraft.jsch.agentproxy.connector.SSHAgentConnector;
 
 public class WindowsOpenSSHAgentAuthenticator extends OpenSSHAgentAuthenticator {
     private final static String SSH_AGENT_PIPE = "\\\\.\\pipe\\openssh-ssh-agent";
 
-    public WindowsOpenSSHAgentAuthenticator(final String socketPath) throws AgentProxyException {
+    public WindowsOpenSSHAgentAuthenticator(final String socketPath) {
         super(new AgentProxy(new SSHAgentConnector(new RandomAccessFileSocketFactory(), fixupSocketPath(socketPath))));
     }
 

ssh/src/test/java/ch/cyberduck/core/sftp/openssh/OpenSSHAgentAuthenticatorTest.java

@@ -28,18 +28,19 @@
 import com.jcraft.jsch.agentproxy.AgentProxyException;
 import com.jcraft.jsch.agentproxy.Identity;
 
+import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assume.assumeTrue;
 
 public class OpenSSHAgentAuthenticatorTest {
 
-    @Test(expected = AgentProxyException.class)
+    @Test
     public void testGetIdentities() throws Exception {
         assumeTrue(Factory.Platform.getDefault().equals(Factory.Platform.Name.mac));
         final OpenSSHAgentAuthenticator authenticator = new OpenSSHAgentAuthenticator(StringUtils.EMPTY);
-        final Collection<Identity> identities = authenticator.getIdentities();
         assertNotNull(authenticator.getProxy());
-        assertFalse(identities.isEmpty());
+        final Collection<Identity> identities = authenticator.getIdentities();
+        assertTrue(identities.isEmpty());
     }
 }