[Git][java-team/jsch-agent-proxy][upstream] New upstream version 0.0.9
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Jan 26 17:15:22 GMT 2021
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / jsch-agent-proxy
Commits:
a4408044 by Emmanuel Bourg at 2021-01-26T18:09:23+01:00
New upstream version 0.0.9
- - - - -
14 changed files:
- examples/pom.xml
- jsch-agent-proxy-connector-factory/pom.xml
- jsch-agent-proxy-connector-factory/src/main/java/com/jcraft/jsch/agentproxy/ConnectorFactory.java
- jsch-agent-proxy-core/pom.xml
- jsch-agent-proxy-jsch/pom.xml
- jsch-agent-proxy-pageant/pom.xml
- jsch-agent-proxy-sshagent/pom.xml
- jsch-agent-proxy-sshagent/src/main/java/com/jcraft/jsch/agentproxy/connector/SSHAgentConnector.java
- jsch-agent-proxy-sshj/pom.xml
- jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml
- jsch-agent-proxy-usocket-jna/pom.xml
- jsch-agent-proxy-usocket-junixsocket/pom.xml
- jsch-agent-proxy-usocket-nc/pom.xml
- pom.xml
Changes:
=====================================
examples/pom.xml
=====================================
@@ -5,7 +5,7 @@
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy.examples</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
<name>examples to demonstrate how to use jsch-agent-proxy</name>
<dependencies>
=====================================
jsch-agent-proxy-connector-factory/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.connector-factory</artifactId>
=====================================
jsch-agent-proxy-connector-factory/src/main/java/com/jcraft/jsch/agentproxy/ConnectorFactory.java
=====================================
@@ -42,6 +42,7 @@ public abstract class ConnectorFactory {
protected String connectors = "pageant,ssh-agent";
protected String usocketFactories = "nc,jna";
+ protected String usocketPath = null;
public void setPreferredConnectors(String connectors) {
this.connectors = connectors;
@@ -59,6 +60,14 @@ public abstract class ConnectorFactory {
return usocketFactories;
}
+ public void setUSocketPath(String usocketPath){
+ this.usocketPath = usocketPath;
+ }
+
+ public String getUSocketPath() {
+ return usocketPath;
+ }
+
public Connector createConnector() throws AgentProxyException {
ArrayList<String> trials = new ArrayList<String>();
@@ -75,7 +84,7 @@ public abstract class ConnectorFactory {
}
}
else if(_connectors[i].trim().equals("ssh-agent")) {
- if(!SSHAgentConnector.isConnectorAvailable())
+ if(!SSHAgentConnector.isConnectorAvailable(usocketPath))
continue;
String[] _usocketFactories = usocketFactories.split(",");
@@ -83,7 +92,7 @@ public abstract class ConnectorFactory {
if(_usocketFactories[j].trim().equals("nc")) {
try {
USocketFactory usf = new NCUSocketFactory();
- return new SSHAgentConnector(usf);
+ return new SSHAgentConnector(usf, usocketPath);
}
catch(AgentProxyException e){
trials.add("ssh-agent:nc");
@@ -92,7 +101,7 @@ public abstract class ConnectorFactory {
else if(_usocketFactories[j].trim().equals("jna")) {
try {
USocketFactory usf = new JNAUSocketFactory();
- return new SSHAgentConnector(usf);
+ return new SSHAgentConnector(usf, usocketPath);
}
catch(AgentProxyException e){
trials.add("ssh-agent:jna");
=====================================
jsch-agent-proxy-core/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.core</artifactId>
=====================================
jsch-agent-proxy-jsch/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.jsch</artifactId>
=====================================
jsch-agent-proxy-pageant/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.pageant</artifactId>
=====================================
jsch-agent-proxy-sshagent/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.sshagent</artifactId>
=====================================
jsch-agent-proxy-sshagent/src/main/java/com/jcraft/jsch/agentproxy/connector/SSHAgentConnector.java
=====================================
@@ -38,9 +38,15 @@ import java.io.IOException;
public class SSHAgentConnector implements Connector {
private USocketFactory factory;
+ private String usocketPath;
public SSHAgentConnector(USocketFactory factory) throws AgentProxyException {
+ this(factory, null);
+ }
+
+ public SSHAgentConnector(USocketFactory factory, String usocketPath) throws AgentProxyException {
this.factory = factory;
+ this.usocketPath = usocketPath;
// checking if factory is really functional.
USocketFactory.Socket sock = null;
@@ -65,7 +71,11 @@ public class SSHAgentConnector implements Connector {
}
public static boolean isConnectorAvailable(){
- return System.getenv("SSH_AUTH_SOCK")!=null;
+ return isConnectorAvailable(null);
+ }
+
+ public static boolean isConnectorAvailable(String usocketPath){
+ return System.getenv("SSH_AUTH_SOCK")!=null || usocketPath!=null;
}
public boolean isAvailable(){
@@ -73,8 +83,11 @@ public class SSHAgentConnector implements Connector {
}
private USocketFactory.Socket open() throws IOException {
- String ssh_auth_sock = System.getenv("SSH_AUTH_SOCK");
- if(ssh_auth_sock ==null) {
+ String ssh_auth_sock = usocketPath;
+ if(ssh_auth_sock == null) {
+ ssh_auth_sock = System.getenv("SSH_AUTH_SOCK");
+ }
+ if(ssh_auth_sock == null) {
throw new IOException("SSH_AUTH_SOCK is not defined.");
}
return factory.open(ssh_auth_sock);
=====================================
jsch-agent-proxy-sshj/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.sshj</artifactId>
=====================================
jsch-agent-proxy-svnkit-trilead-ssh2/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.svnkit-trilead-ssh2</artifactId>
=====================================
jsch-agent-proxy-usocket-jna/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.usocket-jna</artifactId>
=====================================
jsch-agent-proxy-usocket-junixsocket/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.usocket-junixsocket</artifactId>
=====================================
jsch-agent-proxy-usocket-nc/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
</parent>
<artifactId>jsch.agentproxy.usocket-nc</artifactId>
=====================================
pom.xml
=====================================
@@ -9,7 +9,7 @@
<groupId>com.jcraft</groupId>
<artifactId>jsch.agentproxy</artifactId>
- <version>0.0.8</version>
+ <version>0.0.9</version>
<packaging>pom</packaging>
<name>jsch-agent-proxy: a parent of modules</name>
View it on GitLab: https://salsa.debian.org/java-team/jsch-agent-proxy/-/commit/a4408044e5b3a5161c02d0ba3dbe8b94f8170914
--
View it on GitLab: https://salsa.debian.org/java-team/jsch-agent-proxy/-/commit/a4408044e5b3a5161c02d0ba3dbe8b94f8170914
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210126/1608c7e7/attachment.html>
More information about the pkg-java-commits
mailing list