Api changes: from now key will be generated on client with server cer…

…tificate;
Nirklav · May 1, 2018 · 2433520 · 2433520
1 parent 07277c6
commit 2433520
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 76 deletions.
diff --git a/ConsoleServer/ArgsParser.cs b/ConsoleServer/ArgsParser.cs
@@ -15,7 +15,7 @@ public ArgsParser(string[] args, Action fallback)
       if (args.Length % 2 != 0)
         throw new InvalidOperationException("invalid args count");
 
-      _params = new Dictionary<string, string>();
+      _params = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
       for (int i = 0; i < args.Length; i += 2)
         _params.Add(args[i], args[i + 1]);
 

diff --git a/ConsoleServer/Properties/AssemblyInfo.cs b/ConsoleServer/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("ConsoleServer")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("TCPChat Console server")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("39-80")]
 [assembly: AssemblyProduct("ConsoleServer")]
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.1.0.0")]
+[assembly: AssemblyFileVersion("5.1.0.0")]
diff --git a/Engine/Api/IApi.cs b/Engine/Api/IApi.cs
@@ -28,6 +28,6 @@ public static class Api
     /// <summary>
     /// Name and version of Api.
     /// </summary>
-    public const string Name = "StandardAPI v5.0";
+    public const string Name = "StandardAPI v5.1";
   }
 }
diff --git a/Engine/Engine.csproj b/Engine/Engine.csproj
@@ -60,7 +60,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BinSerializer, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2e2d7f5115ca13f5, processorArchitecture=MSIL">
-      <HintPath>..\packages\ThirtyNineEighty.BinarySerializer.2.2.0\lib\net45\BinSerializer.dll</HintPath>
+      <HintPath>..\packages\ThirtyNineEighty.BinarySerializer.2.2.1\lib\net45\BinSerializer.dll</HintPath>
     </Reference>
     <Reference Include="OpenAL, Version=1.1.0.0, Culture=neutral, PublicKeyToken=2c8b266bc3b03e01, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/Engine/Network/AsyncClient.cs b/Engine/Network/AsyncClient.cs
@@ -246,9 +246,9 @@ protected override void OnServerInfo(ServerInfo info)
     }
 
     [SecuritySafeCritical]
-    protected override void OnHandshakeResponse(HandshakeResponse response)
+    protected override void OnHandshakeResponse()
     {
-      base.OnHandshakeResponse(response);
+      base.OnHandshakeResponse();
 
       _notifier.Connected(new ConnectEventArgs());
     }

diff --git a/Engine/Network/Connection.cs b/Engine/Network/Connection.cs
@@ -28,7 +28,6 @@ protected enum ConnectionState
       ServerInfoWait,
       HandshakeRequestWait,
       HandshakeResponseWait,
-      HandshakeAcceptWait,
       Connected
     }
     #endregion
@@ -37,7 +36,6 @@ protected enum ConnectionState
     protected const long ServerInfo = 1;
     protected const long HandshakeRequest = 2;
     protected const long HandshakeResponse = 3;
-    protected const long HandshakeAccepted = 4;
 
     private const int BufferSize = 4096;
     private const int MaxReceivedDataSize = 1024 * 1024;
@@ -303,12 +301,7 @@ private void OnReceive(IAsyncResult result)
                 unpacked.Dispose();
                 break;
               case HandshakeResponse:
-                var response = (IPackage<HandshakeResponse>)unpacked.Package;
-                OnHandshakeResponse(response.Content);
-                unpacked.Dispose();
-                break;
-              case HandshakeAccepted:
-                OnHandshakeAccepted();
+                OnHandshakeResponse();
                 unpacked.Dispose();
                 break;
               default:
@@ -381,45 +374,22 @@ private void OnDisconnect(IAsyncResult result)
     /// Invokes when connection receive version info.
     /// </summary>
     [SecuritySafeCritical]
-    protected virtual void OnServerInfo(ServerInfo info)
+    protected virtual void OnServerInfo(ServerInfo info) // Invokes on client
     {
       try
       {
         if (_state != ConnectionState.ServerInfoWait)
           throw new InvalidOperationException("Connection must be in ServerInfoWait state");
 
-        _state = ConnectionState.HandshakeResponseWait;
-
-        var request = new HandshakeRequest();
-        request.RawX509Certificate = _localCertificate.Export(X509ContentType.Cert);
-        SendMessage(HandshakeRequest, request);
-      }
-      catch (Exception e)
-      {
-        OnHandshakeException(e);
-      }
-    }
-
-    /// <summary>
-    /// Invokes when connection receive request handshake from remote connection.
-    /// </summary>
-    [SecuritySafeCritical]
-    protected virtual void OnHandshakeRequest(HandshakeRequest request)
-    {
-      try
-      {
-        if (_state != ConnectionState.HandshakeRequestWait)
-          throw new InvalidOperationException("Connection must be in HandshakeRequestWait state");
-
-        var remoteCertificate = new X509Certificate2(request.RawX509Certificate);
+        var remoteCertificate = new X509Certificate2(info.RawX509Certificate);
         if (remoteCertificate.HasPrivateKey)
           throw new InvalidOperationException("Remote certificate has private key");
 
         if (!ValidateCertificate(remoteCertificate))
           throw new InvalidOperationException("Remote certiticate not validated");
-
+        
         _remoteCertificate = remoteCertificate;
-
+        
         byte[] key;
         using (var rng = new RNGCryptoServiceProvider())
         {
@@ -433,14 +403,14 @@ protected virtual void OnHandshakeRequest(HandshakeRequest request)
             throw new InvalidOperationException("not supported key algorithm");
         }
 
-        SendMessage(HandshakeResponse, new HandshakeResponse
+        SendMessage(HandshakeRequest, new HandshakeRequest
         {
           AlgorithmId = AlgorithmId.Aes256CBC,
           EncryptedKey = key,
           RawX509Certificate = _localCertificate.Export(X509ContentType.Cert)
         });
 
-        _state = ConnectionState.HandshakeAcceptWait;
+        _state = ConnectionState.HandshakeResponseWait;
       }
       catch (Exception e)
       {
@@ -451,17 +421,17 @@ protected virtual void OnHandshakeRequest(HandshakeRequest request)
     }
 
     /// <summary>
-    /// Invokes when connection receive response handshake from remote connection.
+    /// Invokes when connection receive request handshake from remote connection.
     /// </summary>
     [SecuritySafeCritical]
-    protected virtual void OnHandshakeResponse(HandshakeResponse response)
+    protected virtual void OnHandshakeRequest(HandshakeRequest request) // Invokes on server
     {
       try
       {
-        if (_state != ConnectionState.HandshakeResponseWait)
-          throw new InvalidOperationException("Connection must be in HandshakeResponseWait state");
+        if (_state != ConnectionState.HandshakeRequestWait)
+          throw new InvalidOperationException("Connection must be in HandshakeRequestWait state");
 
-        var remoteCertificate = new X509Certificate2(response.RawX509Certificate);
+        var remoteCertificate = new X509Certificate2(request.RawX509Certificate);
         if (remoteCertificate.HasPrivateKey)
           throw new InvalidOperationException("Remote certificate has private key");
 
@@ -473,11 +443,11 @@ protected virtual void OnHandshakeResponse(HandshakeResponse response)
         byte[] clearKey;
         var alg = _localCertificate.PrivateKey;
         if (alg is RSACryptoServiceProvider rsa)
-          clearKey = rsa.Decrypt(response.EncryptedKey, false);
+          clearKey = rsa.Decrypt(request.EncryptedKey, false);
         else
           throw new InvalidOperationException("not supported key algorithm");
 
-        SendMessage(HandshakeAccepted);
+        SendMessage(HandshakeResponse);
 
         _packer.SetKey(clearKey);
         _state = ConnectionState.Connected;
@@ -491,15 +461,15 @@ protected virtual void OnHandshakeResponse(HandshakeResponse response)
     }
 
     /// <summary>
-    /// Invokes when remote connection accepted handshake.
+    /// Invokes when connection receive response handshake from remote connection.
     /// </summary>
     [SecuritySafeCritical]
-    protected virtual void OnHandshakeAccepted()
+    protected virtual void OnHandshakeResponse() // Invokes on client
     {
       try
       {
-        if (_state != ConnectionState.HandshakeAcceptWait)
-          throw new InvalidOperationException("Connection must be in HandshakeAcceptWait state");
+        if (_state != ConnectionState.HandshakeResponseWait)
+          throw new InvalidOperationException("Connection must be in HandshakeResponseWait state");
 
         _packer.SetKey(_generatedKey);
         _generatedKey = null;

diff --git a/Engine/Network/ConnectionInfo.cs b/Engine/Network/ConnectionInfo.cs
@@ -9,16 +9,18 @@ public enum AlgorithmId
   }
 
   [Serializable]
-  [BinType("HandshakeRequest")]
-  public class HandshakeRequest
+  [BinType("ServerConnectionInfo", Version = 3)]
+  public class ServerInfo
   {
+    [BinField("a")]
+    public string ApiName;
     [BinField("c")]
     public byte[] RawX509Certificate;
   }
 
   [Serializable]
-  [BinType("HandshakeResponse")]
-  public class HandshakeResponse
+  [BinType("HandshakeRequest", Version = 2)]
+  public class HandshakeRequest
   {
     [BinField("c")]
     public byte[] RawX509Certificate;
@@ -29,12 +31,4 @@ public class HandshakeResponse
     [BinField("k")]
     public byte[] EncryptedKey;
   }
-
-  [Serializable]
-  [BinType("ServerConnectionInfo", Version = 2)]
-  public class ServerInfo
-  {
-    [BinField("a")]
-    public string ApiName;
-  }
 }
diff --git a/Engine/Network/ServerConnection.cs b/Engine/Network/ServerConnection.cs
@@ -110,9 +110,11 @@ public bool IsRegistered
     [SecurityCritical]
     public void SendServerInfo()
     {
-      var info = new ServerInfo();
-      info.ApiName = _serverApiName;
-      SendMessage(ServerInfo, info);
+      SendMessage(ServerInfo, new ServerInfo
+      {
+        ApiName = _serverApiName,
+        RawX509Certificate = LocalCertificate.Export(X509ContentType.Cert)
+      });
     }
 
     /// <summary>

diff --git a/Engine/Properties/AssemblyInfo.cs b/Engine/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // Можно задать все значения или принять номер построения и номер редакции по умолчанию, 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.1.0.0")]
+[assembly: AssemblyFileVersion("5.1.0.0")]
 
 [assembly: AllowPartiallyTrustedCallers]
diff --git a/Engine/packages.config b/Engine/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ThirtyNineEighty.BinarySerializer" version="2.2.0" targetFramework="net45" />
+  <package id="ThirtyNineEighty.BinarySerializer" version="2.2.1" targetFramework="net45" />
 </packages>
diff --git a/UI/Properties/AssemblyInfo.cs b/UI/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // Можно задать все значения или принять номер построения и номер редакции по умолчанию, 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.1.0.0")]
+[assembly: AssemblyFileVersion("5.1.0.0")]