Fix handling of bad password attempts and improve task cancellation logic so we finish quick on quick scans

Author: coj337

TheSprayer/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "TheSprayer": {
       "commandName": "Project",
-      "commandLineArgs": "-p vagrant -U vagrant -P vagrant -d sevenkingdoms.local -s 192.168.56.10"
+      "commandLineArgs": "-p Heartsbane -U vagrant -P vagrant -d north.sevenkingdoms.local -s 192.168.56.11"
     }
   }
 }

TheSprayer/Services/ActiveDirectoryService.cs

@@ -227,12 +227,17 @@ public List<ActiveDirectoryUser> GetAllDomainUsers(IEnumerable<string> userSamAc
                         if(lastBadPwdTime == null)
                         {
                             var intEntry = entry.Attributes.GetIfExists<int?>("badPasswordTime");
-                            if (intEntry == 0)
+                            if (intEntry == 0 || intEntry == null)
                             {
                                 lastBadPwdTime = entry.Attributes.GetIfExists<DateTime?>("createTimeStamp") ?? DateTime.MinValue;
                             }
                         }
 
+                        if (badPwdCount == null)
+                        {
+                            badPwdCount = 0;
+                        }
+
                         if (badPwdCount == null || lastBadPwdTime == null)
                         {
                             var sam = entry.Attributes.GetIfExists("sAMAccountName");
@@ -369,11 +374,15 @@ public async void SprayPasswords(
             var cancellationTokenSource = new CancellationTokenSource();
             var saveTask = Task.Run(async () =>
             {
-                while (!cancellationTokenSource.Token.IsCancellationRequested)
+                try
                 {
-                    await Task.Delay(TimeSpan.FromSeconds(10));
-                    SaveUnsavedAttempts(unsavedAttempts, noDb);
+                    while (!cancellationTokenSource.Token.IsCancellationRequested)
+                    {
+                        await Task.Delay(TimeSpan.FromSeconds(10), cancellationTokenSource.Token);
+                        SaveUnsavedAttempts(unsavedAttempts, noDb);
+                    }
                 }
+                catch (OperationCanceledException) { }
             }, cancellationTokenSource.Token);
 
             try
@@ -516,7 +525,7 @@ public async void SprayPasswords(
             finally
             {
                 cancellationTokenSource.Cancel();
-                saveTask.Wait();
+                try { saveTask.Wait(); } catch (AggregateException) { }
                 SaveUnsavedAttempts(unsavedAttempts, noDb);
             }
         }