ab#80665

Author: Lee Fine

CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs

@@ -123,14 +123,16 @@ public CitrixAdcStore(ManagementJobConfiguration config, string serverUserName,
         // ReSharper disable once UnusedAutoPropertyAccessor.Local
         private ILogger Logger { get; }
 
-        public void Login()
+        public void Login(uint? timeout)
         {
             Logger.MethodEntry(LogLevel.Debug);
             _nss ??= new nitro_service(_clientMachine, _useSsl ? "https" : "http");
+            _nss.set_timeout(timeout == 0 ? Timeout : timeout);
+
             base_response response = null;
             try
             {
-                response = _nss.login(_username, _password, Timeout);
+                response = _nss.login(_username, _password);
                 Logger.LogDebug($"Login Response: {JsonConvert.SerializeObject(response)}");
             }
             catch (Exception ex)

CitrixAdcOrchestratorJobExtension/Inventory.cs

@@ -23,6 +23,7 @@
 
 using com.citrix.netscaler.nitro.resource.config.ssl;
 using Newtonsoft.Json;
+using Keyfactor.Orchestrators.Common.Enums;
 
 namespace Keyfactor.Extensions.Orchestrator.CitricAdc
 {
@@ -55,7 +56,19 @@ public JobResult ProcessJob(InventoryJobConfiguration jobConfiguration, SubmitIn
             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);
+            UInt32 timeout = 0;
+            if (!UInt32.TryParse((properties.timeout == null || string.IsNullOrEmpty(properties.timeout.Value) ? "0" : properties.timeout.Value), out timeout))
+            {
+                string err = $"Invalid Custom Field 'timeout' value {properties.timeout.Value}.  Value must be numeric";
+                _logger.LogError(err);
+                return new JobResult
+                {
+                    Result = OrchestratorJobStatusJobResult.Failure,
+                    JobHistoryId = jobConfiguration.JobHistoryId,
+                    FailureMessage =
+                        $"Site {jobConfiguration.CertificateStoreDetails.StorePath} on server {jobConfiguration.CertificateStoreDetails.ClientMachine}: {err}."
+                };
+            }
 
             _logger.LogDebug("Entering ProcessJob");
             CitrixAdcStore store = new CitrixAdcStore(jobConfiguration, ServerUserName, ServerPassword);

CitrixAdcOrchestratorJobExtension/Management.cs

@@ -64,7 +64,20 @@ public JobResult ProcessJob(ManagementJobConfiguration jobConfiguration)
 
             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);
+
+            UInt32 timeout = 0;
+            if (!UInt32.TryParse((properties.timeout == null || string.IsNullOrEmpty(properties.timeout.Value) ? "0" : properties.timeout.Value), out timeout))
+            {
+                string err = $"Invalid Custom Field 'timeout' value {properties.timeout.Value}.  Value must be numeric";
+                _logger.LogError(err);
+                return new JobResult
+                {
+                    Result = OrchestratorJobStatusJobResult.Failure,
+                    JobHistoryId = jobConfiguration.JobHistoryId,
+                    FailureMessage =
+                        $"Site {jobConfiguration.CertificateStoreDetails.StorePath} on server {jobConfiguration.CertificateStoreDetails.ClientMachine}: {err}."
+                };
+            }
 
             ApplicationSettings.Initialize(this.GetType().Assembly.Location);