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

Chat and Self Update

BLAZAM.Tests/FileSystem/FileSystemBaseTests.cs

@@ -62,18 +62,56 @@ public void Writable_ReturnsTrue_WhenFileHasWritePermission()
             // Clean up
             File.Delete(path);
         }
-        //TODO Fix checking when no write permission
+        /// <summary>
+        /// This test fails in Github actions.
+        /// </summary>
         //[Fact]
         //public void Writable_ReturnsFalse_WhenFileHasNoWritePermission()
         //{
         //    // Arrange
         //    string path = Path.GetTempFileName();
-        //    var fileSystemBase = new FileSystemBase(path);
+        //    var fileSystemBase = new FileSystemBase("C:\\Windows\\setuperr.log");
+
+
+
+        //    // Act
+        //    bool writable = fileSystemBase.Writable;
+
+        //    // Assert
+        //    Assert.False(writable);
+
+        //    // Clean up
+        //    File.Delete(path);
+        //}
+        [Fact]
+        public void Writable_ReturnsTrue_WhenDirHasWritePermission()
+        {
+            // Arrange
+            string path = Path.GetTempFileName();
+            var fileSystemBase = new FileSystemBase(System.IO.Path.GetDirectoryName(path));
+
+
+            // Act
+            bool writable = fileSystemBase.Writable;
+
+            // Assert
+            Assert.True(writable);
+
+            // Clean up
+            File.Delete(path);
+        }
+
+        /// <summary>
+        /// This test fails in Github actions.
+        /// </summary>
+        //[Fact]
+        //public void Writable_ReturnsFalse_WhenDirHasNoWritePermission()
+        //{
+        //    // Arrange
+        //    string path = Path.GetTempFileName();
+        //    var fileSystemBase = new FileSystemBase("C:\\Windows\\");
+
 
-        //    // Deny write permission to the file
-        //    var ac = new FileInfo(path).GetAccessControl();
-        //    ac.AddAccessRule(new FileSystemAccessRule(Environment.UserName, FileSystemRights.Write, AccessControlType.Deny));
-        //    new FileInfo(path).SetAccessControl(ac);
 
         //    // Act
         //    bool writable = fileSystemBase.Writable;

BLAZAM/BLAZAM.csproj

@@ -5,19 +5,14 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
-		<AssemblyVersion>0.8.3</AssemblyVersion>
-		<Version>2023.10.31.1510</Version>
+		<AssemblyVersion>0.8.4</AssemblyVersion>
+		<Version>2023.11.07.1459</Version>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
 
 	</PropertyGroup>
 
-	<ItemGroup>
-	  <Compile Remove="Exceptions\**" />
-	  <Content Remove="Exceptions\**" />
-	  <EmbeddedResource Remove="Exceptions\**" />
-	  <None Remove="Exceptions\**" />
-	</ItemGroup>
+
 
 	<ItemGroup>
 	  <None Remove="nssm.exe" />

BLAZAMActiveDirectory/Adapters/DirectoryEntryAdapter.cs

@@ -14,6 +14,7 @@
 using System.Linq;
 using System.Reflection;
 using MudBlazor;
+using System.DirectoryServices.ActiveDirectory;
 
 namespace BLAZAM.ActiveDirectory.Adapters
 {
@@ -855,7 +856,8 @@ private void FetchDirectoryEntry()
         protected virtual List<T?> GetNonReplicatedProperty<T>(string propertyName)
         {
             var list = new List<T?>();
-            foreach (var dc in Directory.DomainControllers)
+            var dcs = new List<DomainController>(Directory.DomainControllers);
+            foreach (var dc in dcs)
             {
                 try
                 {

BLAZAMCommon/Data/Encryption.cs

@@ -81,6 +81,7 @@ private byte[] GenerateKeyFromSeedString()
         /// <exception cref="ApplicationException"></exception>
         public T? DecryptObject<T>(string? cipherText)
         {
+            if (cipherText == null) return default;
             try
             {
                 byte[] buffer = Convert.FromBase64String(cipherText);

BLAZAMCommon/Data/WindowsImpersonation.cs

@@ -69,11 +69,11 @@ public T Run<T>(Func<T> task)
 
             try
             {
-                if (ImpersonatedToken.IsInvalid) throw new ApplicationException("The impersonation user is invalid. Check settings.");
+                if (ImpersonatedToken==null || ImpersonatedToken.IsInvalid) throw new ApplicationException("The impersonation user is invalid. Check settings.");
 
                 //Console.WriteLine("Did LogonUser Succeed? " + (returnValue ? "Yes" : "No"));
                 // Check the identity.
-                Loggers.ActiveDirectryLogger.Debug("Before impersonation: " + WindowsIdentity.GetCurrent().Name);
+                Loggers.ActiveDirectryLogger.Information("Before impersonation: " + WindowsIdentity.GetCurrent().Name);
 
 
 
@@ -82,7 +82,7 @@ public T Run<T>(Func<T> task)
                   () =>
                   {
                       // Check the identity.
-                      Loggers.ActiveDirectryLogger.Debug("During impersonation: " + WindowsIdentity.GetCurrent().Name);
+                      Loggers.ActiveDirectryLogger.Information("During impersonation: " + WindowsIdentity.GetCurrent().Name);
                       success = task.Invoke();
                   }
                   );

BLAZAMCommon/Data/WindowsImpersonationUser.cs

@@ -5,7 +5,7 @@ namespace BLAZAM.Common.Data
     public class WindowsImpersonationUser
     {
         public string Username { get;  set; }
-        public string FQDN { get;  set; }
+        public string? FQDN { get;  set; }
         public SecureString Password { get;  set; }
     }
 }

BLAZAMDatabase/Helpers/WindowsHelpers.cs

@@ -27,14 +27,17 @@ public static WindowsImpersonation CreateWindowsImpersonator(this ADSettings set
         /// </summary>
         /// <param name="settings"></param>
         /// <returns></returns>
-        public static WindowsImpersonation CreateWindowsImpersonator(this AppSettings settings)
+        public static WindowsImpersonation? CreateWindowsImpersonator(this AppSettings settings)
         {
-            return new(new()
-            {
-                FQDN = settings.UpdateDomain,
-                Username = settings.UpdateUsername,
-                Password = settings.UpdatePassword.Decrypt().ToSecureString()
-            });
+            if (settings != null && settings.UpdateUsername != null && settings.UpdatePassword != null)
+                return new(new()
+                {
+                    FQDN = settings.UpdateDomain,
+                    Username = settings.UpdateUsername,
+                    Password = settings.UpdatePassword.Decrypt().ToSecureString()
+                });
+            else
+                return null;
         }
     }
 }

BLAZAMFileSystem/FileSystemBase.cs

@@ -1,4 +1,5 @@
 using System.Security;
+using System.Security.AccessControl;
 using System.Security.Permissions;
 
 namespace BLAZAM.FileSystem
@@ -22,21 +23,51 @@ public virtual bool Writable
         {
             get
             {
+                string testFilePath = null;
                 try
                 {
-                    var permissionSet = new PermissionSet(PermissionState.None);
-                    var writePermission = new FileIOPermission(FileIOPermissionAccess.Write, Path);
-                    permissionSet.AddPermission(writePermission);
-                    permissionSet.Demand();
-                    return true;
+                    var directoryInfo = new DirectoryInfo(Path);
+                    var fileInfo = new FileInfo(Path);
+                    if (fileInfo.Exists)
+                    {
+                        using (File.Open(Path, FileMode.Open, FileAccess.Write, FileShare.None))
+                        {
+                            return true;
+                        }
+
+                    }
+                    else
+                    {
+                        //if (!directoryInfo.Exists) throw new DirectoryNotFoundException("Directory " + Path + " does not exist!");
+
+                        testFilePath = Path + "test.txt";
+                        // Attempt to create a test file within the directory.
+
+                        using (File.Create(testFilePath))
+                        {
+                            // If the file can be created, it indicates write permissions on the directory.
+                            return true;
+                        }
+                    }
                 }
-                catch (SecurityException ex)
+                catch (UnauthorizedAccessException)
                 {
-                   //Loggers.SystemLogger.Warning(e.Message);
-
+                    // Handle unauthorized access or log an error as needed
+                    return false;
+                }
+                catch (IOException)
+                {
+                    // Handle other IO exceptions or log an error as needed
                     return false;
                 }
-
+                finally
+                {
+                    // Clean up the test file if it was created
+                    if (testFilePath != null && File.Exists(testFilePath))
+                    {
+                        File.Delete(testFilePath);
+                    }
+                }
             }
         }
 

BLAZAMGui/BLAZAMGui.csproj

@@ -42,6 +42,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Update="UI\Chat\EntrySpecificChat.razor">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+    </Content>
     <Content Update="UI\FlexContainer.razor">
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </Content>

BLAZAMGui/Layouts/LoginLayout.razor

@@ -29,7 +29,10 @@
                     @if (monitor.DirectoryConnected == ServiceConnectionState.Connecting)
                     {
                         <MudProgressLinear Color="Color.Warning" Indeterminate=true />
+                        <MudAlert Style="left:25px;right:25px;" Class="absolute  mud-alert-filled-warning">Directory is connecting... Local admin login only...</MudAlert>
+
                     }
+
                 </div>
             </Row>
         </MudMainContent>

BLAZAMGui/UI/Chat/AppChatRoom.razor

@@ -82,13 +82,13 @@
         {
             if (message.ChatRoomId == ChatRoom?.Id)
             {
-                if (message.User != CurrentUser.State.Preferences)
-                {
+                //if (message.User != CurrentUser.State.Preferences)
+                //{
                     await Task.Delay(100);
-                    //ChatRoom.Messages.Add(message);
+                    ChatRoom.Messages.Add(message);
                     await InvokeAsync(StateHasChanged);
 
-                }
+                //}
                 ScrollToBottom();
 
             }