+ Fixes for Checkmarx findings

snavinch · snavinch · commit 701d16bd6c54 · 2021-07-22T20:01:21.000+05:30
diff --git a/Client/ApiClient.cs b/Client/ApiClient.cs
@@ -453,7 +453,7 @@ public object CallApi(
                     }
                     catch (Exception err)
                     {
-                        logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}\n{err}");
+                        logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}");
                         throw new ApiException(-1, $"Error writing to path : {DownloadResponseFileName}");
                     }
                 }
diff --git a/Utilities/Flex/TokenVerification/TokenVerificationUtility.cs b/Utilities/Flex/TokenVerification/TokenVerificationUtility.cs
@@ -60,12 +60,12 @@ private static bool ValidateTokenSignature(RSAParameters publicKey, string signe
                 }
                 catch (CryptographicException e)
                 {
-                    logger.Error($"FlexInternalException : Error validating signature\n{e}");
+                    logger.Error($"FlexInternalException : Error validating signature\n{e.Message}");
                     throw new FlexInternalException("Error validating signature", e);
                 }
                 catch (System.Exception e)
                 {
-                    logger.Error($"FlexInternalException : Error validating signature\n{e}");
+                    logger.Error($"FlexInternalException : Error validating signature\n{e.Message}");
                     throw new FlexInternalException("Error validating signature", e);
                 }
                 finally
diff --git a/cybersource-rest-client-dotnet.csproj b/cybersource-rest-client-dotnet.csproj
@@ -60,7 +60,7 @@ OpenAPI spec version: 0.0.1
       <HintPath>packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
-      <HintPath>packages\RestSharp.106.5.4\lib\net452\RestSharp.dll</HintPath>
+      <HintPath>packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/generator/cybersource-csharp-template/ApiClient.mustache b/generator/cybersource-csharp-template/ApiClient.mustache
@@ -505,7 +505,7 @@ namespace {{packageName}}.Client
                     }
                     catch (Exception err)
                     {
-                        logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}\n{err}");
+                        logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}");
                         throw new ApiException(-1, $"Error writing to path : {DownloadResponseFileName}");
                     }
                 }
diff --git a/generator/cybersource-csharp-template/Project.mustache b/generator/cybersource-csharp-template/Project.mustache
@@ -78,7 +78,7 @@
       <HintPath>packages\Newtonsoft.Json.11.0.2\lib\{{targetFrameworkNuget}}\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
-      <HintPath>packages\RestSharp.106.5.4\lib\{{targetFrameworkNuget}}2\RestSharp.dll</HintPath>
+      <HintPath>packages\RestSharp.106.12.0\lib\{{targetFrameworkNuget}}2\RestSharp.dll</HintPath>
     </Reference>
     {{#generatePropertyChanged}}
     <Reference Include="PropertyChanged">
diff --git a/packages.config b/packages.config
@@ -3,5 +3,5 @@
   <package id="CyberSource.Authentication" version="0.0.0.10" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="NLog" version="4.5.10" targetFramework="net461" />
-  <package id="RestSharp" version="106.5.4" targetFramework="net452" />
+  <package id="RestSharp" version="106.12.0" targetFramework="net452" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ public object CallApi(`
`453`	`453`	`}`
`454`	`454`	`catch (Exception err)`
`455`	`455`	`{`
`456`		`- logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}\n{err}");`
	`456`	`+ logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}");`
`457`	`457`	`throw new ApiException(-1, $"Error writing to path : {DownloadResponseFileName}");`
`458`	`458`	`}`
`459`	`459`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,12 @@ private static bool ValidateTokenSignature(RSAParameters publicKey, string signe`
`60`	`60`	`}`
`61`	`61`	`catch (CryptographicException e)`
`62`	`62`	`{`
`63`		`- logger.Error($"FlexInternalException : Error validating signature\n{e}");`
	`63`	`+ logger.Error($"FlexInternalException : Error validating signature\n{e.Message}");`
`64`	`64`	`throw new FlexInternalException("Error validating signature", e);`
`65`	`65`	`}`
`66`	`66`	`catch (System.Exception e)`
`67`	`67`	`{`
`68`		`- logger.Error($"FlexInternalException : Error validating signature\n{e}");`
	`68`	`+ logger.Error($"FlexInternalException : Error validating signature\n{e.Message}");`
`69`	`69`	`throw new FlexInternalException("Error validating signature", e);`
`70`	`70`	`}`
`71`	`71`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ namespace {{packageName}}.Client`
`505`	`505`	`}`
`506`	`506`	`catch (Exception err)`
`507`	`507`	`{`
`508`		`- logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}\n{err}");`
	`508`	`+ logger.Error($"ApiException : Error writing to path {DownloadResponseFileName}");`
`509`	`509`	`throw new ApiException(-1, $"Error writing to path : {DownloadResponseFileName}");`
`510`	`510`	`}`
`511`	`511`	`}`