corrections to GetCryptoValues (#90, #91) for eating errors and genkey keysize

steveshortt · steveshortt · commit 3f46dbc96f30 · 2018-07-03T15:47:38.000-05:00
diff --git a/Synapse.Common/Properties/AssemblyInfo.cs b/Synapse.Common/Properties/AssemblyInfo.cs
@@ -38,4 +38,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.18181.0" )]
+[assembly: AssemblyFileVersion( "1.0.18184.0" )]
diff --git a/Synapse.Core/Classes/CryptoProvider.cs b/Synapse.Core/Classes/CryptoProvider.cs
@@ -85,12 +85,11 @@ internal string SafeHandleCrypto(string s)
                 //try to decrypt
                 // - if success, then the value is already encrypted with these RSA keys, return orig string (s)
                 // - if failure, needs to be encrypted
-                string decrypted = null;
-                if( !TryDecryptOrValue( s, out decrypted ) )
-                    TryEncryptOrValue( s, out response );
+                if( !TryDecryptOrValue( s, out string decrypted ) )
+                    response = Encrypt( s );
             }
             else
-                TryDecryptOrValue( s, out response );
+                response = Decrypt( s );
 
             return response;
         }
diff --git a/Synapse.Core/Properties/AssemblyInfo.cs b/Synapse.Core/Properties/AssemblyInfo.cs
@@ -36,4 +36,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.18181.0" )]
+[assembly: AssemblyFileVersion( "1.0.18184.0" )]
diff --git a/Synapse.Core/Utilities/CryptoHelpers.cs b/Synapse.Core/Utilities/CryptoHelpers.cs
@@ -54,6 +54,9 @@ public static void GenerateRsaKeys(string keyContainerName = null, string pubPri
             if( string.IsNullOrWhiteSpace( keyContainerName ) && string.IsNullOrWhiteSpace( pubPrivFilePath ) && string.IsNullOrWhiteSpace( pubOnlyFilePath ) )
                 throw new ArgumentException( "Invalid argument" );
 
+            if( string.IsNullOrWhiteSpace( keyContainerName ) )
+                keyContainerName = null;
+
             CspParameters cspParams = new CspParameters
             {
                 KeyContainerName = keyContainerName
diff --git a/Synapse.Core/Utilities/XmlHelpers.cs b/Synapse.Core/Utilities/XmlHelpers.cs
@@ -512,11 +512,11 @@ public static T GetCryptoValues<T>(T c, ref XmlDocument source, bool isEncryptMo
                                 src.Value = c.Crypto.SafeHandleCrypto( src.Value );
                         }
                         else
-                            errors.Add( element );
+                            errors.Add( $"Element: [{element}] failed with error: [SelectSingleNode returned null]." );
                     }
-                    catch
+                    catch( Exception ex )
                     {
-                        errors.Add( element );
+                        errors.Add( $"Element: [{element}] failed with error: [{ex.Message.Trim()}]." );
                     }
                 }
 
diff --git a/Synapse.Core/Utilities/YamlHelpers.cs b/Synapse.Core/Utilities/YamlHelpers.cs
@@ -54,8 +54,8 @@ public static void SerializeFile(string path, object data, bool serializeAsJson
                 String origFile = $"{path}.tmp";
                 File.Move( path, origFile );
                 using( StreamReader raw = new StreamReader( origFile ) )
-                    using( StreamWriter formatted = new StreamWriter( path ) )
-                        JsonHelpers.FormatJson( raw, formatted );
+                using( StreamWriter formatted = new StreamWriter( path ) )
+                    JsonHelpers.FormatJson( raw, formatted );
 
                 File.Delete( origFile );
             }
@@ -492,9 +492,9 @@ public static T GetCryptoValues<T>(T c, bool isEncryptMode = true) where T : cla
                         Dictionary<object, object> patch = ConvertPathElementToDict( element );
                         HandleElementCrypto( source, patch, c.Crypto );
                     }
-                    catch
+                    catch( Exception ex )
                     {
-                        errors.Add( element );
+                        errors.Add( $"Element: [{element}] failed with error: [{ex.Message.Trim()}]." );
                     }
                 }
 
diff --git a/Synapse.cli/Properties/AssemblyInfo.cs b/Synapse.cli/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.18181.0" )]
+[assembly: AssemblyFileVersion( "1.0.18184.0" )]

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ public static void GenerateRsaKeys(string keyContainerName = null, string pubPri`
`54`	`54`	`if( string.IsNullOrWhiteSpace( keyContainerName ) && string.IsNullOrWhiteSpace( pubPrivFilePath ) && string.IsNullOrWhiteSpace( pubOnlyFilePath ) )`
`55`	`55`	`throw new ArgumentException( "Invalid argument" );`
`56`	`56`
	`57`	`+ if( string.IsNullOrWhiteSpace( keyContainerName ) )`
	`58`	`+ keyContainerName = null;`
	`59`	`+`
`57`	`60`	`CspParameters cspParams = new CspParameters`
`58`	`61`	`{`
`59`	`62`	`KeyContainerName = keyContainerName`
Original file line number	Diff line number	Diff line change
`@@ -512,11 +512,11 @@ public static T GetCryptoValues<T>(T c, ref XmlDocument source, bool isEncryptMo`
`512`	`512`	`src.Value = c.Crypto.SafeHandleCrypto( src.Value );`
`513`	`513`	`}`
`514`	`514`	`else`
`515`		`- errors.Add( element );`
	`515`	`+ errors.Add( $"Element: [{element}] failed with error: [SelectSingleNode returned null]." );`
`516`	`516`	`}`
`517`		`- catch`
	`517`	`+ catch( Exception ex )`
`518`	`518`	`{`
`519`		`- errors.Add( element );`
	`519`	`+ errors.Add( $"Element: [{element}] failed with error: [{ex.Message.Trim()}]." );`
`520`	`520`	`}`
`521`	`521`	`}`
`522`	`522`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ public static void SerializeFile(string path, object data, bool serializeAsJson`
`54`	`54`	`String origFile = $"{path}.tmp";`
`55`	`55`	`File.Move( path, origFile );`
`56`	`56`	`using( StreamReader raw = new StreamReader( origFile ) )`
`57`		`- using( StreamWriter formatted = new StreamWriter( path ) )`
`58`		`- JsonHelpers.FormatJson( raw, formatted );`
	`57`	`+ using( StreamWriter formatted = new StreamWriter( path ) )`
	`58`	`+ JsonHelpers.FormatJson( raw, formatted );`
`59`	`59`
`60`	`60`	`File.Delete( origFile );`
`61`	`61`	`}`
`@@ -492,9 +492,9 @@ public static T GetCryptoValues<T>(T c, bool isEncryptMode = true) where T : cla`
`492`	`492`	`Dictionary<object, object> patch = ConvertPathElementToDict( element );`
`493`	`493`	`HandleElementCrypto( source, patch, c.Crypto );`
`494`	`494`	`}`
`495`		`- catch`
	`495`	`+ catch( Exception ex )`
`496`	`496`	`{`
`497`		`- errors.Add( element );`
	`497`	`+ errors.Add( $"Element: [{element}] failed with error: [{ex.Message.Trim()}]." );`
`498`	`498`	`}`
`499`	`499`	`}`
`500`	`500`