-
-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Refactor Windows support for OpenSSH agent.
- Loading branch information
Showing
4 changed files
with
112 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
ssh/src/main/java/ch/cyberduck/core/sftp/openssh/WindowsOpenSSHAgentAuthenticator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package ch.cyberduck.core.sftp.openssh; | ||
|
|
||
| /* | ||
| * Copyright (c) 2002-2022 iterate GmbH. All rights reserved. | ||
| * https://cyberduck.io/ | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| */ | ||
|
|
||
| import java.io.EOFException; | ||
| import java.io.IOException; | ||
| 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 { | ||
|
|
||
| public WindowsOpenSSHAgentAuthenticator() throws AgentProxyException { | ||
| super(new AgentProxy(new SSHAgentConnector(new RandomAccessFileSocketFactory(), "\\\\.\\pipe\\openssh-ssh-agent"))); | ||
| } | ||
|
|
||
| /** | ||
| * Implements a wrapper around RandomAccessFile for use with jsch's SSH connector to support Windows' OpenSSH fork. | ||
| */ | ||
| private static class RandomAccessFileSocketFactory implements USocketFactory { | ||
| static class WindowsSocket extends Socket { | ||
| private final RandomAccessFile raf; | ||
|
|
||
| WindowsSocket(String path) throws IOException { | ||
| raf = new RandomAccessFile(path, "rw"); | ||
| } | ||
|
|
||
| public int readFull(byte[] buf, int s, int len) throws IOException { | ||
| try { | ||
| raf.readFully(buf, s, len); | ||
| } | ||
| catch(EOFException e) { | ||
| return -1; | ||
| } | ||
| return len; | ||
| } | ||
|
|
||
| public void write(byte[] buf, int s, int len) throws IOException { | ||
| raf.write(buf, s, len); | ||
| } | ||
|
|
||
| public void close() throws IOException { | ||
| raf.close(); | ||
| } | ||
| } | ||
|
|
||
| public Socket open(String path) throws IOException { | ||
| return new WindowsSocket(path); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,22 +18,26 @@ | |
| * [email protected] | ||
| */ | ||
|
|
||
| import org.junit.Ignore; | ||
| import ch.cyberduck.core.Factory; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| import com.jcraft.jsch.agentproxy.AgentProxyException; | ||
| import com.jcraft.jsch.agentproxy.Identity; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assume.assumeTrue; | ||
|
|
||
| public class OpenSSHAgentAuthenticatorTest { | ||
|
|
||
| @Test | ||
| @Ignore | ||
| public void testGetIdentities() { | ||
| final OpenSSHAgentAuthenticator authenticator = new OpenSSHAgentAuthenticator(null, false); | ||
| @Test(expected = AgentProxyException.class) | ||
| 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()); | ||
|
|
||