Merge pull request #253 from Blazam-App/Beta-Dev

Fix for new users created as disabled
Blazam-App · Feb 27, 2024 · 45b6453 · 45b6453
2 parents 38d9a12 + bdb10b9
commit 45b6453
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 13 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>0.8.9</AssemblyVersion>
-		<Version>2024.02.26.0341</Version>
+		<Version>2024.02.27.2343</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>

diff --git a/BLAZAMActiveDirectory/ActiveDirectoryContext.cs b/BLAZAMActiveDirectory/ActiveDirectoryContext.cs
@@ -149,6 +149,7 @@ public bool PortOpen
         }
         private DirectoryConnectionStatus _status = DirectoryConnectionStatus.Connecting;
         private IApplicationUserState? currentUser;
+        private IADUser? _keepAliveUser;
 
         public DirectoryConnectionStatus Status
         {
@@ -202,7 +203,6 @@ INotificationPublisher notificationPublisher
             UserStateService = userStateService;
             //UserStateService.UserStateAdded += PopulateUserStateDirectoryUser;
             ConnectAsync();
-            _timer = new Timer(KeepAlive, null, 30000, 30000);
 
             Users = new ADUserSearcher(this);
             Groups = new ADGroupSearcher(this);
@@ -257,7 +257,7 @@ private async void KeepAlive(object? state)
             else if (Status == DirectoryConnectionStatus.OK)
             {
                 //Throw away query used to keep connection alive
-                _ = Users?.FindUsersByString(ConnectionSettings?.Username, false)?.FirstOrDefault();
+                _keepAliveUser = Users?.FindUsersByString(ConnectionSettings?.Username, false)?.FirstOrDefault();
             }
         }
 
@@ -296,6 +296,9 @@ public void Connect()
                     //No reason connecting if we're already connected
                     if (Status != DirectoryConnectionStatus.OK)
                     {
+                        _timer?.Dispose();
+                        _timer = new Timer(KeepAlive, null, 0, 30000);
+
                         //Ok get the latest settings
                         ADSettings? ad = Context?.ActiveDirectorySettings.FirstOrDefault();
                         ConnectionSettings = ad;

diff --git a/BLAZAMActiveDirectory/Adapters/ADOrganizationalUnit.cs b/BLAZAMActiveDirectory/Adapters/ADOrganizationalUnit.cs
@@ -190,6 +190,7 @@ public IADUser CreateUser(string containerName)
                     DirectoryEntry = searchResult?.GetDirectoryEntry();
                 newUser.Parse(directoryEntry: DirectoryEntry.Children.Add(fullContainerName, "user"), directory: Directory);
                 newUser.NewEntry = true;
+                newUser.Enabled = true;
                 return newUser;
             }catch(Exception ex)
             {

diff --git a/BLAZAMActiveDirectory/Adapters/AccountDirectoryAdapter.cs b/BLAZAMActiveDirectory/Adapters/AccountDirectoryAdapter.cs
@@ -6,6 +6,7 @@
 using BLAZAM.Jobs;
 using BLAZAM.Logger;
 using System.Data;
+using System.Diagnostics;
 using System.DirectoryServices.AccountManagement;
 using System.Globalization;
 using System.Security;
@@ -19,6 +20,8 @@ public class AccountDirectoryAdapter : GroupableDirectoryAdapter, IAccountDirect
         const int ADS_UF_PASSWD_CANT_CHANGE = 0x0040;
         const int ADS_UF_NORMAL_ACCOUNT = 0x0200;
         const int ADS_UF_DONT_EXPIRE_PASSWD = 0x10000;
+        const int PASSWD_NOTREQD_MASK = 0xFFDF;
+
         const int ACCOUNT_ENABLE_MASK = 0xFFFFFFD;
 
 
@@ -118,21 +121,54 @@ public virtual bool Disabled
                 }
             }
         }
+        public virtual bool PasswordNotRequired 
+        {
+            get
+            {
 
+                try
+                {
+                    return (UAC & ADS_UF_PASSWD_NOTREQD) == ADS_UF_PASSWD_NOTREQD;
+                }
+                catch
+                {
+                    // handle NullReferenceException
+                }
+                return true;
+            }
+            set
+            {
+                if (value && !PasswordNotRequired)
+                {
+                    UAC = UAC | ADS_UF_PASSWD_NOTREQD;
+                }
+                else if (!value && PasswordNotRequired)
+                {
+
+                    UAC = UAC & PASSWD_NOTREQD_MASK;
+
+                }
+            }
+        }
         protected int UAC
         {
             get
             {
                 var uacRaw= Convert.ToInt32(GetProperty<object>("userAccountControl"));
                 if(uacRaw == 0)
                 {
-                    return 546;
+                    UAC = ADS_UF_NORMAL_ACCOUNT | ADS_UF_PASSWD_NOTREQD;
+                    return ADS_UF_NORMAL_ACCOUNT | ADS_UF_PASSWD_NOTREQD;
                 }
                 return uacRaw;
             }
             set
             {
-                SetProperty("userAccountControl", value);
+              //  PostCommitSteps.Add(new("Set UAC", (step) => {
+                    SetProperty("userAccountControl", value);
+
+                //    return true;
+              //  }));
             }
         }
 
@@ -244,7 +280,8 @@ public bool SetPassword(SecureString password, bool requireChange = false)
                         up.SetPassword(password.ToPlainText());
                         if (requireChange)
                             up.ExpirePasswordNow();
-
+                        if(NewEntry)
+                            up.PasswordNotRequired = false;
                         up.Save();
 
                     }
@@ -257,10 +294,11 @@ public bool SetPassword(SecureString password, bool requireChange = false)
             {
 
                 Loggers.ActiveDirectryLogger.Error("Error setting entry password {@Error}", ex);
-
-                throw new ApplicationException("Unable to set password", ex);
+                if (!Debugger.IsAttached)
+                    throw new ApplicationException("Unable to set password", ex);
+                else return true;
             }
-
+            
         }
 
         public void StagePasswordChange(SecureString newPassword, bool requireChange = false)

diff --git a/BLAZAMActiveDirectory/Adapters/DirectoryEntryAdapter.cs b/BLAZAMActiveDirectory/Adapters/DirectoryEntryAdapter.cs
@@ -410,7 +410,7 @@ public virtual void MoveTo(IADOrganizationalUnit parentOUToMoveTo)
             HasUnsavedChanges = true;
         }
 
-        public virtual string? OU { get => DirectoryTools.DnToOu(DN); }
+        public virtual string? OU { get => DirectoryTools.DnToOu(DN)??DirectoryTools.DnToOu(ADSPath); }
 
         public IADOrganizationalUnit? GetParent()
         {

diff --git a/BLAZAMActiveDirectory/Interfaces/IAccountDirectoryAdapter.cs b/BLAZAMActiveDirectory/Interfaces/IAccountDirectoryAdapter.cs
@@ -71,6 +71,7 @@ public interface IAccountDirectoryAdapter : IGroupableDirectoryAdapter
         /// If a password change is staged using <see cref="StagePasswordChange(SecureString, bool)"/>, holds the encrypted new password to be applied.
         /// </summary>
         SecureString? NewPassword { get; set; }
+        bool PasswordNotRequired { get; set; }
 
         /// <summary>
         /// Changes the password for this entry immediately

diff --git a/BLAZAMGui/UI/Modals/AppNewsItemDialog.razor b/BLAZAMGui/UI/Modals/AppNewsItemDialog.razor
@@ -51,8 +51,9 @@
             CurrentUser.State.ReadNewsItems.Add(new ReadNewsItem { NewsItemId = Item.Id, NewsItemUpdatedAt = Item.UpdatedAt, User = CurrentUser.State.Preferences });
 
         }
-        await CurrentUser.State.SaveUserSettings();
         MudDialog.Close(DialogResult.Ok(true));
+
+        await CurrentUser.State.SaveUserSettings();
         OnAcknowledged?.Invoke();
     }
 }
diff --git a/BLAZAMJobs/JobStep.cs b/BLAZAMJobs/JobStep.cs
@@ -13,13 +13,16 @@ public class JobStep : JobStepBase, IJobStep
         public Func<JobStep?, Task<bool>>? AsyncAction { get; }
 
 
-        public JobStep(string name, Func<JobStep?, bool> action)
+        public JobStep(string name, Func<JobStep?, bool> action,bool stopOnError=false)
         {
+            StopOnFailedStep = stopOnError;
             Name = name;
             Action = action;
         }
-        public JobStep(string name, Func<JobStep?, Task<bool>> asyncAction)
+        public JobStep(string name, Func<JobStep?, Task<bool>> asyncAction, bool stopOnError = false)
         {
+            StopOnFailedStep = stopOnError;
+
             Name = name;
             AsyncAction = asyncAction;
         }