ab#80665

Author: Lee Fine

CitrixAdcOrchestratorJobExtension/CitrixAdcStore.cs

@@ -34,13 +34,14 @@
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Pkcs;
+using Keyfactor.Orchestrators.Common.Enums;
 
 namespace Keyfactor.Extensions.Orchestrator.CitricAdc
 {
     // ReSharper disable once InconsistentNaming
     internal class CitrixAdcStore
     {
-        private const uint Timeout = 3600;
+        private const uint DefaultTimeout = 3600;
         public static readonly string StoreType = "CitrixAdc";
 
         private readonly string _clientMachine;
@@ -51,6 +52,7 @@ internal class CitrixAdcStore
         public readonly string StorePath;
         private readonly string _username;
         private readonly bool _useSsl;
+        private readonly uint _timeout;
 
         private nitro_service _nss;
 
@@ -61,6 +63,12 @@ public CitrixAdcStore(InventoryJobConfiguration config, string serverUserName, s
                 Logger = LogHandler.GetClassLogger<CitrixAdcStore>();
                 Logger.MethodEntry(LogLevel.Debug);
 
+                dynamic properties = JsonConvert.DeserializeObject(config.CertificateStoreDetails.Properties.ToString());
+                if (!UInt32.TryParse((properties.timeout == null || string.IsNullOrEmpty(properties.timeout.Value) ? DefaultTimeout : properties.timeout.Value), out _timeout))
+                {
+                    Logger.LogWarning($"Missing or invalid Custom Field 'timeout' value {properties.timeout.Value}.  Value must be an integer.  Will use default value of {DefaultTimeout.ToString()}");
+                }
+
                 _clientMachine = config.CertificateStoreDetails.ClientMachine;
                 StorePath = StripTrailingSlash(config.CertificateStoreDetails.StorePath);
                 var o = new systemfile_args();
@@ -123,11 +131,11 @@ public CitrixAdcStore(ManagementJobConfiguration config, string serverUserName,
         // ReSharper disable once UnusedAutoPropertyAccessor.Local
         private ILogger Logger { get; }
 
-        public void Login(uint? timeout)
+        public void Login()
         {
             Logger.MethodEntry(LogLevel.Debug);
             _nss ??= new nitro_service(_clientMachine, _useSsl ? "https" : "http");
-            _nss.set_timeout(timeout == 0 ? Timeout : timeout);
+            _nss.set_timeout(_timeout);
 
             base_response response = null;
             try

CitrixAdcOrchestratorJobExtension/Inventory.cs

@@ -55,26 +55,11 @@ public JobResult ProcessJob(InventoryJobConfiguration jobConfiguration, SubmitIn
             ServerPassword = ResolvePamField("ServerPassword", jobConfiguration.ServerPassword);
             ServerUserName = ResolvePamField("ServerUserName", jobConfiguration.ServerUsername);
 
-            dynamic properties = JsonConvert.DeserializeObject(jobConfiguration.CertificateStoreDetails.Properties.ToString());
-            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);
 
             _logger.LogDebug("Logging into Citrix...");
-            store.Login(timeout);
+            store.Login();
 
             JobResult result = ProcessJob(store, jobConfiguration, submitInventoryUpdate);
 

CitrixAdcOrchestratorJobExtension/Management.cs

@@ -65,26 +65,12 @@ 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);
 
-            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);
 
             var store = new CitrixAdcStore(jobConfiguration, ServerUserName, ServerPassword);
 
             _logger.LogDebug("Logging into Citrix...");
-            store.Login(timeout);
+            store.Login();
 
             try
             {