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

removed warnings (#16039)

Browse Source
This commit is contained in:
devhl-labs
2023-07-12 20:27:21 -04:00
committed by GitHub
parent c595a02b61
commit 3678085017
4 changed files with 80 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HttpSigningConfiguration.mustache vendored
View File

@@ -20,7 +20,6 @@ namespace {{packageName}}.{{clientPackage}}
/// </summary>
{{>visibility}} class HttpSigningConfiguration
{
#region
/// <summary>
/// Create an instance
/// </summary>
@@ -34,9 +33,7 @@ namespace {{packageName}}.{{clientPackage}}
SigningAlgorithm = signingAlgorithm;
SignatureValidityPeriod = signatureValidityPeriod;
}
#endregion
#region Properties
/// <summary>
///Gets the Api keyId
/// </summary>
@@ -72,18 +69,13 @@ namespace {{packageName}}.{{clientPackage}}
/// </summary>
public int SignatureValidityPeriod { get; set; }
#endregion
#region enum
private enum PrivateKeyType
{
None = 0,
RSA = 1,
ECDSA = 2,
}
#endregion
#region Methods
/// <summary>
/// Gets the Headers for HttpSigning
/// </summary>
@@ -130,12 +122,12 @@ namespace {{packageName}}.{{clientPackage}}
if (HashAlgorithm == HashAlgorithmName.SHA256)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-256={0}", Convert.ToBase64String(bodyDigest));
}
else if (HashAlgorithm == HashAlgorithmName.SHA512)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-512={0}", Convert.ToBase64String(bodyDigest));
}
else
@@ -192,7 +184,7 @@ namespace {{packageName}}.{{clientPackage}}
//Concatenate headers value separated by new line
var headerValuesString = string.Join("\n", headerValuesList);
var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
var signatureStringHash = GetStringHash(HashAlgorithm, headerValuesString);
string{{nrt?}} headerSignatureStr = null;
var keyType = GetKeyType(KeyFilePath);
@@ -219,15 +211,27 @@ namespace {{packageName}}.{{clientPackage}}
return HttpSignedRequestHeader;
}
private byte[] GetStringHash(string hashName, string stringToBeHashed)
private byte[] GetStringHash(HashAlgorithmName hashAlgorithmName, string stringToBeHashed)
{
var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
HashAlgorithm{{nrt?}} hashAlgorithm = null;
if (hashAlgorithmName == HashAlgorithmName.SHA1)
hashAlgorithm = SHA1.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA256)
hashAlgorithm = SHA256.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA512)
hashAlgorithm = SHA512.Create();
if (hashAlgorithmName == HashAlgorithmName.MD5)
hashAlgorithm = MD5.Create();
if (hashAlgorithm == null)
throw new NullReferenceException($"{ nameof(hashAlgorithm) } was null.");
var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
var stringHash = hashAlgorithm.ComputeHash(bytes);
byte[] bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
byte[] stringHash = hashAlgorithm.ComputeHash(bytes);
return stringHash;
}
@@ -584,7 +588,7 @@ namespace {{packageName}}.{{clientPackage}}
Array.Copy(salt, 0, data00, psbytes.Length, salt.Length); //concatenate the salt bytes
// ---- do multi-hashing and concatenate results D1, D2 ... into keymaterial bytes ----
MD5 md5 = new MD5CryptoServiceProvider();
MD5 md5 = MD5.Create();
byte[]{{nrt?}} result = null;
byte[] hashtarget = new byte[HASHLENGTH + data00.Length]; //fixed length initial hashtarget
@@ -673,6 +677,5 @@ namespace {{packageName}}.{{clientPackage}}
return keyType;
}
#endregion
}
}

37
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
View File

@@ -26,7 +26,6 @@ namespace Org.OpenAPITools.Client
/// </summary>
public class HttpSigningConfiguration
{
#region
/// <summary>
/// Create an instance
/// </summary>
@@ -40,9 +39,7 @@ namespace Org.OpenAPITools.Client
SigningAlgorithm = signingAlgorithm;
SignatureValidityPeriod = signatureValidityPeriod;
}
#endregion
#region Properties
/// <summary>
///Gets the Api keyId
/// </summary>
@@ -78,18 +75,13 @@ namespace Org.OpenAPITools.Client
/// </summary>
public int SignatureValidityPeriod { get; set; }
#endregion
#region enum
private enum PrivateKeyType
{
None = 0,
RSA = 1,
ECDSA = 2,
}
#endregion
#region Methods
/// <summary>
/// Gets the Headers for HttpSigning
/// </summary>
@@ -136,12 +128,12 @@ namespace Org.OpenAPITools.Client
if (HashAlgorithm == HashAlgorithmName.SHA256)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-256={0}", Convert.ToBase64String(bodyDigest));
}
else if (HashAlgorithm == HashAlgorithmName.SHA512)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-512={0}", Convert.ToBase64String(bodyDigest));
}
else
@@ -198,7 +190,7 @@ namespace Org.OpenAPITools.Client
//Concatenate headers value separated by new line
var headerValuesString = string.Join("\n", headerValuesList);
var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
var signatureStringHash = GetStringHash(HashAlgorithm, headerValuesString);
string? headerSignatureStr = null;
var keyType = GetKeyType(KeyFilePath);
@@ -225,15 +217,27 @@ namespace Org.OpenAPITools.Client
return HttpSignedRequestHeader;
}
private byte[] GetStringHash(string hashName, string stringToBeHashed)
private byte[] GetStringHash(HashAlgorithmName hashAlgorithmName, string stringToBeHashed)
{
var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
HashAlgorithm? hashAlgorithm = null;
if (hashAlgorithmName == HashAlgorithmName.SHA1)
hashAlgorithm = SHA1.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA256)
hashAlgorithm = SHA256.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA512)
hashAlgorithm = SHA512.Create();
if (hashAlgorithmName == HashAlgorithmName.MD5)
hashAlgorithm = MD5.Create();
if (hashAlgorithm == null)
throw new NullReferenceException($"{ nameof(hashAlgorithm) } was null.");
var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
var stringHash = hashAlgorithm.ComputeHash(bytes);
byte[] bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
byte[] stringHash = hashAlgorithm.ComputeHash(bytes);
return stringHash;
}
@@ -590,7 +594,7 @@ namespace Org.OpenAPITools.Client
Array.Copy(salt, 0, data00, psbytes.Length, salt.Length); //concatenate the salt bytes
// ---- do multi-hashing and concatenate results D1, D2 ... into keymaterial bytes ----
MD5 md5 = new MD5CryptoServiceProvider();
MD5 md5 = MD5.Create();
byte[]? result = null;
byte[] hashtarget = new byte[HASHLENGTH + data00.Length]; //fixed length initial hashtarget
@@ -679,6 +683,5 @@ namespace Org.OpenAPITools.Client
return keyType;
}
#endregion
}
}

37
samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
View File

@@ -24,7 +24,6 @@ namespace Org.OpenAPITools.Client
/// </summary>
public class HttpSigningConfiguration
{
#region
/// <summary>
/// Create an instance
/// </summary>
@@ -38,9 +37,7 @@ namespace Org.OpenAPITools.Client
SigningAlgorithm = signingAlgorithm;
SignatureValidityPeriod = signatureValidityPeriod;
}
#endregion
#region Properties
/// <summary>
///Gets the Api keyId
/// </summary>
@@ -76,18 +73,13 @@ namespace Org.OpenAPITools.Client
/// </summary>
public int SignatureValidityPeriod { get; set; }
#endregion
#region enum
private enum PrivateKeyType
{
None = 0,
RSA = 1,
ECDSA = 2,
}
#endregion
#region Methods
/// <summary>
/// Gets the Headers for HttpSigning
/// </summary>
@@ -134,12 +126,12 @@ namespace Org.OpenAPITools.Client
if (HashAlgorithm == HashAlgorithmName.SHA256)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-256={0}", Convert.ToBase64String(bodyDigest));
}
else if (HashAlgorithm == HashAlgorithmName.SHA512)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-512={0}", Convert.ToBase64String(bodyDigest));
}
else
@@ -196,7 +188,7 @@ namespace Org.OpenAPITools.Client
//Concatenate headers value separated by new line
var headerValuesString = string.Join("\n", headerValuesList);
var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
var signatureStringHash = GetStringHash(HashAlgorithm, headerValuesString);
string headerSignatureStr = null;
var keyType = GetKeyType(KeyFilePath);
@@ -223,15 +215,27 @@ namespace Org.OpenAPITools.Client
return HttpSignedRequestHeader;
}
private byte[] GetStringHash(string hashName, string stringToBeHashed)
private byte[] GetStringHash(HashAlgorithmName hashAlgorithmName, string stringToBeHashed)
{
var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
HashAlgorithm hashAlgorithm = null;
if (hashAlgorithmName == HashAlgorithmName.SHA1)
hashAlgorithm = SHA1.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA256)
hashAlgorithm = SHA256.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA512)
hashAlgorithm = SHA512.Create();
if (hashAlgorithmName == HashAlgorithmName.MD5)
hashAlgorithm = MD5.Create();
if (hashAlgorithm == null)
throw new NullReferenceException($"{ nameof(hashAlgorithm) } was null.");
var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
var stringHash = hashAlgorithm.ComputeHash(bytes);
byte[] bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
byte[] stringHash = hashAlgorithm.ComputeHash(bytes);
return stringHash;
}
@@ -588,7 +592,7 @@ namespace Org.OpenAPITools.Client
Array.Copy(salt, 0, data00, psbytes.Length, salt.Length); //concatenate the salt bytes
// ---- do multi-hashing and concatenate results D1, D2 ... into keymaterial bytes ----
MD5 md5 = new MD5CryptoServiceProvider();
MD5 md5 = MD5.Create();
byte[] result = null;
byte[] hashtarget = new byte[HASHLENGTH + data00.Length]; //fixed length initial hashtarget
@@ -677,6 +681,5 @@ namespace Org.OpenAPITools.Client
return keyType;
}
#endregion
}
}

37
samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
View File

@@ -24,7 +24,6 @@ namespace Org.OpenAPITools.Client
/// </summary>
public class HttpSigningConfiguration
{
#region
/// <summary>
/// Create an instance
/// </summary>
@@ -38,9 +37,7 @@ namespace Org.OpenAPITools.Client
SigningAlgorithm = signingAlgorithm;
SignatureValidityPeriod = signatureValidityPeriod;
}
#endregion
#region Properties
/// <summary>
///Gets the Api keyId
/// </summary>
@@ -76,18 +73,13 @@ namespace Org.OpenAPITools.Client
/// </summary>
public int SignatureValidityPeriod { get; set; }
#endregion
#region enum
private enum PrivateKeyType
{
None = 0,
RSA = 1,
ECDSA = 2,
}
#endregion
#region Methods
/// <summary>
/// Gets the Headers for HttpSigning
/// </summary>
@@ -134,12 +126,12 @@ namespace Org.OpenAPITools.Client
if (HashAlgorithm == HashAlgorithmName.SHA256)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-256={0}", Convert.ToBase64String(bodyDigest));
}
else if (HashAlgorithm == HashAlgorithmName.SHA512)
{
var bodyDigest = GetStringHash(HashAlgorithm.ToString(), requestBody);
var bodyDigest = GetStringHash(HashAlgorithm, requestBody);
digest = string.Format("SHA-512={0}", Convert.ToBase64String(bodyDigest));
}
else
@@ -196,7 +188,7 @@ namespace Org.OpenAPITools.Client
//Concatenate headers value separated by new line
var headerValuesString = string.Join("\n", headerValuesList);
var signatureStringHash = GetStringHash(HashAlgorithm.ToString(), headerValuesString);
var signatureStringHash = GetStringHash(HashAlgorithm, headerValuesString);
string headerSignatureStr = null;
var keyType = GetKeyType(KeyFilePath);
@@ -223,15 +215,27 @@ namespace Org.OpenAPITools.Client
return HttpSignedRequestHeader;
}
private byte[] GetStringHash(string hashName, string stringToBeHashed)
private byte[] GetStringHash(HashAlgorithmName hashAlgorithmName, string stringToBeHashed)
{
var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
HashAlgorithm hashAlgorithm = null;
if (hashAlgorithmName == HashAlgorithmName.SHA1)
hashAlgorithm = SHA1.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA256)
hashAlgorithm = SHA256.Create();
if (hashAlgorithmName == HashAlgorithmName.SHA512)
hashAlgorithm = SHA512.Create();
if (hashAlgorithmName == HashAlgorithmName.MD5)
hashAlgorithm = MD5.Create();
if (hashAlgorithm == null)
throw new NullReferenceException($"{ nameof(hashAlgorithm) } was null.");
var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
var stringHash = hashAlgorithm.ComputeHash(bytes);
byte[] bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
byte[] stringHash = hashAlgorithm.ComputeHash(bytes);
return stringHash;
}
@@ -588,7 +592,7 @@ namespace Org.OpenAPITools.Client
Array.Copy(salt, 0, data00, psbytes.Length, salt.Length); //concatenate the salt bytes
// ---- do multi-hashing and concatenate results D1, D2 ... into keymaterial bytes ----
MD5 md5 = new MD5CryptoServiceProvider();
MD5 md5 = MD5.Create();
byte[] result = null;
byte[] hashtarget = new byte[HASHLENGTH + data00.Length]; //fixed length initial hashtarget
@@ -677,6 +681,5 @@ namespace Org.OpenAPITools.Client
return keyType;
}
#endregion
}
}