decommission cryptography (#104)

* decommission cryptography * rename namespaces CoreIpc->Ipc
UiPath · Jun 26, 2024 · 9682211 · 9682211
1 parent 22df014
commit 9682211
Show file tree

Hide file tree

Showing 47 changed files with 72 additions and 101 deletions.
diff --git a/src/IpcSample.ConsoleClient/Client.cs b/src/IpcSample.ConsoleClient/Client.cs
@@ -1,9 +1,9 @@
 using System.Text;
 using System.Diagnostics;
-using UiPath.CoreIpc.NamedPipe;
+using UiPath.Ipc.NamedPipe;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 class Client
 {

diff --git a/src/IpcSample.ConsoleClient/TcpClient.cs b/src/IpcSample.ConsoleClient/TcpClient.cs
@@ -1,10 +1,10 @@
 using System.Text;
 using System.Diagnostics;
-using UiPath.CoreIpc.Tcp;
+using UiPath.Ipc.Tcp;
 using Microsoft.Extensions.DependencyInjection;
 using System.Net;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 class TcpClient
 {

diff --git a/src/IpcSample.ConsoleClient/WebSocketClient.cs b/src/IpcSample.ConsoleClient/WebSocketClient.cs
@@ -1,8 +1,8 @@
 using System.Text;
 using System.Diagnostics;
-using UiPath.CoreIpc.WebSockets;
+using UiPath.Ipc.WebSockets;
 using Microsoft.Extensions.DependencyInjection;
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 class WebSocketClient
 {
     static async Task _Main(string[] args)

diff --git a/src/IpcSample.ConsoleServer/Server.cs b/src/IpcSample.ConsoleServer/Server.cs
@@ -1,8 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Diagnostics;
-using UiPath.CoreIpc.NamedPipe;
+using UiPath.Ipc.NamedPipe;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 class Server
 {

diff --git a/src/IpcSample.ConsoleServer/TcpServer.cs b/src/IpcSample.ConsoleServer/TcpServer.cs
@@ -1,9 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using System.Diagnostics;
 using System.Net;
-using UiPath.CoreIpc.Tcp;
+using UiPath.Ipc.Tcp;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 class TcpServer
 {

diff --git a/src/IpcSample.ConsoleServer/WebSocketServer.cs b/src/IpcSample.ConsoleServer/WebSocketServer.cs
@@ -2,8 +2,8 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.WebSockets;
-using UiPath.CoreIpc.WebSockets;
-namespace UiPath.CoreIpc.Tests;
+using UiPath.Ipc.WebSockets;
+namespace UiPath.Ipc.Tests;
 class WebSocketServer
 {
     //private static readonly Timer _timer = new Timer(_ =>

diff --git a/src/UiPath.CoreIpc.Tests/ComputingTests.cs b/src/UiPath.CoreIpc.Tests/ComputingTests.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public abstract class ComputingTests<TBuilder> : TestBase where TBuilder : ServiceClientBuilder<TBuilder, IComputingService>
 {

diff --git a/src/UiPath.CoreIpc.Tests/EndpointTests.cs b/src/UiPath.CoreIpc.Tests/EndpointTests.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public class EndpointTests : IDisposable
 {

diff --git a/src/UiPath.CoreIpc.Tests/Implementation/ComputingCallback.cs b/src/UiPath.CoreIpc.Tests/Implementation/ComputingCallback.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public interface IComputingCallback
 {

diff --git a/src/UiPath.CoreIpc.Tests/Implementation/ComputingService.cs b/src/UiPath.CoreIpc.Tests/Implementation/ComputingService.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public interface IInvalid : IDisposable
 {

diff --git a/src/UiPath.CoreIpc.Tests/Implementation/IpcHelpers.cs b/src/UiPath.CoreIpc.Tests/Implementation/IpcHelpers.cs
@@ -1,9 +1,9 @@
 using Microsoft.Extensions.Logging;
 using System.Net;
 using System.Net.WebSockets;
-using UiPath.CoreIpc.Tests;
+using UiPath.Ipc.Tests;
 
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 
 public static class IpcHelpers
 {

diff --git a/src/UiPath.CoreIpc.Tests/Implementation/OneWayStreamWrapper.cs b/src/UiPath.CoreIpc.Tests/Implementation/OneWayStreamWrapper.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Andrew Arnott. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 internal class OneWayStreamWrapper : Stream
 {

diff --git a/src/UiPath.CoreIpc.Tests/Implementation/SystemService.cs b/src/UiPath.CoreIpc.Tests/Implementation/SystemService.cs
@@ -4,7 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public interface ISystemService
 {

diff --git a/src/UiPath.CoreIpc.Tests/NamedPipeTests.cs b/src/UiPath.CoreIpc.Tests/NamedPipeTests.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.IO.Pipes;
 using System.Security.Principal;
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public class SystemNamedPipeTests : SystemTests<NamedPipeClientBuilder<ISystemService>>
 {

diff --git a/src/UiPath.CoreIpc.Tests/NestedStreamTests.cs b/src/UiPath.CoreIpc.Tests/NestedStreamTests.cs
@@ -1,6 +1,6 @@
 using System.IO.Compression;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public class NestedStreamTests
 {

diff --git a/src/UiPath.CoreIpc.Tests/SystemTests.cs b/src/UiPath.CoreIpc.Tests/SystemTests.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public abstract class SystemTests<TBuilder> : TestBase where TBuilder : ServiceClientBuilder<TBuilder, ISystemService>
 {

diff --git a/src/UiPath.CoreIpc.Tests/TcpTests..cs b/src/UiPath.CoreIpc.Tests/TcpTests..cs
@@ -1,6 +1,6 @@
 using System.Net;
-using UiPath.CoreIpc.Tcp;
-namespace UiPath.CoreIpc.Tests;
+using UiPath.Ipc.Tcp;
+namespace UiPath.Ipc.Tests;
 public class SystemTcpTests : SystemTests<TcpClientBuilder<ISystemService>>
 {
     int _port = 3131 + GetCount();

diff --git a/src/UiPath.CoreIpc.Tests/TestBase.cs b/src/UiPath.CoreIpc.Tests/TestBase.cs
@@ -1,6 +1,6 @@
 using Nito.AsyncEx;
 
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public abstract class TestBase : IDisposable
 {

diff --git a/src/UiPath.CoreIpc.Tests/UiPath.CoreIpc.Tests.csproj b/src/UiPath.CoreIpc.Tests/UiPath.CoreIpc.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net461;net6.0-windows</TargetFrameworks>
+    <RootNamespace>UiPath.Ipc.Tests</RootNamespace>
     <NoWarn>$(NoWarn);1998</NoWarn>
     <DefineConstants>$(DefineConstants);$(DefineConstantsEx)</DefineConstants>
     <LangVersion>latest</LangVersion>
@@ -26,6 +27,6 @@
     <Using Include="Microsoft.Extensions.DependencyInjection" />
     <Using Include="System.Reflection" />
     <Using Include="System.Diagnostics" />
-    <Using Include="UiPath.CoreIpc.NamedPipe" />
+    <Using Include="UiPath.Ipc.NamedPipe" />
   </ItemGroup>
 </Project>
diff --git a/src/UiPath.CoreIpc.Tests/ValidationTests.cs b/src/UiPath.CoreIpc.Tests/ValidationTests.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc.Tests;
+namespace UiPath.Ipc.Tests;
 
 public class ValidationTests
 {

diff --git a/src/UiPath.CoreIpc.Tests/WebSocketTests.cs b/src/UiPath.CoreIpc.Tests/WebSocketTests.cs
@@ -1,5 +1,5 @@
-using UiPath.CoreIpc.WebSockets;
-namespace UiPath.CoreIpc.Tests;
+using UiPath.Ipc.WebSockets;
+namespace UiPath.Ipc.Tests;
 public class SystemWebSocketTests : SystemTests<WebSocketClientBuilder<ISystemService>>
 {
     int _port = 51313 + GetCount();

diff --git a/src/UiPath.CoreIpc/CancellationTokenSourcePool.cs b/src/UiPath.CoreIpc/CancellationTokenSourcePool.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 // https://github.com/dotnet/aspnetcore/blob/main/src/Shared/CancellationTokenSourcePool.cs
 internal static class CancellationTokenSourcePool
 {

diff --git a/src/UiPath.CoreIpc/Client/ClientConnectionsRegistry.cs b/src/UiPath.CoreIpc/Client/ClientConnectionsRegistry.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 
 static class ClientConnectionsRegistry
 {
@@ -35,7 +35,6 @@ internal static ClientConnection Remove(IConnectionKey connectionKey)
 }
 interface IConnectionKey : IEquatable<IConnectionKey>
 {
-    string SslServer { get; }
     ClientConnection CreateClientConnection();
 }
 abstract class ClientConnection : IDisposable

diff --git a/src/UiPath.CoreIpc/Client/ServiceClient.cs b/src/UiPath.CoreIpc/Client/ServiceClient.cs
@@ -1,5 +1,4 @@
-using System.Net.Security;
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 
 using ConnectionFactory = Func<Connection, CancellationToken, Task<Connection>>;
 using BeforeCallHandler = Func<CallInfo, CancellationToken, Task>;
@@ -24,18 +23,16 @@ class ServiceClient<TInterface> : IServiceClient, IConnectionKey where TInterfac
     private Server _server;
     private ClientConnection _clientConnection;
 
-    internal ServiceClient(ISerializer serializer, TimeSpan requestTimeout, ILogger logger, ConnectionFactory connectionFactory, string sslServer = null, BeforeCallHandler beforeCall = null, EndpointSettings serviceEndpoint = null)
+    internal ServiceClient(ISerializer serializer, TimeSpan requestTimeout, ILogger logger, ConnectionFactory connectionFactory, BeforeCallHandler beforeCall = null, EndpointSettings serviceEndpoint = null)
     {
         _serializer = serializer;
         _requestTimeout = requestTimeout;
         _logger = logger;
         _connectionFactory = connectionFactory;
-        SslServer = sslServer;
         _beforeCall = beforeCall;
         _serviceEndpoint = serviceEndpoint;
     }
     protected int HashCode { get; init; }
-    public string SslServer { get; init; }
     public virtual string Name => _connection?.Name;
     private bool LogEnabled => _logger.Enabled();
     Connection IServiceClient.Connection => _connection;
@@ -190,9 +187,8 @@ private async Task<bool> Connect(CancellationToken cancellationToken)
             {
                 clientConnection.Dispose();
                 throw;
-            }
-            var stream = SslServer == null ? network : await AuthenticateAsClient(network);
-            OnNewConnection(new(stream, _serializer, _logger, Name));
+            }            
+            OnNewConnection(new(network, _serializer, _logger, Name));
             if (LogEnabled)
             {
                 Log($"CreateConnection {Name}.");
@@ -204,21 +200,6 @@ private async Task<bool> Connect(CancellationToken cancellationToken)
             clientConnection.Release();
         }
         return true;
-        async Task<Stream> AuthenticateAsClient(Stream network)
-        {
-            var sslStream = new SslStream(network);
-            try
-            {
-                await sslStream.AuthenticateAsClientAsync(SslServer);
-            }
-            catch
-            {
-                sslStream.Dispose();
-                throw;
-            }
-            Debug.Assert(sslStream.IsEncrypted && sslStream.IsSigned);
-            return sslStream;
-        }
     }
 
     private void ReuseClientConnection(ClientConnection clientConnection)
@@ -276,7 +257,7 @@ protected virtual void Dispose(bool disposing)
 
     public override string ToString() => Name;
 
-    public virtual bool Equals(IConnectionKey other) => SslServer == other.SslServer;
+    public virtual bool Equals(IConnectionKey other) => true;
 
     public virtual ClientConnection CreateClientConnection() => throw new NotImplementedException();
 }

diff --git a/src/UiPath.CoreIpc/Client/ServiceClientBuilder.cs b/src/UiPath.CoreIpc/Client/ServiceClientBuilder.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 
 using ConnectionFactory = Func<Connection, CancellationToken, Task<Connection>>;
 using BeforeCallHandler = Func<CallInfo, CancellationToken, Task>;
@@ -13,7 +13,6 @@ public abstract class ServiceClientBuilder<TDerived, TInterface> where TInterfac
     protected BeforeCallHandler _beforeCall;
     protected object _callbackInstance;
     protected TaskScheduler _taskScheduler;
-    protected string _sslServer;
 
     protected ServiceClientBuilder(Type callbackContract, IServiceProvider serviceProvider)
     {
@@ -31,16 +30,6 @@ public TDerived ConnectionFactory(ConnectionFactory connectionFactory)
         return (TDerived)this;
     }
 
-    public TDerived EncryptAndSign(string certificateServerName)
-    {
-        if (string.IsNullOrWhiteSpace(certificateServerName))
-        {
-            throw new ArgumentException($"'{nameof(certificateServerName)}' must match the name on the server's certificate.", nameof(certificateServerName));
-        }
-        _sslServer = certificateServerName;
-        return (TDerived)this;
-    }
-
     public TDerived BeforeCall(BeforeCallHandler beforeCall)
     {
         _beforeCall = beforeCall;

diff --git a/src/UiPath.CoreIpc/Connection.cs b/src/UiPath.CoreIpc/Connection.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 using static TaskCompletionPool<Response>;
 using static IOHelpers;
 using System.IO.Pipes;

diff --git a/src/UiPath.CoreIpc/Dtos.cs b/src/UiPath.CoreIpc/Dtos.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Newtonsoft.Json;
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 public class Message
 {
     internal Type CallbackContract { get; set; }

diff --git a/src/UiPath.CoreIpc/Helpers.cs b/src/UiPath.CoreIpc/Helpers.cs
@@ -6,7 +6,7 @@
 using System.Runtime.InteropServices;
 using System.Security.AccessControl;
 using System.Security.Principal;
-namespace UiPath.CoreIpc;
+namespace UiPath.Ipc;
 using static CancellationTokenSourcePool;
 public static class Helpers
 {

diff --git a/src/UiPath.CoreIpc/IpcJsonSerializer.cs b/src/UiPath.CoreIpc/IpcJsonSerializer.cs
@@ -3,7 +3,8 @@
 using System.Buffers;
 using System.Globalization;
 using System.Text;
-namespace UiPath.CoreIpc;
+
+namespace UiPath.Ipc;
 
 public interface ISerializer
 {

diff --git a/src/UiPath.CoreIpc/NamedPipe/NamedPipeClient.cs b/src/UiPath.CoreIpc/NamedPipe/NamedPipeClient.cs
@@ -1,7 +1,7 @@
 using System.IO.Pipes;
 using System.Security.Principal;
 
-namespace UiPath.CoreIpc.NamedPipe;
+namespace UiPath.Ipc.NamedPipe;
 
 using ConnectionFactory = Func<Connection, CancellationToken, Task<Connection>>;
 using BeforeCallHandler = Func<CallInfo, CancellationToken, Task>;
@@ -15,13 +15,13 @@ interface INamedPipeKey : IConnectionKey
 
 class NamedPipeClient<TInterface> : ServiceClient<TInterface>, INamedPipeKey where TInterface : class
 {
-    public NamedPipeClient(string serverName, string pipeName, ISerializer serializer, TimeSpan requestTimeout, bool allowImpersonation, ILogger logger, ConnectionFactory connectionFactory, string sslServer, BeforeCallHandler beforeCall, EndpointSettings serviceEndpoint)
-        : base(serializer, requestTimeout, logger, connectionFactory, sslServer, beforeCall, serviceEndpoint)
+    public NamedPipeClient(string serverName, string pipeName, ISerializer serializer, TimeSpan requestTimeout, bool allowImpersonation, ILogger logger, ConnectionFactory connectionFactory, BeforeCallHandler beforeCall, EndpointSettings serviceEndpoint)
+        : base(serializer, requestTimeout, logger, connectionFactory, beforeCall, serviceEndpoint)
     {
         ServerName = serverName;
         PipeName = pipeName;
         AllowImpersonation = allowImpersonation;
-        HashCode = (serverName, pipeName, allowImpersonation, sslServer).GetHashCode();
+        HashCode = (serverName, pipeName, allowImpersonation).GetHashCode();
     }
     public override string Name => base.Name ?? PipeName;
     public string ServerName { get; }

diff --git a/src/UiPath.CoreIpc/NamedPipe/NamedPipeClientBuilder.cs b/src/UiPath.CoreIpc/NamedPipe/NamedPipeClientBuilder.cs
@@ -1,4 +1,4 @@
-namespace UiPath.CoreIpc.NamedPipe;
+namespace UiPath.Ipc.NamedPipe;
 
 public abstract class NamedPipeClientBuilderBase<TDerived, TInterface> : ServiceClientBuilder<TDerived, TInterface> where TInterface : class where TDerived : ServiceClientBuilder<TDerived, TInterface>
 {
@@ -27,7 +27,7 @@ public TDerived AllowImpersonation()
     }
 
     protected override TInterface BuildCore(EndpointSettings serviceEndpoint) =>
-        new NamedPipeClient<TInterface>(_serverName, _pipeName, _serializer, _requestTimeout, _allowImpersonation, _logger, _connectionFactory, _sslServer, _beforeCall, serviceEndpoint).CreateProxy();
+        new NamedPipeClient<TInterface>(_serverName, _pipeName, _serializer, _requestTimeout, _allowImpersonation, _logger, _connectionFactory, _beforeCall, serviceEndpoint).CreateProxy();
 }
 
 public class NamedPipeClientBuilder<TInterface> : NamedPipeClientBuilderBase<NamedPipeClientBuilder<TInterface>, TInterface> where TInterface : class