ab#80665

Author: Lee Fine

CitrixAdcOrchestratorJobExtension/Inventory.cs

@@ -22,6 +22,7 @@
 using Keyfactor.Orchestrators.Extensions.Interfaces;
 
 using com.citrix.netscaler.nitro.resource.config.ssl;
+using Newtonsoft.Json;
 
 namespace Keyfactor.Extensions.Orchestrator.CitricAdc
 {
@@ -49,15 +50,18 @@ public JobResult ProcessJob(InventoryJobConfiguration jobConfiguration, SubmitIn
             _logger.LogDebug($"Client Machine: {jobConfiguration.CertificateStoreDetails.ClientMachine}");
             _logger.LogDebug($"UseSSL: {jobConfiguration.UseSSL}");
             _logger.LogDebug($"StorePath: {jobConfiguration.CertificateStoreDetails.StorePath}");
+
             ServerPassword = ResolvePamField("ServerPassword", jobConfiguration.ServerPassword);
             ServerUserName = ResolvePamField("ServerUserName", jobConfiguration.ServerUsername);
 
+            dynamic properties = JsonConvert.DeserializeObject(jobConfiguration.CertificateStoreDetails.Properties.ToString());
+            var timeout = properties.timeout == null || string.IsNullOrEmpty(properties.timeout.Value) ? null : Convert.ToInt32(properties.timeout.Value);
 
             _logger.LogDebug("Entering ProcessJob");
             CitrixAdcStore store = new CitrixAdcStore(jobConfiguration, ServerUserName, ServerPassword);
 
             _logger.LogDebug("Logging into Citrix...");
-            store.Login();
+            store.Login(timeout);
 
             JobResult result = ProcessJob(store, jobConfiguration, submitInventoryUpdate);
 

CitrixAdcOrchestratorJobExtension/Management.cs

@@ -62,12 +62,16 @@ public JobResult ProcessJob(ManagementJobConfiguration jobConfiguration)
             ServerPassword = ResolvePamField("ServerPassword", jobConfiguration.ServerPassword);
             ServerUserName = ResolvePamField("ServerUserName", jobConfiguration.ServerUsername);
 
+            dynamic properties = JsonConvert.DeserializeObject(jobConfiguration.CertificateStoreDetails.Properties.ToString());
+            var linkToIssuer = properties.linkToIssuer == null || string.IsNullOrEmpty(properties.linkToIssuer.Value) ? false : Convert.ToBoolean(properties.linkToIssuer.Value);
+            var timeout = properties.timeout == null || string.IsNullOrEmpty(properties.timeout.Value) ? null : Convert.ToInt32(properties.timeout.Value);
+
             ApplicationSettings.Initialize(this.GetType().Assembly.Location);
 
             var store = new CitrixAdcStore(jobConfiguration, ServerUserName, ServerPassword);
 
             _logger.LogDebug("Logging into Citrix...");
-            store.Login();
+            store.Login(timeout);
 
             try
             {
@@ -89,9 +93,6 @@ public JobResult ProcessJob(ManagementJobConfiguration jobConfiguration)
                         var virtualServerName = (string)jobConfiguration.JobProperties["virtualServerName"];
                         var sniCert = (string)jobConfiguration.JobProperties["sniCert"];
 
-                        dynamic properties = JsonConvert.DeserializeObject(jobConfiguration.CertificateStoreDetails.Properties.ToString());
-                        var linkToIssuer = properties.linkToIssuer == null || string.IsNullOrEmpty(properties.linkToIssuer.Value) ? false : Convert.ToBoolean(properties.linkToIssuer.Value);
-
                         _logger.LogTrace($"alias: {jobConfiguration.JobCertificate.Alias} virtualServerName {virtualServerName}");
 
                         if (!aliasExists)

integration-manifest.json

@@ -65,6 +65,15 @@
                       "DefaultValue": "false",
                       "Required": false,
                       "Description": "Determines whether an attempt will be made to link the added certificate (via a Management-Add job) to its issuing CA certificate."
+                    },
+                    {
+                      "Name": "timeout",
+                      "DisplayName": "API Timeout in seconds",
+                      "Type": "String",
+                      "DependsOn": "",
+                      "DefaultValue": "3600",
+                      "Required": false,
+                      "Description": "Determines timeout in seconds for all Citrix ADC API calls."
                     }
                   ],
                     "EntryParameters": [