Merge pull request #132 from OctopusDeploy/andrew-w/securing-message-…

…protocol Securing the Protocol
OctopusDeploy · Aug 11, 2021 · 4e57cbf · 4e57cbf
2 parents af95eb2 + b1c866b
commit 4e57cbf
Show file tree

Hide file tree

Showing 29 changed files with 507 additions and 183 deletions.
diff --git a/source/Halibut.Tests/ConnectionManagerFixture.cs b/source/Halibut.Tests/ConnectionManagerFixture.cs
@@ -18,10 +18,9 @@ public class ConnectionManagerFixture
         [SetUp]
         public void SetUp()
         {
-            var stream = Substitute.For<IMessageExchangeStream>();
-            connection = new SecureConnection(Substitute.For<IDisposable>(), Stream.Null, new MessageExchangeProtocol(stream));
+            connection = new SecureConnection(Substitute.For<IDisposable>(), Stream.Null,GetProtocol, Substitute.For<ILog>());
             connectionFactory = Substitute.For<IConnectionFactory>();
-            connectionFactory.EstablishNewConnection(Arg.Any<ServiceEndPoint>(), Arg.Any<ILog>()).Returns(connection);
+            connectionFactory.EstablishNewConnection(GetProtocol, Arg.Any<ServiceEndPoint>(), Arg.Any<ILog>()).Returns(connection);
         }
 
         [Test]
@@ -31,8 +30,8 @@ public void DisposedConnectionsAreRemovedFromActive_WhenMultipleConnectionsAreAc
             var connectionManager = new ConnectionManager();
 
             //do it twice because this bug only triggers on multiple enumeration, having 1 in the collection doesn't trigger the bug
-            connectionManager.AcquireConnection(connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
-            connectionManager.AcquireConnection(connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
+            connectionManager.AcquireConnection(GetProtocol, connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
+            connectionManager.AcquireConnection(GetProtocol, connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
 
             connectionManager.Disconnect(serviceEndpoint, null);
             connectionManager.GetActiveConnections(serviceEndpoint).Should().BeNullOrEmpty();
@@ -44,7 +43,7 @@ public void ReleasedConnectionsAreNotActive()
             var serviceEndpoint = new ServiceEndPoint("https://localhost:42", Certificates.TentacleListeningPublicThumbprint);
             var connectionManager = new ConnectionManager();
 
-            var activeConnection = connectionManager.AcquireConnection(connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
+            var activeConnection = connectionManager.AcquireConnection(GetProtocol, connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
             connectionManager.GetActiveConnections(serviceEndpoint).Should().OnlyContain(c => c == activeConnection);
 
             connectionManager.ReleaseConnection(serviceEndpoint, activeConnection);
@@ -57,7 +56,7 @@ public void DisposedConnectionsAreRemovedFromActive()
             var serviceEndpoint = new ServiceEndPoint("https://localhost:42", Certificates.TentacleListeningPublicThumbprint);
             var connectionManager = new ConnectionManager();
 
-            var activeConnection = connectionManager.AcquireConnection(connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
+            var activeConnection = connectionManager.AcquireConnection(GetProtocol, connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
             connectionManager.GetActiveConnections(serviceEndpoint).Should().OnlyContain(c => c == activeConnection);
 
             activeConnection.Dispose();
@@ -70,11 +69,16 @@ public void DisconnectDisposesActiveConnections()
             var serviceEndpoint = new ServiceEndPoint("https://localhost:42", Certificates.TentacleListeningPublicThumbprint);
             var connectionManager = new ConnectionManager();
 
-            var activeConnection = connectionManager.AcquireConnection(connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
+            var activeConnection = connectionManager.AcquireConnection(GetProtocol, connectionFactory, serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
             connectionManager.GetActiveConnections(serviceEndpoint).Should().OnlyContain(c => c == activeConnection);
 
             connectionManager.Disconnect(serviceEndpoint, new InMemoryConnectionLog(serviceEndpoint.ToString()));
             connectionManager.GetActiveConnections(serviceEndpoint).Should().BeNullOrEmpty();
         }
+
+        public MessageExchangeProtocol GetProtocol(Stream stream, ILog log)
+        {
+            return new MessageExchangeProtocol(new MessageExchangeStream(stream, new Type[] { }, log), log);
+        }
     }
 }
diff --git a/source/Halibut.Tests/DiscoveryClientFixture.cs b/source/Halibut.Tests/DiscoveryClientFixture.cs
@@ -1,14 +1,13 @@
 using System;
 using FluentAssertions;
-using Halibut.Diagnostics;
 using Halibut.ServiceModel;
 using Halibut.Tests.TestServices;
 using Halibut.Transport;
 using NUnit.Framework;
 
 namespace Halibut.Tests
 {
-    public class DiscoveryClientFixture : IDisposable
+    public class DiscoveryClientFixture
     {
         ServiceEndPoint endpoint;
         HalibutRuntime tentacle;
@@ -27,12 +26,12 @@ public void SetUp()
             };
         }
 
-        public void Dispose()
+        [TearDown]
+        public void TearDown()
         {
             tentacle.Dispose();
         }
 
-
         [Test]
         public void DiscoverMethodReturnsEndpointDetails()
         {

diff --git a/source/Halibut.Tests/ProtocolFixture.cs b/source/Halibut.Tests/ProtocolFixture.cs
@@ -22,7 +22,7 @@ public void SetUp()
         {
             stream = new DumpStream();
             stream.SetRemoteIdentity(new RemoteIdentity(RemoteIdentityType.Server));
-            protocol = new MessageExchangeProtocol(stream);
+            protocol = new MessageExchangeProtocol(stream, Substitute.For<ILog>());
         }
 
         [Test]
@@ -344,7 +344,7 @@ public void SetNumberOfReads(int reads)
                 numberOfReads = reads;
             }
 
-            public List<object> Sent { get; set; }
+            public List<object> Sent { get; }
 
             public void IdentifyAsClient()
             {