merge Release 1.1.2 to main

doebrowsk · web-flow · commit 13001026b188 · 2025-01-17T19:39:23.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+v1.1.2
+- Fix Renewal bug referencing the wrong REST Resource V1
+  
 v1.1.1
 - Fix Revoke Serial Number Mismatch KF 10.1 and 22.1.0 GW combination
 - Only Syncing and GetSingleRecord on End Entity Cert to prevent errors.
diff --git a/CscGlobalCaProxy/Client/CscGlobalClient.cs b/CscGlobalCaProxy/Client/CscGlobalClient.cs
@@ -59,25 +59,30 @@ public async Task<RegistrationResponse> SubmitRegistrationAsync(
         public async Task<RenewalResponse> SubmitRenewalAsync(
             RenewalRequest renewalRequest)
         {
-            using (var resp = await RestClient.PostAsync("/tls/renewal", new StringContent(
+            using (var resp = await RestClient.PostAsync("/dbs/api/v2/tls/renewal", new StringContent(
                 JsonConvert.SerializeObject(renewalRequest), Encoding.ASCII, "application/json")))
             {
                 Logger.Trace(JsonConvert.SerializeObject(renewalRequest));
 
                 var settings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
                 if (resp.StatusCode == HttpStatusCode.BadRequest) //Csc Sends Errors back in 400 Json Response
                 {
+                    var rawErrorResponse = await resp.Content.ReadAsStringAsync();
+                    Logger.Trace("Logging Error Response Raw");
+                    Logger.Trace(rawErrorResponse);
                     var errorResponse =
-                        JsonConvert.DeserializeObject<RegistrationError>(await resp.Content.ReadAsStringAsync(),
+                        JsonConvert.DeserializeObject<RegistrationError>(rawErrorResponse,
                             settings);
                     var response = new RenewalResponse();
                     response.RegistrationError = errorResponse;
                     response.Result = null;
                     return response;
                 }
-
+                var rawRenewResponse = await resp.Content.ReadAsStringAsync();
+                Logger.Trace("Logging Success Response Raw");
+                Logger.Trace(rawRenewResponse);
                 var renewalResponse =
-                    JsonConvert.DeserializeObject<RenewalResponse>(await resp.Content.ReadAsStringAsync());
+                    JsonConvert.DeserializeObject<RenewalResponse>(rawRenewResponse);
                 return renewalResponse;
             }
         }
diff --git a/CscGlobalCaProxy/RequestManager.cs b/CscGlobalCaProxy/RequestManager.cs
@@ -24,14 +24,14 @@ public EnrollmentResult GetRenewResponse(RenewalResponse renewResponse)
                 return new EnrollmentResult
                 {
                     Status = 30, //failure
-                    CARequestID = renewResponse.Result.Status.Uuid,
+                    CARequestID = renewResponse?.Result?.Status?.Uuid,
                     StatusMessage = renewResponse.RegistrationError.Description
                 };
 
             return new EnrollmentResult
             {
                 Status = 13, //success
-
+                CARequestID = renewResponse?.Result?.Status?.Uuid,
                 StatusMessage = $"Renewal Successfully Completed For {renewResponse.Result.CommonName}"
             };
         }
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ This gateway extension was compiled against version  of the AnyCA Gateway DCOM F
 *** 
 # Getting Started
 ## Standard Gateway Installation
-To begin, you must have the CA Gateway Service 21.3.2 installed and operational before attempting to configure the CSC Global plugin. This integration was tested with Keyfactor 8.7.0.0.
+To begin, you must have the CA Gateway Service 22.1.0 installed and operational before attempting to configure the CSC Global plugin. This integration was tested with Keyfactor 10.4.0.0.
 To install the gateway follow these instructions.
 
 1) Gateway Server - run the installation .msi - Get from Keyfactor
diff --git a/readme_source.md b/readme_source.md
@@ -1,7 +1,7 @@
 *** 
 # Getting Started
 ## Standard Gateway Installation
-To begin, you must have the CA Gateway Service 21.3.2 installed and operational before attempting to configure the CSC Global plugin. This integration was tested with Keyfactor 8.7.0.0.
+To begin, you must have the CA Gateway Service 22.1.0 installed and operational before attempting to configure the CSC Global plugin. This integration was tested with Keyfactor 10.4.0.0.
 To install the gateway follow these instructions.
 
 1) Gateway Server - run the installation .msi - Get from Keyfactor

Original file line number	Diff line number	Diff line change
`@@ -59,25 +59,30 @@ public async Task<RegistrationResponse> SubmitRegistrationAsync(`
`59`	`59`	`public async Task<RenewalResponse> SubmitRenewalAsync(`
`60`	`60`	`RenewalRequest renewalRequest)`
`61`	`61`	`{`
`62`		`- using (var resp = await RestClient.PostAsync("/tls/renewal", new StringContent(`
	`62`	`+ using (var resp = await RestClient.PostAsync("/dbs/api/v2/tls/renewal", new StringContent(`
`63`	`63`	`JsonConvert.SerializeObject(renewalRequest), Encoding.ASCII, "application/json")))`
`64`	`64`	`{`
`65`	`65`	`Logger.Trace(JsonConvert.SerializeObject(renewalRequest));`
`66`	`66`
`67`	`67`	`var settings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };`
`68`	`68`	`if (resp.StatusCode == HttpStatusCode.BadRequest) //Csc Sends Errors back in 400 Json Response`
`69`	`69`	`{`
	`70`	`+ var rawErrorResponse = await resp.Content.ReadAsStringAsync();`
	`71`	`+ Logger.Trace("Logging Error Response Raw");`
	`72`	`+ Logger.Trace(rawErrorResponse);`
`70`	`73`	`var errorResponse =`
`71`		`- JsonConvert.DeserializeObject<RegistrationError>(await resp.Content.ReadAsStringAsync(),`
	`74`	`+ JsonConvert.DeserializeObject<RegistrationError>(rawErrorResponse,`
`72`	`75`	`settings);`
`73`	`76`	`var response = new RenewalResponse();`
`74`	`77`	`response.RegistrationError = errorResponse;`
`75`	`78`	`response.Result = null;`
`76`	`79`	`return response;`
`77`	`80`	`}`
`78`		`-`
	`81`	`+ var rawRenewResponse = await resp.Content.ReadAsStringAsync();`
	`82`	`+ Logger.Trace("Logging Success Response Raw");`
	`83`	`+ Logger.Trace(rawRenewResponse);`
`79`	`84`	`var renewalResponse =`
`80`		`- JsonConvert.DeserializeObject<RenewalResponse>(await resp.Content.ReadAsStringAsync());`
	`85`	`+ JsonConvert.DeserializeObject<RenewalResponse>(rawRenewResponse);`
`81`	`86`	`return renewalResponse;`
`82`	`87`	`}`
`83`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ public EnrollmentResult GetRenewResponse(RenewalResponse renewResponse)`
`24`	`24`	`return new EnrollmentResult`
`25`	`25`	`{`
`26`	`26`	`Status = 30, //failure`
`27`		`- CARequestID = renewResponse.Result.Status.Uuid,`
	`27`	`+ CARequestID = renewResponse?.Result?.Status?.Uuid,`
`28`	`28`	`StatusMessage = renewResponse.RegistrationError.Description`
`29`	`29`	`};`
`30`	`30`
`31`	`31`	`return new EnrollmentResult`
`32`	`32`	`{`
`33`	`33`	`Status = 13, //success`
`34`		`-`
	`34`	`+ CARequestID = renewResponse?.Result?.Status?.Uuid,`
`35`	`35`	`StatusMessage = $"Renewal Successfully Completed For {renewResponse.Result.CommonName}"`
`36`	`36`	`};`
`37`	`37`	`}`