Skip to content

Commit

Permalink
ab#59979
Browse files Browse the repository at this point in the history
  • Loading branch information
leefine02 authored and leefine02 committed Jun 25, 2024
1 parent a14c191 commit a5c1554
Showing 1 changed file with 35 additions and 9 deletions.
44 changes: 35 additions & 9 deletions RemoteFile/ReenrollmentBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using Org.BouncyCastle.Crypto.Prng;
using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Pkcs;
using System.Linq;

namespace Keyfactor.Extensions.Orchestrator.RemoteFile
{
Expand All @@ -33,6 +34,12 @@ public abstract class ReenrollmentBase : RemoteFileJobTypeBase, IReenrollmentJob

internal RemoteCertificateStore certificateStore = new RemoteCertificateStore();

internal enum SupportedKeyTypeEnum
{
RSA,
ECC
}

public JobResult ProcessJob(ReenrollmentJobConfiguration config, SubmitReenrollmentCSR submitReenrollmentUpdate)
{
ILogger logger = LogHandler.GetClassLogger(this.GetType());
Expand All @@ -59,10 +66,20 @@ public JobResult ProcessJob(ReenrollmentJobConfiguration config, SubmitReenrollm
string sudoImpersonatedUser = properties.SudoImpersonatedUser == null || string.IsNullOrEmpty(properties.SudoImpersonatedUser.Value) ?
ApplicationSettings.DefaultSudoImpersonatedUser :
properties.SudoImpersonatedUser.Value;
bool createCSROnDevice = properties.CreateCSROnDevice == null || string.IsNullOrEmpty(properties.CreateCSROnDevice.Value) ?
ApplicationSettings.CreateCSROnDevice :
bool createCSROnDevice = properties.CreateCSROnDevice == null || string.IsNullOrEmpty(properties.CreateCSROnDevice.Value) ?
ApplicationSettings.CreateCSROnDevice :
properties.CreateCSROnDevice.Value;

string keyType = !config.JobProperties.ContainsKey("keyType") || config.JobProperties["keyType"] == null || string.IsNullOrEmpty(config.JobProperties["keyType"].ToString()) ? string.Empty : config.JobProperties["keyType"].ToString();
int? keySize = !config.JobProperties.ContainsKey("keySize") || config.JobProperties["keySize"] == null || string.IsNullOrEmpty(config.JobProperties["keySize"].ToString()) ? null : Convert.ToInt32(config.JobProperties["keySize"]);
string subjectText = !config.JobProperties.ContainsKey("subjectText") || config.JobProperties["subjectText"] == null || config.JobProperties["subjectText"] == null || string.IsNullOrEmpty(config.JobProperties["subjectText"].ToString()) ? string.Empty : config.JobProperties["subjectText"].ToString();
string sans = !config.JobProperties.ContainsKey("SANs") || config.JobProperties["SANs"] == null || string.IsNullOrEmpty(config.JobProperties["SANs"].ToString()) ? string.Empty : config.JobProperties["SANs"].ToString();

string keyTypes = string.Join(",", Enum.GetNames(typeof(SupportedKeyTypeEnum)));
if (!Enum.TryParse(keyType.ToUpper(), out SupportedKeyTypeEnum keyTypeEnum))
{
throw new RemoteFileException($"Unsupported KeyType value {keyType}. Supported types are {keyTypes}.");
}
certificateStore = new RemoteCertificateStore(config.CertificateStoreDetails.ClientMachine, userName, userPassword, config.CertificateStoreDetails.StorePath, storePassword, config.JobProperties);
certificateStore.Initialize(sudoImpersonatedUser);

Expand All @@ -76,11 +93,11 @@ public JobResult ProcessJob(ReenrollmentJobConfiguration config, SubmitReenrollm
certificateStore.LoadCertificateStore(certificateStoreSerializer, config.CertificateStoreDetails.Properties, false);
if (createCSROnDevice)
{
config.
throw new Exception("Not implemented");
}
else
{

string csr = GenerateCSR

Check failure on line 100 in RemoteFile/ReenrollmentBase.cs

View workflow job for this annotation

GitHub Actions / call-starter-workflow / call-dotnet-build-and-release-workflow / dotnet-build-and-release 

; expected
}
certificateStore.AddCertificate((config.JobCertificate.Alias ?? new X509Certificate2(Convert.FromBase64String(config.JobCertificate.Contents), config.JobCertificate.PrivateKeyPassword, X509KeyStorageFlags.EphemeralKeySet).Thumbprint), config.JobCertificate.Contents, config.Overwrite, config.JobCertificate.PrivateKeyPassword);
certificateStore.SaveCertificateStore(certificateStoreSerializer.SerializeRemoteCertificateStore(certificateStore.GetCertificateStore(), storePathFile.Path, storePathFile.File, storePassword, certificateStore.RemoteHandler));
Expand All @@ -103,7 +120,7 @@ public JobResult ProcessJob(ReenrollmentJobConfiguration config, SubmitReenrollm
return new JobResult() { Result = OrchestratorJobStatusJobResult.Success, JobHistoryId = config.JobHistoryId };
}

private string GenerateCSR(string subjectText, List<string> sans)
private string GenerateCSR(string subjectText, SupportedKeyTypeEnum keyType, int keySize, List<string> sans)
{
//Code logic to:
// 1) Generate a new CSR
Expand All @@ -114,9 +131,18 @@ private string GenerateCSR(string subjectText, List<string> sans)

// this approach relies on the Bouncy Castle Crypto package, and not the Microsoft x509 certificate libraries.

var keyGenParams = new KeyGenerationParameters(new Org.BouncyCastle.Security.SecureRandom(new CryptoApiRandomGenerator()), 4096);
var keyPairGenerator = new RsaKeyPairGenerator();
Org.BouncyCastle.Crypto.Generators.
IAsymmetricCipherKeyPairGenerator keyPairGenerator = null;
switch (keyType)
{
case SupportedKeyTypeEnum.RSA:
keyPairGenerator = new RsaKeyPairGenerator();
break;
case SupportedKeyTypeEnum.ECC:
keyPairGenerator = new ECKeyPairGenerator();
break;
}

var keyGenParams = new KeyGenerationParameters(new Org.BouncyCastle.Security.SecureRandom(new CryptoApiRandomGenerator()), keySize);
keyPairGenerator.Init(keyGenParams);

var keyPair = keyPairGenerator.GenerateKeyPair();
Expand All @@ -139,7 +165,7 @@ private string GenerateCSR(string subjectText, List<string> sans)
var extensionsGenerator = new X509ExtensionsGenerator();
extensionsGenerator.AddExtension(X509Extensions.SubjectAlternativeName, false, generalSubAltNames);
extensionsGenerator.AddExtension(X509Extensions.KeyUsage, true, keyUsageExtension);
extensionsGenerator.AddExtension(X509Extensions.ExtendedKeyUsage, false, extendedKeyUsage);
//extensionsGenerator.AddExtension(X509Extensions.ExtendedKeyUsage, false, extendedKeyUsage);
X509Extensions extensions = extensionsGenerator.Generate();

// Create attribute set with extensions
Expand Down

0 comments on commit a5c1554

Please sign in to comment.