loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix warnings in HTTPSigningConfiguration (#7628)

Browse Source
This commit is contained in:
William Cheng 2020-10-08 22:58:59 +08:00 committed by GitHub
parent a1c8e248e7
commit 001533fa63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/openapi-generator/src/main/resources/csharp-netcore/HTTPSigningConfiguration.mustache vendored
View File

@ -78,9 +78,10 @@ namespace {{packageName}}.Client
/// <summary> /// <summary>
/// Gets the Headers for HTTpSIgning /// Gets the Headers for HTTpSIgning
/// </summary> /// </summary>
/// <param name="method"></param> /// <param name="basePath">Base path</param>
/// <param name="path"></param> /// <param name="method">HTTP method</param>
/// <param name="requestOptions"></param> /// <param name="path">Path</param>
/// <param name="requestOptions">Request options</param>
/// <returns></returns> /// <returns></returns>
internal Dictionary<string, string> GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions) internal Dictionary<string, string> GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions)
{ {
@ -313,16 +314,16 @@ namespace {{packageName}}.Client
var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim(); var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim();
var keyBytes = System.Convert.FromBase64String(ecKeyBase64String); var keyBytes = System.Convert.FromBase64String(ecKeyBase64String);
var ecdsa = ECDsa.Create(); var ecdsa = ECDsa.Create();
var bytCount = 0;
#if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0) #if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0)
var byteCount = 0;
if (configuration.KeyPassPhrase != null) if (configuration.KeyPassPhrase != null)
{ {
ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out bytCount); ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out byteCount);
} }
else else
{ {
ecdsa.ImportPkcs8PrivateKey(keyBytes, out bytCount); ecdsa.ImportPkcs8PrivateKey(keyBytes, out byteCount);
} }
var signedBytes = ecdsa.SignHash(dataToSign); var signedBytes = ecdsa.SignHash(dataToSign);
var derBytes = ConvertToECDSAANS1Format(signedBytes); var derBytes = ConvertToECDSAANS1Format(signedBytes);
@ -687,7 +688,6 @@ namespace {{packageName}}.Client
else if (key[0].ToString().Contains(ecPrivateKeyHeader) && else if (key[0].ToString().Contains(ecPrivateKeyHeader) &&
key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter)) key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
{ {
/*this type of key can hold many type different types of private key, but here due lack of pem header /*this type of key can hold many type different types of private key, but here due lack of pem header
Considering this as EC key Considering this as EC key
*/ */

14
samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs
View File

@ -78,9 +78,10 @@ namespace Org.OpenAPITools.Client
/// <summary> /// <summary>
/// Gets the Headers for HTTpSIgning /// Gets the Headers for HTTpSIgning
/// </summary> /// </summary>
/// <param name="method"></param> /// <param name="basePath">Base path</param>
/// <param name="path"></param> /// <param name="method">HTTP method</param>
/// <param name="requestOptions"></param> /// <param name="path">Path</param>
/// <param name="requestOptions">Request options</param>
/// <returns></returns> /// <returns></returns>
internal Dictionary<string, string> GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions) internal Dictionary<string, string> GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions)
{ {
@ -313,16 +314,16 @@ namespace Org.OpenAPITools.Client
var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim(); var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim();
var keyBytes = System.Convert.FromBase64String(ecKeyBase64String); var keyBytes = System.Convert.FromBase64String(ecKeyBase64String);
var ecdsa = ECDsa.Create(); var ecdsa = ECDsa.Create();
var bytCount = 0;
#if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0) #if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0)
var byteCount = 0;
if (configuration.KeyPassPhrase != null) if (configuration.KeyPassPhrase != null)
{ {
ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out bytCount); ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out byteCount);
} }
else else
{ {
ecdsa.ImportPkcs8PrivateKey(keyBytes, out bytCount); ecdsa.ImportPkcs8PrivateKey(keyBytes, out byteCount);
} }
var signedBytes = ecdsa.SignHash(dataToSign); var signedBytes = ecdsa.SignHash(dataToSign);
var derBytes = ConvertToECDSAANS1Format(signedBytes); var derBytes = ConvertToECDSAANS1Format(signedBytes);
@ -687,7 +688,6 @@ namespace Org.OpenAPITools.Client
else if (key[0].ToString().Contains(ecPrivateKeyHeader) && else if (key[0].ToString().Contains(ecPrivateKeyHeader) &&
key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter)) key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
{ {
/*this type of key can hold many type different types of private key, but here due lack of pem header /*this type of key can hold many type different types of private key, but here due lack of pem header
Considering this as EC key Considering this as EC key
*/ */

14
samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HTTPSigningConfiguration.cs
View File

@ -78,9 +78,10 @@ namespace Org.OpenAPITools.Client
/// <summary> /// <summary>
/// Gets the Headers for HTTpSIgning /// Gets the Headers for HTTpSIgning
/// </summary> /// </summary>
/// <param name="method"></param> /// <param name="basePath">Base path</param>
/// <param name="path"></param> /// <param name="method">HTTP method</param>
/// <param name="requestOptions"></param> /// <param name="path">Path</param>
/// <param name="requestOptions">Request options</param>
/// <returns></returns> /// <returns></returns>
internal Dictionary<string, string> GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions) internal Dictionary<string, string> GetHttpSignedHeader(string basePath,string method, string path, RequestOptions requestOptions)
{ {
@ -313,16 +314,16 @@ namespace Org.OpenAPITools.Client
var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim(); var ecKeyBase64String = keyStr.Replace(ecKeyHeader, "").Replace(ecKeyFooter, "").Trim();
var keyBytes = System.Convert.FromBase64String(ecKeyBase64String); var keyBytes = System.Convert.FromBase64String(ecKeyBase64String);
var ecdsa = ECDsa.Create(); var ecdsa = ECDsa.Create();
var bytCount = 0;
#if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0) #if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0)
var byteCount = 0;
if (configuration.KeyPassPhrase != null) if (configuration.KeyPassPhrase != null)
{ {
ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out bytCount); ecdsa.ImportEncryptedPkcs8PrivateKey(keyPassPhrase, keyBytes, out byteCount);
} }
else else
{ {
ecdsa.ImportPkcs8PrivateKey(keyBytes, out bytCount); ecdsa.ImportPkcs8PrivateKey(keyBytes, out byteCount);
} }
var signedBytes = ecdsa.SignHash(dataToSign); var signedBytes = ecdsa.SignHash(dataToSign);
var derBytes = ConvertToECDSAANS1Format(signedBytes); var derBytes = ConvertToECDSAANS1Format(signedBytes);
@ -687,7 +688,6 @@ namespace Org.OpenAPITools.Client
else if (key[0].ToString().Contains(ecPrivateKeyHeader) && else if (key[0].ToString().Contains(ecPrivateKeyHeader) &&
key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter)) key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
{ {
/*this type of key can hold many type different types of private key, but here due lack of pem header /*this type of key can hold many type different types of private key, but here due lack of pem header
Considering this as EC key Considering this as EC key
*/ */