Gracefully handle attempts to signal unauthorised connections

kee-org · Sep 10, 2017 · 9ca08d7 · 9ca08d7
1 parent d0deb11
commit 9ca08d7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/KeePassRPC/KeePassRPCClient.cs b/KeePassRPC/KeePassRPCClient.cs
@@ -243,6 +243,9 @@ public KeePassRPCClientConnection(IWebSocketConnection connection, bool isAuthor
         /// <param name="signal">The signal.</param>
         public void Signal(KeePassRPC.DataExchangeModel.Signal signal, string methodName)
         {
+            // User may not have authorised the connection we are trying to signal
+            if (KeyContainer == null) return;
+
             try
             {
                 Jayrock.Json.JsonObject call = new Jayrock.Json.JsonObject();
@@ -670,7 +673,7 @@ public JSONRPCContainer Encrypt(string plaintext)
             if (string.IsNullOrEmpty(plaintext))
                 return null;
 
-            KeyContainerClass kc = this.KeyContainer;
+            KeyContainerClass kc = KeyContainer;
             SHA1 sha = new SHA1CryptoServiceProvider();
 
             byte[] plaintextBytes = Encoding.UTF8.GetBytes(plaintext);

diff --git a/KeePassRPC/KeePassRPCExt.cs b/KeePassRPC/KeePassRPCExt.cs
@@ -32,7 +32,7 @@ namespace KeePassRPC
     public sealed class KeePassRPCExt : Plugin
     {
         // version information
-        public static readonly Version PluginVersion = new Version(1, 7, 2);
+        public static readonly Version PluginVersion = new Version(1, 7, 3);
 
         public override string UpdateUrl
         {

diff --git a/KeePassRPC/Properties/AssemblyInfo.cs b/KeePassRPC/Properties/AssemblyInfo.cs
@@ -19,4 +19,4 @@
 
 // Assembly version information
 [assembly: AssemblyVersion("2.0.34.*")]
-[assembly: AssemblyFileVersion("1.7.2.0")] // also change PluginVersion in KeePassRPCExt.cs!
+[assembly: AssemblyFileVersion("1.7.3.0")] // also change PluginVersion in KeePassRPCExt.cs!