From 00ec25d38cbc9807583503507974cdaf4f655a8a Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Fri, 11 Nov 2016 16:25:47 -0500 Subject: [PATCH] Fix compilier warning: CA2202 & refactor https://msdn.microsoft.com/en-us/library/ms182334.aspx --- mRemoteV1/App/Runtime.cs | 29 +++++++++---------- mRemoteV1/App/Startup.cs | 1 + .../ConnectionsUpdateAvailableEventArgs.cs | 3 +- ...ConnectionsUpdateCheckFinishedEventArgs.cs | 3 +- .../Multiuser/IConnectionsUpdateChecker.cs | 3 +- .../Multiuser/RemoteConnectionsSyncronizer.cs | 3 +- .../Multiuser/SqlConnectionsUpdateChecker.cs | 1 + .../Serializers/XmlConnectionsSerializer.cs | 4 +-- .../AeadCryptographyProvider.cs | 22 +++++++------- .../LegacyRijndaelCryptographyProvider.cs | 22 +++++++------- .../UI/Forms/OptionsPages/SqlServerPage.cs | 1 + 11 files changed, 42 insertions(+), 50 deletions(-) diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs index a925aa2c..0ef6f41c 100644 --- a/mRemoteV1/App/Runtime.cs +++ b/mRemoteV1/App/Runtime.cs @@ -16,6 +16,7 @@ using System.Security; using System.Threading; using System.Windows.Forms; using System.Xml; +using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Security; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.UI.Forms; @@ -215,23 +216,19 @@ namespace mRemoteNG.App Directory.CreateDirectory(dirname); // Use File.Open with FileMode.CreateNew so that we don't overwrite an existing file - using (var fileStream = File.Open(filename, FileMode.CreateNew, FileAccess.Write, FileShare.None)) + var fileStream = File.Open(filename, FileMode.CreateNew, FileAccess.Write, FileShare.None); + using (var xmlTextWriter = new XmlTextWriter(fileStream, System.Text.Encoding.UTF8)) { - using (var xmlTextWriter = new XmlTextWriter(fileStream, System.Text.Encoding.UTF8)) - { - xmlTextWriter.Formatting = Formatting.Indented; - xmlTextWriter.Indentation = 4; - xmlTextWriter.WriteStartDocument(); - xmlTextWriter.WriteStartElement("Connections"); // Do not localize - xmlTextWriter.WriteAttributeString("Name", Language.strConnections); - xmlTextWriter.WriteAttributeString("Export", "", "False"); - xmlTextWriter.WriteAttributeString("Protected", "", "GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY"); - xmlTextWriter.WriteAttributeString("ConfVersion", "", "2.5"); - xmlTextWriter.WriteEndElement(); - xmlTextWriter.WriteEndDocument(); - xmlTextWriter.Close(); - } - + xmlTextWriter.Formatting = Formatting.Indented; + xmlTextWriter.Indentation = 4; + xmlTextWriter.WriteStartDocument(); + xmlTextWriter.WriteStartElement("Connections"); // Do not localize + xmlTextWriter.WriteAttributeString("Name", Language.strConnections); + xmlTextWriter.WriteAttributeString("Export", "", "False"); + xmlTextWriter.WriteAttributeString("Protected", "", "GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY"); + xmlTextWriter.WriteAttributeString("ConfVersion", "", "2.5"); + xmlTextWriter.WriteEndElement(); + xmlTextWriter.WriteEndDocument(); } // Load config diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs index 51349de2..cd067324 100644 --- a/mRemoteV1/App/Startup.cs +++ b/mRemoteV1/App/Startup.cs @@ -14,6 +14,7 @@ using System.IO; using System.Management; using System.Threading; using System.Windows.Forms; +using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.UI; using WeifenLuo.WinFormsUI.Docking; diff --git a/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgs.cs b/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgs.cs index 09e8ed84..c4da39d0 100644 --- a/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgs.cs +++ b/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateAvailableEventArgs.cs @@ -1,8 +1,7 @@ using System; using mRemoteNG.Config.DatabaseConnectors; - -namespace mRemoteNG.Config.Connections +namespace mRemoteNG.Config.Connections.Multiuser { public delegate void ConnectionsUpdateAvailableEventHandler(object sender, ConnectionsUpdateAvailableEventArgs args); diff --git a/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateCheckFinishedEventArgs.cs b/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateCheckFinishedEventArgs.cs index 0b607240..71355a9d 100644 --- a/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateCheckFinishedEventArgs.cs +++ b/mRemoteV1/Config/Connections/Multiuser/ConnectionsUpdateCheckFinishedEventArgs.cs @@ -1,7 +1,6 @@ using System; - -namespace mRemoteNG.Config.Connections +namespace mRemoteNG.Config.Connections.Multiuser { public delegate void UpdateCheckFinishedEventHandler(object sender, ConnectionsUpdateCheckFinishedEventArgs args); diff --git a/mRemoteV1/Config/Connections/Multiuser/IConnectionsUpdateChecker.cs b/mRemoteV1/Config/Connections/Multiuser/IConnectionsUpdateChecker.cs index e80b657f..ccdc2adb 100644 --- a/mRemoteV1/Config/Connections/Multiuser/IConnectionsUpdateChecker.cs +++ b/mRemoteV1/Config/Connections/Multiuser/IConnectionsUpdateChecker.cs @@ -1,7 +1,6 @@ using System; - -namespace mRemoteNG.Config.Connections +namespace mRemoteNG.Config.Connections.Multiuser { public interface IConnectionsUpdateChecker : IDisposable { diff --git a/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs b/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs index 6be9165b..cf9695ea 100644 --- a/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs +++ b/mRemoteV1/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs @@ -2,8 +2,7 @@ using System.Timers; using mRemoteNG.App; - -namespace mRemoteNG.Config.Connections +namespace mRemoteNG.Config.Connections.Multiuser { public class RemoteConnectionsSyncronizer : IConnectionsUpdateChecker { diff --git a/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs b/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs index 00723728..55bc5245 100644 --- a/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs +++ b/mRemoteV1/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs @@ -4,6 +4,7 @@ using System; using System.Data; using System.Data.SqlClient; using System.Threading; +using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Config.DatabaseConnectors; namespace mRemoteNG.Config.Connections diff --git a/mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs b/mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs index 36b83aa6..72a6682f 100644 --- a/mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs +++ b/mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs @@ -52,11 +52,11 @@ namespace mRemoteNG.Config.Serializers return xml; } - private string WriteXmlToString(XNode xmlDocument) + private static string WriteXmlToString(XNode xmlDocument) { string xmlString; var xmlWriterSettings = new XmlWriterSettings { Indent = true, IndentChars = " ", Encoding = Encoding.UTF8 }; - using (var memoryStream = new MemoryStream()) + var memoryStream = new MemoryStream(); using (var xmlTextWriter = XmlWriter.Create(memoryStream, xmlWriterSettings)) { xmlDocument.WriteTo(xmlTextWriter); diff --git a/mRemoteV1/Security/SymmetricEncryption/AeadCryptographyProvider.cs b/mRemoteV1/Security/SymmetricEncryption/AeadCryptographyProvider.cs index 9e08c65f..89a8a973 100644 --- a/mRemoteV1/Security/SymmetricEncryption/AeadCryptographyProvider.cs +++ b/mRemoteV1/Security/SymmetricEncryption/AeadCryptographyProvider.cs @@ -156,19 +156,17 @@ namespace mRemoteNG.Security.SymmetricEncryption _aeadBlockCipher.DoFinal(cipherText, len); //Assemble Message - using (var combinedStream = new MemoryStream()) + var combinedStream = new MemoryStream(); + using (var binaryWriter = new BinaryWriter(combinedStream)) { - using (var binaryWriter = new BinaryWriter(combinedStream)) - { - //Prepend Authenticated Payload - binaryWriter.Write(nonSecretPayload); - //Prepend Nonce - binaryWriter.Write(nonce); - //Write Cipher Text - binaryWriter.Write(cipherText); - } - return combinedStream.ToArray(); + //Prepend Authenticated Payload + binaryWriter.Write(nonSecretPayload); + //Prepend Nonce + binaryWriter.Write(nonce); + //Write Cipher Text + binaryWriter.Write(cipherText); } + return combinedStream.ToArray(); } @@ -217,7 +215,7 @@ namespace mRemoteNG.Security.SymmetricEncryption if (encryptedMessage == null || encryptedMessage.Length == 0) throw new ArgumentException(@"Encrypted Message Required!", nameof(encryptedMessage)); - using (var cipherStream = new MemoryStream(encryptedMessage)) + var cipherStream = new MemoryStream(encryptedMessage); using (var cipherReader = new BinaryReader(cipherStream)) { //Grab Payload diff --git a/mRemoteV1/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs b/mRemoteV1/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs index a4d67517..5ebd0eb3 100644 --- a/mRemoteV1/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs +++ b/mRemoteV1/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs @@ -84,19 +84,17 @@ namespace mRemoteNG.Security.SymmetricEncryption var ciphertext = Convert.FromBase64String(ciphertextBase64); - using (var memoryStream = new MemoryStream(ciphertext)) - { - var iv = new byte[BlockSizeInBytes]; - memoryStream.Read(iv, 0, iv.Length); - rijndaelManaged.IV = iv; + var memoryStream = new MemoryStream(ciphertext); + var iv = new byte[BlockSizeInBytes]; + memoryStream.Read(iv, 0, iv.Length); + rijndaelManaged.IV = iv; - using (var cryptoStream = new CryptoStream(memoryStream, rijndaelManaged.CreateDecryptor(), CryptoStreamMode.Read)) - using (var streamReader = new StreamReader(cryptoStream, Encoding.UTF8, true)) - { - plaintext = streamReader.ReadToEnd(); - rijndaelManaged.Clear(); - } - } // memoryStream + var cryptoStream = new CryptoStream(memoryStream, rijndaelManaged.CreateDecryptor(), CryptoStreamMode.Read); + using (var streamReader = new StreamReader(cryptoStream, Encoding.UTF8, true)) + { + plaintext = streamReader.ReadToEnd(); + rijndaelManaged.Clear(); + } } // rijndaelManaged return plaintext; diff --git a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs index 7be888c2..94239035 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs @@ -1,6 +1,7 @@ using System; using mRemoteNG.App; using mRemoteNG.Config.Connections; +using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Security.SymmetricEncryption; namespace mRemoteNG.UI.Forms.OptionsPages