ENH: Implement SSH Jump as ProxyConnection

Rewrite some interfaces to allow this new type of ProxyConnection
Additionally, store and use information on proxy connections as a IConnectionInfo object "ProxyConnection" in the IConnectionInfo object. This allows the user to specify multiple proxies to connect through before making the final connection to the target (which will be done using a "DirectConnector" instance).

Update tests to reflect new interface

Author: JoostJM

src/Renci.SshNet.Tests/Classes/Channels/ChannelDirectTcpipTest.cs

@@ -18,7 +18,7 @@ public class ChannelDirectTcpipTestTest : TestBase
     {
         private Mock<ISession> _sessionMock;
         private Mock<IForwardedPort> _forwardedPortMock;
-        private Mock<IConnectionInfo> _connectionInfoMock;
+        private Mock<ISshConnectionInfo> _connectionInfoMock;
         private uint _localChannelNumber;
         private uint _localWindowSize;
         private uint _localPacketSize;
@@ -47,7 +47,7 @@ protected override void OnInit()
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
             _forwardedPortMock = new Mock<IForwardedPort>(MockBehavior.Strict);
-            _connectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
+            _connectionInfoMock = new Mock<ISshConnectionInfo>(MockBehavior.Strict);
         }
 
         [TestMethod]

src/Renci.SshNet.Tests/Classes/Channels/ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs

@@ -18,7 +18,7 @@ namespace Renci.SshNet.Tests.Classes.Channels
     public class ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen
     {
         private Mock<ISession> _sessionMock;
-        private Mock<IConnectionInfo> _connectionInfoMock;
+        private Mock<ISshConnectionInfo> _connectionInfoMock;
         private Mock<IForwardedPort> _forwardedPortMock;
         private ChannelDirectTcpip _channel;
         private uint _localChannelNumber;
@@ -78,7 +78,7 @@ private void Arrange()
             _remotePacketSize = (uint)random.Next(100, 200);
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _connectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
+            _connectionInfoMock = new Mock<ISshConnectionInfo>(MockBehavior.Strict);
             _forwardedPortMock = new Mock<IForwardedPort>(MockBehavior.Strict);
 
             var sequence = new MockSequence();

src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs

@@ -17,7 +17,7 @@ public class ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpe
     {
         private Mock<ISession> _sessionMock;
         private Mock<IForwardedPort> _forwardedPortMock;
-        private Mock<IConnectionInfo> _connectionInfoMock;
+        private Mock<ISshConnectionInfo> _connectionInfoMock;
         private ChannelForwardedTcpip _channel;
         private uint _localChannelNumber;
         private uint _localWindowSize;
@@ -83,7 +83,7 @@ private void Arrange()
             _remoteEndpoint = new IPEndPoint(IPAddress.Loopback, 8122);
 
             _sessionMock = new Mock<ISession>(MockBehavior.Strict);
-            _connectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
+            _connectionInfoMock = new Mock<ISshConnectionInfo>(MockBehavior.Strict);
             _forwardedPortMock = new Mock<IForwardedPort>(MockBehavior.Strict);
 
             var sequence = new MockSequence();

src/Renci.SshNet.Tests/Classes/Channels/ChannelSessionTestBase.cs

@@ -6,7 +6,7 @@ namespace Renci.SshNet.Tests.Classes.Channels
     public abstract class ChannelSessionTestBase
     {
         internal Mock<ISession> SessionMock { get; private set; }
-        internal Mock<IConnectionInfo> ConnectionInfoMock { get; private set; }
+        internal Mock<ISshConnectionInfo> ConnectionInfoMock { get; private set; }
 
         [TestInitialize]
         public void Initialize()
@@ -20,7 +20,7 @@ public void Initialize()
         protected void CreateMocks()
         {
             SessionMock = new Mock<ISession>(MockBehavior.Strict);
-            ConnectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
+            ConnectionInfoMock = new Mock<ISshConnectionInfo>(MockBehavior.Strict);
         }
 
         protected abstract void SetupMocks();

src/Renci.SshNet.Tests/Classes/Channels/ChannelTestBase.cs

@@ -6,7 +6,7 @@ namespace Renci.SshNet.Tests.Classes.Channels
     public abstract class ChannelTestBase
     {
         internal Mock<ISession> SessionMock { get; private set; }
-        internal Mock<IConnectionInfo> ConnectionInfoMock { get; private set; }
+        internal Mock<ISshConnectionInfo> ConnectionInfoMock { get; private set; }
 
         [TestInitialize]
         public void Initialize()
@@ -20,7 +20,7 @@ public void Initialize()
         protected void CreateMocks()
         {
             SessionMock = new Mock<ISession>(MockBehavior.Strict);
-            ConnectionInfoMock = new Mock<IConnectionInfo>(MockBehavior.Strict);
+            ConnectionInfoMock = new Mock<ISshConnectionInfo>(MockBehavior.Strict);
         }
 
         protected abstract void SetupMocks();

src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTestBase.cs

@@ -7,18 +7,21 @@ namespace Renci.SshNet.Tests.Classes.Connection
 {
     public abstract class DirectConnectorTestBase : TripleATestBase
     {
+        internal Mock<IServiceFactory> ServiceFactoryMock { get; private set; }
+    
         internal Mock<ISocketFactory> SocketFactoryMock { get; private set; }
         internal DirectConnector Connector { get; private set; }
         internal SocketFactory SocketFactory { get; private set; }
 
         protected virtual void CreateMocks()
         {
+            ServiceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             SocketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
         }
 
         protected virtual void SetupData()
         {
-            Connector = new DirectConnector(SocketFactoryMock.Object);
+            Connector = new DirectConnector(ServiceFactoryMock.Object, SocketFactoryMock.Object);
             SocketFactory = new SocketFactory();
         }
 

src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTestBase.cs

@@ -6,18 +6,22 @@ namespace Renci.SshNet.Tests.Classes.Connection
 {
     public abstract class HttpConnectorTestBase : TripleATestBase
     {
+        internal Mock<IServiceFactory> ServiceFactoryMock { get; private set; }
         internal Mock<ISocketFactory> SocketFactoryMock { get; private set; }
         internal HttpConnector Connector { get; private set; }
         internal SocketFactory SocketFactory { get; private set; }
+        internal ServiceFactory ServiceFactory { get; private set; }
 
         protected virtual void CreateMocks()
         {
+            ServiceFactoryMock = new Mock<IServiceFactory>(MockBehavior.Strict);
             SocketFactoryMock = new Mock<ISocketFactory>(MockBehavior.Strict);
         }
 
         protected virtual void SetupData()
         {
-            Connector = new HttpConnector(SocketFactoryMock.Object);
+            Connector = new HttpConnector(ServiceFactoryMock.Object, SocketFactoryMock.Object);
+            ServiceFactory = new ServiceFactory();
             SocketFactory = new SocketFactory();
         }
 

src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs

@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Common;
 using System;
 using System.Diagnostics;
@@ -12,8 +13,10 @@ namespace Renci.SshNet.Tests.Classes.Connection
     public class HttpConnectorTest_Connect_ConnectionToProxyRefused : HttpConnectorTestBase
     {
         private ConnectionInfo _connectionInfo;
+        private ProxyConnectionInfo _proxyConnectionInfo;
         private SocketException _actualException;
         private Socket _clientSocket;
+        private IConnector _proxyConnector;
         private Stopwatch _stopWatch;
 
         protected override void SetupData()
@@ -30,16 +33,20 @@ protected override void SetupData()
                                                  "proxyPwd",
                                                  new KeyboardInteractiveAuthenticationMethod("user"));
             _connectionInfo.Timeout = TimeSpan.FromMilliseconds(5000);
+            _proxyConnectionInfo = (ProxyConnectionInfo)_connectionInfo.ProxyConnection;
             _stopWatch = new Stopwatch();
             _actualException = null;
 
             _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
         }
 
         protected override void SetupMocks()
         {
             SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
                              .Returns(_clientSocket);
+            ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
+                              .Returns(_proxyConnector);
         }
 
         protected override void TearDown()
@@ -50,6 +57,11 @@ protected override void TearDown()
             {
                 _clientSocket.Dispose();
             }
+
+            if (_proxyConnector != null)
+            {
+                _proxyConnector.Dispose();
+            }
         }
 
         protected override void Act()

src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent.cs

@@ -1,5 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Renci.SshNet.Connection;
 using Renci.SshNet.Common;
 using Renci.SshNet.Tests.Common;
 using System;
@@ -12,8 +13,10 @@ namespace Renci.SshNet.Tests.Classes.Connection
     public class HttpConnectorTest_Connect_ProxyClosesConnectionBeforeStatusLineIsSent : HttpConnectorTestBase
     {
         private ConnectionInfo _connectionInfo;
+        private ProxyConnectionInfo _proxyConnectionInfo;
         private AsyncSocketListener _proxyServer;
         private Socket _clientSocket;
+        private IConnector _proxyConnector;
         private bool _disconnected;
         private ProxyException _actualException;
 
@@ -30,12 +33,14 @@ protected override void SetupData()
                                                  "proxyUser",
                                                  "proxyPwd",
                                                  new KeyboardInteractiveAuthenticationMethod("user"));
+            _proxyConnectionInfo = (ProxyConnectionInfo)_connectionInfo.ProxyConnection;
             _connectionInfo.Timeout = TimeSpan.FromMilliseconds(100);
             _actualException = null;
 
             _clientSocket = SocketFactory.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            _proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
 
-            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _connectionInfo.ProxyPort));
+            _proxyServer = new AsyncSocketListener(new IPEndPoint(IPAddress.Loopback, _proxyConnectionInfo.Port));
             _proxyServer.Disconnected += socket => _disconnected = true;
             _proxyServer.BytesReceived += (bytesReceived, socket) =>
                 {
@@ -48,6 +53,8 @@ protected override void SetupMocks()
         {
             SocketFactoryMock.Setup(p => p.Create(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
                              .Returns(_clientSocket);
+            ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
+                              .Returns(_proxyConnector);
         }
 
         protected override void TearDown()
@@ -63,6 +70,11 @@ protected override void TearDown()
             {
                 _clientSocket.Dispose();
             }
+
+            if (_proxyConnector != null)
+            {
+                _proxyConnector.Dispose();
+            }
         }
 
         protected override void Act()

src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ProxyHostInvalid.cs

@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Renci.SshNet.Connection;
 using System.Net.Sockets;
 
 namespace Renci.SshNet.Tests.Classes.Connection
@@ -7,6 +8,8 @@ namespace Renci.SshNet.Tests.Classes.Connection
     public class HttpConnectorTest_Connect_ProxyHostInvalid : HttpConnectorTestBase
     {
         private ConnectionInfo _connectionInfo;
+        private ProxyConnectionInfo _proxyConnectionInfo;
+        private IConnector _proxyConnector;
         private SocketException _actualException;
 
         protected override void SetupData()
@@ -22,9 +25,27 @@ protected override void SetupData()
                                                  "proxyUser",
                                                  "proxyPwd",
                                                  new KeyboardInteractiveAuthenticationMethod("user"));
+            _proxyConnectionInfo = (ProxyConnectionInfo)_connectionInfo.ProxyConnection;
+            _proxyConnector = ServiceFactory.CreateConnector(_proxyConnectionInfo, SocketFactory);
             _actualException = null;
         }
 
+        protected override void SetupMocks()
+        {
+            ServiceFactoryMock.Setup(p => p.CreateConnector(_proxyConnectionInfo, SocketFactory))
+                              .Returns(_proxyConnector);
+        }
+
+        protected override void TearDown()
+        {
+            base.TearDown();
+
+            if (_proxyConnector != null)
+            {
+                _proxyConnector.Dispose();
+            }
+        }
+
         protected override void Act()
         {
             try