You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/10/25 05:35:28 UTC
[1/2] git commit: [WAGON-403] SSH agent support for wagon-ssh
Submitted by Charles Duffy
Updated Branches:
refs/heads/master 6b3746366 -> e476306f1
[WAGON-403] SSH agent support for wagon-ssh
Submitted by Charles Duffy
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/0544394e
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/0544394e
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/0544394e
Branch: refs/heads/master
Commit: 0544394e44e94b6649e2975f6a5fb8d31afd655d
Parents: 6b37463
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Oct 25 14:34:15 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Oct 25 14:34:15 2013 +1100
----------------------------------------------------------------------
wagon-providers/wagon-ssh/pom.xml | 12 +++++++++++-
.../wagon/providers/ssh/jsch/AbstractJschWagon.java | 15 +++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0544394e/wagon-providers/wagon-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh/pom.xml b/wagon-providers/wagon-ssh/pom.xml
index 525fea5..172b16e 100644
--- a/wagon-providers/wagon-ssh/pom.xml
+++ b/wagon-providers/wagon-ssh/pom.xml
@@ -38,7 +38,17 @@ under the License.
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.44-1</version>
+ <version>0.1.50</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch.agentproxy.connector-factory</artifactId>
+ <version>0.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch.agentproxy.jsch</artifactId>
+ <version>0.0.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/0544394e/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
index 3dfd604..01d8dd3 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
@@ -55,9 +55,14 @@ import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
+import com.jcraft.jsch.agentproxy.AgentProxyException;
+import com.jcraft.jsch.agentproxy.Connector;
+import com.jcraft.jsch.agentproxy.ConnectorFactory;
+import com.jcraft.jsch.agentproxy.RemoteIdentityRepository;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.HostKey;
import com.jcraft.jsch.HostKeyRepository;
+import com.jcraft.jsch.IdentityRepository;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Proxy;
@@ -125,6 +130,16 @@ public abstract class AbstractJschWagon
throw new AuthenticationException( e.getMessage() );
}
+ try {
+ Connector connector = ConnectorFactory.getDefault().createConnector();
+ if ( connector != null ) {
+ IdentityRepository repo = new RemoteIdentityRepository( connector );
+ sch.setIdentityRepository( repo );
+ }
+ } catch ( AgentProxyException e ) {
+ fireSessionDebug( "Unable to connect to agent: " + e.toString() );
+ }
+
if ( privateKey != null && privateKey.exists() )
{
fireSessionDebug( "Using private key: " + privateKey );
[2/2] git commit: formatting code
Posted by ol...@apache.org.
formatting code
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/e476306f
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/e476306f
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/e476306f
Branch: refs/heads/master
Commit: e476306f1fd8d85f8555d0017bbdec5c68fe5a51
Parents: 0544394
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Oct 25 14:35:11 2013 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Oct 25 14:35:11 2013 +1100
----------------------------------------------------------------------
.../providers/ssh/jsch/AbstractJschWagon.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e476306f/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
index 01d8dd3..cc0e041 100644
--- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
+++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
@@ -73,23 +73,21 @@ import com.jcraft.jsch.UIKeyboardInteractive;
import com.jcraft.jsch.UserInfo;
/**
- * AbstractJschWagon
- *
- *
+ * AbstractJschWagon
*/
public abstract class AbstractJschWagon
extends StreamWagon
implements SshWagon, CommandExecutor
{
protected ScpHelper sshTool = new ScpHelper( this );
-
+
protected Session session;
-
+
/**
* @plexus.requirement role-hint="file"
*/
private volatile KnownHostsProvider knownHostsProvider;
-
+
/**
* @plexus.requirement
*/
@@ -130,13 +128,17 @@ public abstract class AbstractJschWagon
throw new AuthenticationException( e.getMessage() );
}
- try {
+ try
+ {
Connector connector = ConnectorFactory.getDefault().createConnector();
- if ( connector != null ) {
+ if ( connector != null )
+ {
IdentityRepository repo = new RemoteIdentityRepository( connector );
sch.setIdentityRepository( repo );
}
- } catch ( AgentProxyException e ) {
+ }
+ catch ( AgentProxyException e )
+ {
fireSessionDebug( "Unable to connect to agent: " + e.toString() );
}
@@ -238,7 +240,7 @@ public abstract class AbstractJschWagon
{
config.setProperty( "PreferredAuthentications", "gssapi-with-mic,publickey,password,keyboard-interactive" );
}
-
+
config.setProperty( "BatchMode", interactive ? "no" : "yes" );
session.setConfig( config );