Merge branch 'release-1.1' into dev-78415

Author: mkachk

cscglobal-caplugin/CHANGELOG.md

@@ -0,0 +1,9 @@
+v1.1.0  
+- Support for custom fields in enrollment  
+- Support for returning CNAME tokens from enrollment call  
+
+v1.0.1 
+- Fixed issue with SANs not being read correctly.  
+
+v1.0
+- Initial Release.

cscglobal-caplugin/CSCGlobalCAPlugin.cs

@@ -210,7 +210,7 @@ public async Task<EnrollmentResult> Enroll(string csr, string subject, Dictionar
                 IRegistrationResponse enrollmentResponse;
                 if (!productInfo.ProductParameters.ContainsKey("PriorCertSN"))
                 {
-                    enrollmentRequest = _requestManager.GetRegistrationRequest(productInfo, csr, san);
+                    enrollmentRequest = _requestManager.GetRegistrationRequest(productInfo, csr, san, customFields);
                     Logger.LogTrace($"Enrollment Request JSON: {JsonConvert.SerializeObject(enrollmentRequest)}");
                     enrollmentResponse =
                         Task.Run(async () => await CscGlobalClient.SubmitRegistrationAsync(enrollmentRequest))
@@ -252,7 +252,7 @@ public async Task<EnrollmentResult> Enroll(string csr, string subject, Dictionar
                         uUId = await _certificateDataReader.GetRequestIDBySerialNumber(
                             productInfo.ProductParameters["PriorCertSN"]);
                         Logger.LogTrace($"Renew uUId: {uUId}");
-                        renewRequest = _requestManager.GetRenewalRequest(productInfo, uUId, csr, san);
+                        renewRequest = _requestManager.GetRenewalRequest(productInfo, uUId, csr, san, customFields);
                         Logger.LogTrace($"Renewal Request JSON: {JsonConvert.SerializeObject(renewRequest)}");
                         var renewResponse = Task.Run(async () => await CscGlobalClient.SubmitRenewalAsync(renewRequest))
                             .Result;
@@ -277,7 +277,7 @@ public async Task<EnrollmentResult> Enroll(string csr, string subject, Dictionar
                         productInfo.ProductParameters["PriorCertSN"]);
                     uUId = requestid.Substring(0, 36); //uUId is a GUID
                     Logger.LogTrace($"Reissue uUId: {uUId}");
-                    reissueRequest = _requestManager.GetReissueRequest(productInfo, uUId, csr, san);
+                    reissueRequest = _requestManager.GetReissueRequest(productInfo, uUId, csr, san, customFields);
                     Logger.LogTrace($"Reissue JSON: {JsonConvert.SerializeObject(reissueRequest)}");
                     var reissueResponse = Task.Run(async () => await CscGlobalClient.SubmitReissueAsync(reissueRequest))
                         .Result;

cscglobal-caplugin/Interfaces/IGetCustomField.cs

@@ -11,4 +11,4 @@ public interface IGetCustomField
 {
     string Label { get; set; }
     bool Mandatory { get; set; }
-}
+}

cscglobal-caplugin/RequestManager.cs

@@ -12,14 +12,16 @@
 using Keyfactor.Extensions.CAPlugin.CSCGlobal.Interfaces;
 using Keyfactor.PKI.Enums.EJBCA;
 
+using Org.BouncyCastle.Bcpg;
+
 namespace Keyfactor.Extensions.CAPlugin.CSCGlobal;
 
 public class RequestManager
 {
     public static Func<string, string> Pemify = ss =>
         ss.Length <= 64 ? ss : ss.Substring(0, 64) + "\n" + Pemify(ss.Substring(64));
 
-    private List<CustomField> GetCustomFields(EnrollmentProductInfo productInfo)
+    private List<CustomField> GetCustomFields(EnrollmentProductInfo productInfo, List<GetCustomField> customFields)
     {
         var customFieldList = new List<CustomField>();
         foreach (var field in customFields)
@@ -138,7 +140,7 @@ public DomainControlValidation GetDomainControlValidation(string methodType, str
     }
 
     public RegistrationRequest GetRegistrationRequest(EnrollmentProductInfo productInfo, string csr,
-        Dictionary<string, string[]> sans)
+        Dictionary<string, string[]> sans, List<GetCustomField> customFields)
     {
         //var cert = "-----BEGIN CERTIFICATE REQUEST-----\r\n";
         var cert = Pemify(csr);
@@ -166,7 +168,7 @@ public RegistrationRequest GetRegistrationRequest(EnrollmentProductInfo productI
             OrganizationContact = productInfo.ProductParameters["Organization Contact"],
             BusinessUnit = productInfo.ProductParameters["Business Unit"],
             ShowPrice = true, //User should not have to fill this out
-            CustomFields = GetCustomFields(productInfo),
+            CustomFields = GetCustomFields(productInfo, customFields),
             SubjectAlternativeNames = certificateType == "2" ? GetSubjectAlternativeNames(productInfo, sans) : null,
             EvCertificateDetails = certificateType == "3" ? GetEvCertificateDetails(productInfo) : null
         };
@@ -212,7 +214,7 @@ public Notifications GetNotifications(EnrollmentProductInfo productInfo)
     }
 
     public RenewalRequest GetRenewalRequest(EnrollmentProductInfo productInfo, string uUId, string csr,
-        Dictionary<string, string[]> sans)
+        Dictionary<string, string[]> sans, List<GetCustomField> customFields)
     {
         //var cert = "-----BEGIN CERTIFICATE REQUEST-----\r\n";
         var cert = Pemify(csr);
@@ -241,7 +243,7 @@ public RenewalRequest GetRenewalRequest(EnrollmentProductInfo productInfo, strin
             BusinessUnit = productInfo.ProductParameters["Business Unit"],
             ShowPrice = true,
             SubjectAlternativeNames = certificateType == "2" ? GetSubjectAlternativeNames(productInfo, sans) : null,
-            CustomFields = GetCustomFields(productInfo),
+            CustomFields = GetCustomFields(productInfo, customFields),
             EvCertificateDetails = certificateType == "3" ? GetEvCertificateDetails(productInfo) : null
         };
     }
@@ -270,7 +272,7 @@ private List<SubjectAlternativeName> GetSubjectAlternativeNames(EnrollmentProduc
     }
 
     public ReissueRequest GetReissueRequest(EnrollmentProductInfo productInfo, string uUId, string csr,
-        Dictionary<string, string[]> sans)
+        Dictionary<string, string[]> sans, List<GetCustomField> customFields)
     {
         //var cert = "-----BEGIN CERTIFICATE REQUEST-----\r\n";
         var cert = Pemify(csr);
@@ -299,7 +301,7 @@ public ReissueRequest GetReissueRequest(EnrollmentProductInfo productInfo, strin
             BusinessUnit = productInfo.ProductParameters["Business Unit"],
             ShowPrice = true,
             SubjectAlternativeNames = certificateType == "2" ? GetSubjectAlternativeNames(productInfo, sans) : null,
-            CustomFields = GetCustomFields(productInfo),
+            CustomFields = GetCustomFields(productInfo, customFields),
             EvCertificateDetails = certificateType == "3" ? GetEvCertificateDetails(productInfo) : null
         };
     }