Merge pull request #543 from Blazam-App/v1-Nightly

v1.0.2 Update

.github/release.yml

@@ -16,6 +16,9 @@ changelog:
     - title: Exciting New Features 🎉
       labels:
         - enhancement
+    - title: Feature Changes ✏
+      labels:
+        - change
     - title: Security Updates 🔐
       labels:
         - security

.github/workflows/deploy-demo.yml

@@ -28,7 +28,7 @@ jobs:
         run: dotnet publish -c Release -o ${{env.DOTNET_ROOT}}/myapp BLAZAM/BLAZAM.csproj
 
       - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: .net-app
           path: ${{env.DOTNET_ROOT}}/myapp
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Download artifact from build job
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: .net-app
 

BLAZAM.Tests/BLAZAM.Tests.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

BLAZAM.Tests/FileSystem/FileSystemBaseTests.cs

@@ -74,7 +74,7 @@ public void Writable_ReturnsTrue_WhenFileHasWritePermission()
         //    string path = Path.GetTempFileName();
         //    var fileSystemBase = new FileSystemBase("C:\\Windows\\setuperr.log");
 
-            
+
 
         //    // Act
         //    bool writable = fileSystemBase.Writable;
@@ -91,7 +91,7 @@ public void Writable_ReturnsTrue_WhenDirHasWritePermission()
             // Arrange
             string path = Path.GetTempFileName();
             var fileSystemBase = new FileSystemBase(System.IO.Path.GetDirectoryName(path));
-            
+
 
             // Act
             bool writable = fileSystemBase.Writable;

BLAZAM.Tests/Jobs/JobTests.cs

@@ -62,7 +62,7 @@ public void Steps_Cancelled_After_Error_When_Stop_Enabled()
             var result = testJob.Run();
 
             // Assert
-            Assert.True(testJob.Steps[1].Result == JobResult.Failed && testJob.Steps[2].Result==JobResult.Cancelled && testJob.Steps[3].Result== JobResult.Cancelled);
+            Assert.True(testJob.Steps[1].Result == JobResult.Failed && testJob.Steps[2].Result == JobResult.Cancelled && testJob.Steps[3].Result == JobResult.Cancelled);
         }
         [Fact]
         public void Nested_Job_Runs()
@@ -94,7 +94,7 @@ public void Job_Elapsed_Time_Functional()
                 && testJob.EndTime != DateTime.MinValue
                 && testJob.ElapsedTime.HasValue
                 && testJob.ElapsedTime.Value.TotalMilliseconds > 500
-                ) ;
+                );
         }
 
     }

BLAZAM.Tests/Mocks/Mock_UpdateService.cs

@@ -20,8 +20,8 @@ internal class Mock_UpdateService : UpdateService
             ApplicationRoot = new SystemDirectory("C:\\temp"),
             RunningProcess = Process.GetCurrentProcess(),
             RunningVersion = new ApplicationVersion("0.0.1"),
-             TempDirectory = new SystemDirectory("C:\\temp")
-        },null)
+            TempDirectory = new SystemDirectory("C:\\temp")
+        }, null)
         {
 
             SelectedBranch = ApplicationReleaseBranches.Stable;

BLAZAM.Tests/Updates/UpdateTests.cs

@@ -12,7 +12,7 @@ namespace BLAZAM.Tests.Updates
 {
     public class UpdateTests
     {
-        readonly Mock_UpdateService _updateService = new();
+        private readonly Mock_UpdateService _updateService = new();
         //[Fact]
         //public async void Update_Returns_Data()
         //{

BLAZAM.Tests/Updates/VersionTests.cs

@@ -11,20 +11,20 @@ namespace BLAZAM.Tests.Updates
 {
     public class VersionTests
     {
-        ApplicationVersion  basicLow = new ApplicationVersion("0.5.1");
-        ApplicationVersion  basicHigh = new ApplicationVersion("0.5.2");
-        ApplicationVersion  longLow = new ApplicationVersion("0.5.1.2023.2.2.1053");
-        ApplicationVersion  longHigh = new ApplicationVersion("0.5.2.2023.2.3.1053");
+        private ApplicationVersion basicLow = new ApplicationVersion("0.5.1");
+        private ApplicationVersion basicHigh = new ApplicationVersion("0.5.2");
+        private ApplicationVersion longLow = new ApplicationVersion("0.5.1.2023.2.2.1053");
+        private ApplicationVersion longHigh = new ApplicationVersion("0.5.2.2023.2.3.1053");
 
         [Fact]
         public void Basic_Comparison_Valid()
         {
-            Assert.True(basicLow.CompareTo(basicHigh)<0);
+            Assert.True(basicLow.CompareTo(basicHigh) < 0);
         }
         [Fact]
         public void Long_Comparison_Returns_LessThanZero_When_Older()
         {
-            Assert.True(longLow.CompareTo(longHigh)< 0);
+            Assert.True(longLow.CompareTo(longHigh) < 0);
         }
         [Fact]
         public void Long_Basic_Comparison_Returns_LessThanZero_When_Other_Is_Older()

BLAZAM/BLAZAM.csproj

@@ -5,8 +5,8 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
-		<AssemblyVersion>1.0.1</AssemblyVersion>
-		<Version>2024.08.30.2118</Version>
+		<AssemblyVersion>1.0.2</AssemblyVersion>
+		<Version>2024.09.20.1710</Version>
 		<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
@@ -73,9 +73,9 @@
 		<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
 		<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.4" />
-		<PackageReference Include="MudBlazor" Version="7.6.0" />
-		<PackageReference Include="MudBlazor.Markdown" Version="1.0.2" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.5" />
+		<PackageReference Include="MudBlazor" Version="7.8.0" />
+		<PackageReference Include="MudBlazor.Markdown" Version="7.8.0" />
 		<PackageReference Include="MudBlazor.ThemeManager" Version="2.0.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="Octokit" Version="13.0.1" />

BLAZAM/GlobalUsings.cs

@@ -1,6 +1,6 @@
-global using BLAZAM.Logger;
-global using BLAZAM.FileSystem;
+global using BLAZAM.FileSystem;
 global using BLAZAM.Helpers;
+global using BLAZAM.Logger;
 global using BLAZAM.Services.Background;
 
 

BLAZAM/Middleware/ApplicationStatusRedirectMiddleware.cs

@@ -11,7 +11,7 @@ internal class ApplicationStatusRedirectMiddleware
     {
         private readonly RequestDelegate _next;
         private readonly ConnMonitor _monitor;
-        private readonly List<string> _uriIgnoreList = new List<string> { "/static","/css", "/_content","/_blazor","/BLAZAM.styles.css","/_framework" };
+        private readonly List<string> _uriIgnoreList = new List<string> { "/static", "/css", "/_content", "/_blazor", "/BLAZAM.styles.css", "/_framework" };
         private string intendedUri;
 
         public ApplicationStatusRedirectMiddleware(
@@ -36,7 +36,7 @@ public async Task InvokeAsync(HttpContext context, IAppDatabaseFactory factory)
                             break;
                         case ServiceConnectionState.Up:
                             var dbcontext = factory.CreateDbContext();
-                            if(dbcontext.SeedMismatch)
+                            if (dbcontext.SeedMismatch)
                             {
                                 Oops.ErrorMessage = "The application database is incompatible with this version of the application";
                                 Oops.DetailsMessage = "The database seed is different from the current version of the application";
@@ -46,15 +46,15 @@ public async Task InvokeAsync(HttpContext context, IAppDatabaseFactory factory)
                             }
                             if (!ApplicationInfo.installationCompleted)
                             {
-                                SendTo(context,"/install");
+                                SendTo(context, "/install");
                             }
                             break;
                         case ServiceConnectionState.Down:
                             SendTo(context, "/oops");
 
                             break;
                     }
-                
+
 
                 }
                 catch
@@ -70,12 +70,13 @@ public async Task InvokeAsync(HttpContext context, IAppDatabaseFactory factory)
         private void SendTo(HttpContext context, string uri)
         {
             if (intendedUri != uri)
-                context.Response.Redirect(uri);    
+                context.Response.Redirect(uri);
         }
 
         private bool InIgnoreList(string intendedUri)
         {
-            foreach(var uri in _uriIgnoreList) { 
+            foreach (var uri in _uriIgnoreList)
+            {
                 if (intendedUri.StartsWith(uri)) return true;
             }
             return false;

BLAZAM/Pages/API/Auth/KeepAlive.cshtml.cs

@@ -13,18 +13,18 @@ public IActionResult OnGet()
         {
 
             var response = new Dictionary<string, string>();
-                if (HttpContext.User.Identity?.IsAuthenticated==true)
-                    HttpContext.SlideCookieExpiration(ApplicationUserStateService.Instance.GetUserState(HttpContext.User));
-                else
-                {
-                     response.Add("expired", "true");
-                    return new JsonResult(response);
-                }
-                     response.Add("expired", "false");
+            if (HttpContext.User.Identity?.IsAuthenticated == true)
+                HttpContext.SlideCookieExpiration(ApplicationUserStateService.Instance.GetUserState(HttpContext.User));
+            else
+            {
+                response.Add("expired", "true");
+                return new JsonResult(response);
+            }
+            response.Add("expired", "false");
             return new JsonResult(response);
 
             //return new OkResult();
-        
+
         }
 
     }

BLAZAM/Pages/API/Token.cshtml.cs

@@ -16,9 +16,9 @@ public class TokenModel : PageModel
     {
         public JwtSecurityTokenHandler JwtTokenHandler { get; private set; }
         public string Token { get; private set; }
-        public  IDatabaseContext Context { get; private set; }
+        public IDatabaseContext Context { get; private set; }
+
 
-
         public TokenModel(IDatabaseContext context)
         {
             Context = context;
@@ -38,11 +38,11 @@ public JsonResult OnGet()
             var token = new JwtSecurityToken("ExampleServer", "ExampleClients", claims, expires: DateTime.Now.AddSeconds(60), signingCredentials: credentials);
             Token = JwtTokenHandler.WriteToken(token);
             var userSettings = Context.UserSettings.Where(u => u.UserGUID == this.User.Identity.Name).FirstOrDefault();
-            if(userSettings != null)
+            if (userSettings != null)
             {
                 userSettings.APIToken = Token;
             }
-           
+
             Context.SaveChanges();
             return new JsonResult(userSettings);
         }

BLAZAM/Pages/Benchmark.razor

@@ -24,20 +24,7 @@
 
 
 
-@* 
-<h3>Tree View</h3>
-<MudSwitch @bind-Value=adTree Label="OU/AD"/>
-@if (!adTree)
-{
-    <OUTreeView StartRootExpanded=true
-                EndText="@((context)=>context.DirectPermissionMappings.Any()?context.DirectPermissionMappings.Count().ToString():null)" />
-
-}
-else
-{
-    <ADTreeView TextColor="Color.Surface" EndText="@((context)=>context is IADOrganizationalUnit ou?ou.DirectPermissionMappings.Any()?ou.DirectPermissionMappings.Count().ToString():null:null)" />
-
-} *@
+s
 @code {
     #nullable disable warnings
     //ActiveDirectoryContext ad;

BLAZAM/Pages/Computers/ViewComputer.razor

@@ -60,7 +60,14 @@
                                         <DynamicMudInput T=string Label="@AppLocalization["Name"]" @bind-Value="@Computer.CanonicalName" Disabled=@(!EditMode) />
                                         <DynamicMudInput T=string Label="@AppLocalization["Operating System"]" @bind-Value="@Computer.OperatingSystem" Disabled=@true />
                                         <DynamicMudInput T=bool Label="@AppLocalization["Online"]" Value="@(Computer.IsOnline==true)" Disabled=@true />
-
+                                        @if (Computer.Disabled)
+                                        {
+                                            <MudAlert Severity="Severity.Error" Class="mud-width-full">@AppLocalization["Computer is disabled"]</MudAlert>
+                                        }
+                                        @if (Computer.LockedOut)
+                                        {
+                                            <MudAlert Severity="Severity.Warning" Class="mud-width-full">@AppLocalization["Computer is locked out"]</MudAlert>
+                                        }
                                     </MudStack>
 
                                 </Section>

BLAZAM/Pages/Download/Logs.cshtml.cs

@@ -9,19 +9,19 @@ public class LogsModel : PageModel
     {
         public IActionResult OnGet()
         {
-              var inMemZip = GenerateZip();
-              return File(inMemZip.ToArray(),"application/zip");
+            var inMemZip = GenerateZip();
+            return File(inMemZip.ToArray(), "application/zip");
         }
 
-        MemoryStream GenerateZip()
+        private MemoryStream GenerateZip()
         {
             MemoryStream memoryStream = new MemoryStream();
-        ZipArchive zip = new ZipArchive(memoryStream, ZipArchiveMode.Create);
-        // Recursively add files and subdirectories to the zip archive
-        //TODO make zip file
-       // zip.AddToZip(new SystemDirectory(LogPath),LogPath);
+            ZipArchive zip = new ZipArchive(memoryStream, ZipArchiveMode.Create);
+            // Recursively add files and subdirectories to the zip archive
+            //TODO make zip file
+            // zip.AddToZip(new SystemDirectory(LogPath),LogPath);
 
             return memoryStream;
         }
-}
+    }
 }

BLAZAM/Pages/Error/Error.cshtml.cs

@@ -35,7 +35,7 @@ public void OnGet()
                     DetailsMessage = exception.InnerException?.Message;
                 }
             }
-           
+
         }
     }
 }

BLAZAM/Pages/MFACallback.cshtml.cs

@@ -38,7 +38,7 @@ AuditLogger logger
 
         public string AuthResponse { get; private set; }
 
-        public async Task<IActionResult> OnGet(string? state=null,string? code=null)
+        public async Task<IActionResult> OnGet(string? state = null, string? code = null)
         {
             // Duo should have sent a 'state' and 'code' parameter.  If either is missing or blank, something is wrong.
             if (string.IsNullOrWhiteSpace(state))
@@ -49,7 +49,7 @@ public async Task<IActionResult> OnGet(string? state=null,string? code=null)
             {
                 throw new DuoException("Required code value was empty");
             }
-            if(User!=null && User.HasClaim(c=>c.Type == ClaimTypes.Rsa))
+            if (User != null && User.HasClaim(c => c.Type == ClaimTypes.Rsa))
             {
                 if (state == User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Rsa)?.Value)
                 {
@@ -64,7 +64,7 @@ public async Task<IActionResult> OnGet(string? state=null,string? code=null)
                         // Get the Duo client again.  This can be either be cached in the session or newly built.
                         // The only stateful information in the Client is your configuration, so you could even use the same client for multiple
                         // user authentications if desired.
-                        Client duoClient = _duoClientProvider.GetDuoClient(Request.Scheme+"://"+Request.Host+"/mfacallback");
+                        Client duoClient = _duoClientProvider.GetDuoClient(Request.Scheme + "://" + Request.Host + "/mfacallback");
                         var username = user.User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.WindowsAccountName)?.Value;
                         // Get a summary of the authentication from Duo.  This will trigger an exception if the username does not match.
                         try
@@ -77,19 +77,20 @@ public async Task<IActionResult> OnGet(string? state=null,string? code=null)
                                 await _audit.Logon.Login(user.User, HttpContext.Connection.RemoteIpAddress?.ToString());
                                 return new RedirectResult("/");
                             }
-                        }catch
+                        }
+                        catch
                         {
-                            
+
                             return new RedirectResult("/");
                         }
-
 
-
+
+
                     }
 
-
 
-
+
+
                 }
                 else
                 {