Merge pull request mRemoteNG#438 from mRemoteNG/1_75_hotfixes

sparerd · web-flow · commit be5c66bd93ef · 2017-03-06T10:33:04.000-07:00
1.75 hotfix 1
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
@@ -1,3 +1,16 @@
+1.75 hotfix 1 (2017-03-06):
+
+General Changes:
+----------------
+#437: Modify version numbering scheme
+
+Fixes:
+------
+#422: Uncaught exception when clicking in connection tree whitespace
+#312: Resolved KeePass auto-type issue
+#427: Export does not respect filtering user/password/domain
+
+
 1.75 (2017-03-01):
 
 Known Issue:
diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializerTests.cs b/mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializerTests.cs
@@ -12,13 +12,14 @@ namespace mRemoteNGTests.Config.Serializers
     public class XmlConnectionNodeSerializerTests
     {
         private XmlConnectionNodeSerializer _connectionNodeSerializer;
+        private ICryptographyProvider _cryptographyProvider;
 
         [SetUp]
         public void Setup()
         {
-            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(
+            _cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(
                 BlockCipherEngines.AES, BlockCipherModes.GCM);
-            _connectionNodeSerializer = new XmlConnectionNodeSerializer(cryptoProvider, "myPassword1".ConvertToSecureString());
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, "myPassword1".ConvertToSecureString(), new SaveFilter());
         }
 
         [Test]
@@ -48,8 +49,7 @@ public void PasswordFieldsAreSerialized(string attributeName, ConnectionInfo con
         public void AttributesNotSerializedWhenFiltered(string attributeName, ConnectionInfo connectionInfo)
         {
             var saveFilter = new SaveFilter(true);
-            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
-            _connectionNodeSerializer = new XmlConnectionNodeSerializer(cryptoProvider, "myPassword1".ConvertToSecureString(), saveFilter);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, "myPassword1".ConvertToSecureString(), saveFilter);
             var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
             var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
             Assert.That(targetAttribute?.Value, Is.EqualTo(string.Empty));
@@ -59,8 +59,7 @@ public void AttributesNotSerializedWhenFiltered(string attributeName, Connection
         public void InheritanceNotSerialiedWhenFiltered(string attributeName, ConnectionInfo connectionInfo)
         {
             var saveFilter = new SaveFilter(true);
-            var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
-            _connectionNodeSerializer = new XmlConnectionNodeSerializer(cryptoProvider, "myPassword1".ConvertToSecureString(), saveFilter);
+            _connectionNodeSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, "myPassword1".ConvertToSecureString(), saveFilter);
             var returnVal = _connectionNodeSerializer.SerializeConnectionInfo(connectionInfo);
             var targetAttribute = returnVal.Attribute(XName.Get(attributeName));
             Assert.That(targetAttribute?.Value, Is.EqualTo(false.ToString()));
diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs b/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs
@@ -28,7 +28,8 @@ public class XmlConnectionsDocumentCompilerTests
         public void Setup()
         {
             _cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
-            _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider);
+            var saveFilter = new SaveFilter();
+            _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider, saveFilter);
             _connectionTreeModel = SetupConnectionTreeModel();
         }
 
diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs b/mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs
@@ -20,7 +20,8 @@ public void Setup()
         {
             var connectionTreeModel = SetupConnectionTreeModel();
             var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);
-            _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider).CompileDocument(connectionTreeModel, false, false);
+            var saveFilter = new SaveFilter();
+            _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider, saveFilter).CompileDocument(connectionTreeModel, false, false);
             _documentEncryptor = new XmlConnectionsDocumentEncryptor(cryptoProvider);
         }
 
diff --git a/mRemoteNGTests/Config/Serializers/XmlConnectionsSerializerTests.cs b/mRemoteNGTests/Config/Serializers/XmlConnectionsSerializerTests.cs
@@ -1,7 +1,9 @@
 ﻿using System.Xml;
+using System.Xml.Linq;
 using mRemoteNG.Config.Serializers;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
+using mRemoteNG.Security;
 using mRemoteNG.Security.SymmetricEncryption;
 using mRemoteNG.Tree;
 using mRemoteNG.Tree.Root;
@@ -45,6 +47,27 @@ public void SingleConnectionSerializedCorrectly()
             Assert.That(connectionNode, Is.Not.Null);
         }
 
+        [TestCase("Username", "")]
+        [TestCase("Domain", "")]
+        [TestCase("Password", "")]
+        [TestCase("InheritAutomaticResize", "False")]
+        public void SerializerRespectsSaveFilterSettings(string attributeName, string expectedValue)
+        {
+            _serializer.SaveFilter = new SaveFilter(true);
+            var connectionInfo = new ConnectionInfo
+            {
+                Name = "myConnection",
+                Username = "somefilteredstuff",
+                Domain = "somefilteredstuff",
+                Password = "somefilteredstuff",
+                Inheritance = {AutomaticResize = true}
+            };
+            var serializedConnections = _serializer.Serialize(connectionInfo);
+            var xdoc = XDocument.Parse(serializedConnections);
+            var attributeValue = xdoc.Root?.Element("Node")?.Attribute(attributeName)?.Value;
+            Assert.That(attributeValue, Is.EqualTo(expectedValue));
+        }
+
         private ConnectionTreeModel SetupConnectionTreeModel()
         {
             /*
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer.cs b/mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer.cs
@@ -1,4 +1,5 @@
-﻿using System.Security;
+﻿using System;
+using System.Security;
 using System.Xml.Linq;
 using mRemoteNG.Connection;
 using mRemoteNG.Container;
@@ -13,14 +14,15 @@ public class XmlConnectionNodeSerializer
         private readonly SecureString _encryptionKey;
         private readonly SaveFilter _saveFilter = new SaveFilter();
 
-        public XmlConnectionNodeSerializer(ICryptographyProvider cryptographyProvider, SecureString encryptionKey)
-        {
-            _cryptographyProvider = cryptographyProvider;
-            _encryptionKey = encryptionKey;
-        }
-
         public XmlConnectionNodeSerializer(ICryptographyProvider cryptographyProvider, SecureString encryptionKey, SaveFilter saveFilter)
         {
+            if (cryptographyProvider == null)
+                throw new ArgumentNullException(nameof(cryptographyProvider));
+            if (encryptionKey == null)
+                throw new ArgumentNullException(nameof(encryptionKey));
+            if (saveFilter == null)
+                throw new ArgumentNullException(nameof(saveFilter));
+
             _cryptographyProvider = cryptographyProvider;
             _encryptionKey = encryptionKey;
             _saveFilter = saveFilter;
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionsDocumentCompiler.cs b/mRemoteV1/Config/Serializers/XmlConnectionsDocumentCompiler.cs
@@ -1,4 +1,5 @@
-﻿using System.Linq;
+﻿using System;
+using System.Linq;
 using System.Security;
 using System.Xml.Linq;
 using mRemoteNG.Connection;
@@ -14,10 +15,17 @@ public class XmlConnectionsDocumentCompiler
     {
         private readonly ICryptographyProvider _cryptographyProvider;
         private SecureString _encryptionKey;
+        private readonly SaveFilter _saveFilter;
 
-        public XmlConnectionsDocumentCompiler(ICryptographyProvider cryptographyProvider)
+        public XmlConnectionsDocumentCompiler(ICryptographyProvider cryptographyProvider, SaveFilter saveFilter)
         {
+            if (cryptographyProvider == null)
+                throw new ArgumentNullException(nameof(cryptographyProvider));
+            if (saveFilter == null)
+                throw new ArgumentNullException(nameof(saveFilter));
+
             _cryptographyProvider = cryptographyProvider;
+            _saveFilter = saveFilter;
         }
 
         public XDocument CompileDocument(ConnectionTreeModel connectionTreeModel, bool fullFileEncryption, bool export)
@@ -77,7 +85,7 @@ private XElement CompileRootNode(RootNodeInfo rootNodeInfo, bool fullFileEncrypt
 
         private XElement CompileConnectionInfoNode(ConnectionInfo connectionInfo)
         {
-            var connectionSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, _encryptionKey);
+            var connectionSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, _encryptionKey, _saveFilter);
             return connectionSerializer.SerializeConnectionInfo(connectionInfo);
         }
     }
diff --git a/mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs b/mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs
@@ -41,7 +41,7 @@ private string SerializeConnectionsData(ConnectionInfo serializationTarget)
             var xml = "";
             try
             {
-                var documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider);
+                var documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider, SaveFilter);
                 var xmlDocument = documentCompiler.CompileDocument(serializationTarget, UseFullEncryption, Export);
                 xml = WriteXmlToString(xmlDocument);
             }
diff --git a/mRemoteV1/Properties/AssemblyInfo.cs b/mRemoteV1/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // by using the '*' as shown below:
 // <Assembly: AssemblyVersion("1.0.*")>
 
-[assembly: AssemblyVersion("1.75.*")]
+[assembly: AssemblyVersion("1.75.7000.*")]
 
 [assembly:NeutralResourcesLanguageAttribute("en")]
 
diff --git a/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs b/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
@@ -48,6 +48,7 @@ public ConnectionTree()
         {
             InitializeComponent();
             SetupConnectionTreeView();
+            UseOverlays = false;
         }
 
         #region ConnectionTree Setup
@@ -264,7 +265,7 @@ private void OnMouse_SingleClick(object sender, MouseEventArgs mouseEventArgs)
             if (mouseEventArgs.Clicks > 1) return;
             OLVColumn column;
             var listItem = GetItemAt(mouseEventArgs.X, mouseEventArgs.Y, out column);
-            var clickedNode = listItem.RowObject as ConnectionInfo;
+            var clickedNode = listItem?.RowObject as ConnectionInfo;
             if (clickedNode == null) return;
             SingleClickHandler.Execute(clickedNode);
         }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ public class XmlConnectionsDocumentCompilerTests`
`28`	`28`	`public void Setup()`
`29`	`29`	`{`
`30`	`30`	`_cryptographyProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);`
`31`		`- _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider);`
	`31`	`+ var saveFilter = new SaveFilter();`
	`32`	`+ _documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider, saveFilter);`
`32`	`33`	`_connectionTreeModel = SetupConnectionTreeModel();`
`33`	`34`	`}`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ public void Setup()`
`20`	`20`	`{`
`21`	`21`	`var connectionTreeModel = SetupConnectionTreeModel();`
`22`	`22`	`var cryptoProvider = new CryptographyProviderFactory().CreateAeadCryptographyProvider(BlockCipherEngines.AES, BlockCipherModes.GCM);`
`23`		`- _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider).CompileDocument(connectionTreeModel, false, false);`
	`23`	`+ var saveFilter = new SaveFilter();`
	`24`	`+ _originalDocument = new XmlConnectionsDocumentCompiler(cryptoProvider, saveFilter).CompileDocument(connectionTreeModel, false, false);`
`24`	`25`	`_documentEncryptor = new XmlConnectionsDocumentEncryptor(cryptoProvider);`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Linq;`
	`1`	`+using System;`
	`2`	`+using System.Linq;`
`2`	`3`	`using System.Security;`
`3`	`4`	`using System.Xml.Linq;`
`4`	`5`	`using mRemoteNG.Connection;`
`@@ -14,10 +15,17 @@ public class XmlConnectionsDocumentCompiler`
`14`	`15`	`{`
`15`	`16`	`private readonly ICryptographyProvider _cryptographyProvider;`
`16`	`17`	`private SecureString _encryptionKey;`
	`18`	`+ private readonly SaveFilter _saveFilter;`
`17`	`19`
`18`		`- public XmlConnectionsDocumentCompiler(ICryptographyProvider cryptographyProvider)`
	`20`	`+ public XmlConnectionsDocumentCompiler(ICryptographyProvider cryptographyProvider, SaveFilter saveFilter)`
`19`	`21`	`{`
	`22`	`+ if (cryptographyProvider == null)`
	`23`	`+ throw new ArgumentNullException(nameof(cryptographyProvider));`
	`24`	`+ if (saveFilter == null)`
	`25`	`+ throw new ArgumentNullException(nameof(saveFilter));`
	`26`	`+`
`20`	`27`	`_cryptographyProvider = cryptographyProvider;`
	`28`	`+ _saveFilter = saveFilter;`
`21`	`29`	`}`
`22`	`30`
`23`	`31`	`public XDocument CompileDocument(ConnectionTreeModel connectionTreeModel, bool fullFileEncryption, bool export)`
`@@ -77,7 +85,7 @@ private XElement CompileRootNode(RootNodeInfo rootNodeInfo, bool fullFileEncrypt`
`77`	`85`
`78`	`86`	`private XElement CompileConnectionInfoNode(ConnectionInfo connectionInfo)`
`79`	`87`	`{`
`80`		`- var connectionSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, _encryptionKey);`
	`88`	`+ var connectionSerializer = new XmlConnectionNodeSerializer(_cryptographyProvider, _encryptionKey, _saveFilter);`
`81`	`89`	`return connectionSerializer.SerializeConnectionInfo(connectionInfo);`
`82`	`90`	`}`
`83`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private string SerializeConnectionsData(ConnectionInfo serializationTarget)`
`41`	`41`	`var xml = "";`
`42`	`42`	`try`
`43`	`43`	`{`
`44`		`- var documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider);`
	`44`	`+ var documentCompiler = new XmlConnectionsDocumentCompiler(_cryptographyProvider, SaveFilter);`
`45`	`45`	`var xmlDocument = documentCompiler.CompileDocument(serializationTarget, UseFullEncryption, Export);`
`46`	`46`	`xml = WriteXmlToString(xmlDocument);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public ConnectionTree()`
`48`	`48`	`{`
`49`	`49`	`InitializeComponent();`
`50`	`50`	`SetupConnectionTreeView();`
	`51`	`+ UseOverlays = false;`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`#region ConnectionTree Setup`
`@@ -264,7 +265,7 @@ private void OnMouse_SingleClick(object sender, MouseEventArgs mouseEventArgs)`
`264`	`265`	`if (mouseEventArgs.Clicks > 1) return;`
`265`	`266`	`OLVColumn column;`
`266`	`267`	`var listItem = GetItemAt(mouseEventArgs.X, mouseEventArgs.Y, out column);`
`267`		`- var clickedNode = listItem.RowObject as ConnectionInfo;`
	`268`	`+ var clickedNode = listItem?.RowObject as ConnectionInfo;`
`268`	`269`	`if (clickedNode == null) return;`
`269`	`270`	`SingleClickHandler.Execute(clickedNode);`
`270`	`271`	`}`