Merge 1.0.2 to main

CHANGELOG.md

@@ -4,3 +4,6 @@ Inital Release.  Support for Enroll, Sync, and Revocation.
 1.0.1  
 Bugfix - sync records with null serial    
 Bugfix - Fix for custom fields in enrollment  
+
+1.0.2  
+Handle change to Sectigo API Revocation call  

integration-manifest.json

@@ -8,7 +8,8 @@
     "update_catalog": true,
     "description": "Sectigo Certificate Manager plugin for the AnyCA REST Gateway framework",
     "gateway_framework": "24.2.0",
-    "release_dir": "sectigo-scm-caplugin/bin/Release/net6.0",
+    "release_dir": "sectigo-scm-caplugin/bin/Release",
+    "release_project": "sectigo-scm-caplugin/sectigo-scm-caplugin.csproj",
     "about": {
         "carest": {
             "ca_plugin_config": [

sectigo-scm-caplugin/Client/SectigoClient.cs

@@ -140,10 +140,11 @@ public async Task<List<Certificate>> PageCertificates(int position = 0, int size
 			return await ProcessResponse<List<Certificate>>(response);
 		}
 
-		public async Task<bool> RevokeSslCertificateById(int sslId, string revreason)
+		public async Task<bool> RevokeSslCertificateById(int sslId, int revcode, string revreason)
 		{
 			JObject o = JObject.FromObject(new
 			{
+				reasonCode = revcode,
 				reason = revreason
 			});
 			var response = await RestClient.PostAsJsonAsync($"api/ssl/v1/revoke/{sslId}", o);

sectigo-scm-caplugin/SectigoCAPlugin.cs

@@ -363,7 +363,7 @@
 			return profileIds.ConvertAll<string> (x => x.ToString ());
 		}
 
 		public async Task<AnyCAPluginCertificate> GetSingleRecord(string caRequestID)
 		{
 			_logger.MethodEntry(LogLevel.Debug);
 
@@ -433,7 +433,7 @@
 			};
 		}
 
 		public async Task Ping()
 		{
 			_logger.MethodEntry(LogLevel.Trace);
 			if (!_config.Enabled)
@@ -456,14 +456,14 @@
 			}
 		}
 
 		public async Task<int> Revoke(string caRequestID, string hexSerialNumber, uint revocationReason)
 		{
 			_logger.MethodEntry(LogLevel.Debug);
 
 			try
 			{
 				var client = SectigoClient.InitializeClient(_config);
-				var response = Task.Run(async () => await client.RevokeSslCertificateById(int.Parse(caRequestID), RevokeReasonToString(revocationReason))).Result;
+				var response = Task.Run(async () => await client.RevokeSslCertificateById(int.Parse(caRequestID), (int)revocationReason, RevokeReasonToString(revocationReason))).Result;
 
 				_logger.MethodExit(LogLevel.Debug);
 				if (response)//will throw an exception if false
@@ -478,7 +478,7 @@
 			}
 		}
 
 		public async Task Synchronize(BlockingCollection<AnyCAPluginCertificate> blockingBuffer, DateTime? lastSync, bool fullSync, CancellationToken cancelToken)
 		{
 			_logger.MethodEntry(LogLevel.Debug);
 
@@ -622,7 +622,7 @@
 
 		}
 
 		public async Task ValidateCAConnectionInfo(Dictionary<string, object> connectionInfo)
 		{
 			_logger.MethodEntry(LogLevel.Debug);
 			//determine required fields
@@ -649,7 +649,7 @@
 			return string.Empty;
 		}
 
 		public async Task ValidateProductInfo(EnrollmentProductInfo productInfo, Dictionary<string, object> connectionInfo)
 		{
 			_logger.MethodEntry(LogLevel.Debug);
 			string rawConfig = JsonConvert.SerializeObject(connectionInfo);
@@ -722,7 +722,7 @@
 			};
 		}
 
 		private async Task<EnrollmentResult> PickUpEnrolledCertificate(int sslId, string subject)
 		{
 			_logger.MethodEntry(LogLevel.Debug);
 			int retryCounter = 0;
@@ -875,26 +875,18 @@
 		{
 			switch (revokeType)
 			{
+				case 0:
+					return "Unspecified";
 				case 1:
 					return "Compromised Key";
-
-				case 2:
-					return "CA Compromised";
-
 				case 3:
 					return "Affiliation Changed";
-
 				case 4:
 					return "Superseded";
-
 				case 5:
 					return "Cessation of Operation";
-
-				case 6:
-					return "Certificate Hold";
-
 				default:
-					return "Unspecified";
+					throw new Exception($"Invalid revocation code: {revokeType.ToString()}. Valid values are 0,1,3-5");
 			}
 		}
 	}