chore: refactor out function for readability

SpecterOps · Jul 22, 2024 · 959e1ea · 959e1ea
1 parent bb2abb2
commit 959e1ea
Showing 1 changed file with 28 additions and 21 deletions.
diff --git a/src/CommonLib/Processors/ComputerAvailability.cs b/src/CommonLib/Processors/ComputerAvailability.cs
@@ -88,29 +88,22 @@ await SendComputerStatus(new CSVComputerStatus
                 };
             }
 
-            if (!_skipPasswordCheck)
+            if (!_skipPasswordCheck && !IsComputerActive(pwdLastSet, lastLogon))
             {
-                var passwordLastSet = Helpers.ConvertLdapTimeToLong(pwdLastSet);
-                var lastLogonTimeStamp = Helpers.ConvertLdapTimeToLong(lastLogon);
-                var threshold = DateTime.Now.AddDays(_computerExpiryDays * -1).ToFileTimeUtc();
-
-                if (passwordLastSet < threshold && lastLogonTimeStamp < threshold)
+                _log.LogDebug(
+                    "{ComputerName} is not available because password last set and lastlogontimestamp are out of range",
+                    computerName);
+                await SendComputerStatus(new CSVComputerStatus
+                {
+                    Status = ComputerStatus.NotActive,
+                    Task = "ComputerAvailability",
+                    ComputerName = computerName
+                });
+                return new ComputerStatus
                 {
-                    _log.LogDebug(
-                        "{ComputerName} is not available because password last set and lastlogontimestamp are out of range",
-                        computerName);
-                    await SendComputerStatus(new CSVComputerStatus
-                    {
-                        Status = ComputerStatus.NotActive,
-                        Task = "ComputerAvailability",
-                        ComputerName = computerName
-                    });
-                    return new ComputerStatus
-                    {
-                        Connectable = false,
-                        Error = ComputerStatus.NotActive
-                    };
-                }
+                    Connectable = false,
+                    Error = ComputerStatus.NotActive
+                };
             }
 
             if (_skipPortScan)
@@ -153,6 +146,20 @@ await SendComputerStatus(new CSVComputerStatus
             };
         }
 
+        /// <summary>
+        /// Checks if a computer's passwordlastset/lastlogontimestamp attributes are within a certain range
+        /// </summary>
+        /// <param name="pwdLastSet"></param>
+        /// <param name="lastLogonTimestamp"></param>
+        /// <returns></returns>
+        private bool IsComputerActive(string pwdLastSet, string lastLogonTimestamp) {
+            var passwordLastSet = Helpers.ConvertLdapTimeToLong(pwdLastSet);
+            var lastLogonTimeStamp = Helpers.ConvertLdapTimeToLong(lastLogonTimestamp);
+            var threshold = DateTime.Now.AddDays(_computerExpiryDays * -1).ToFileTimeUtc();
+
+            return passwordLastSet >= threshold || lastLogonTimeStamp >= threshold;
+        }
+
         private async Task SendComputerStatus(CSVComputerStatus status)
         {
             if (ComputerStatusEvent is not null) await ComputerStatusEvent.Invoke(status);