Added IP addresses to audit entries

Blazam-App · Oct 30, 2023 · 2cd15e3 · 2cd15e3
1 parent 8300f57
commit 2cd15e3
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 3 deletions.
diff --git a/BLAZAM/BLAZAM.csproj b/BLAZAM/BLAZAM.csproj
@@ -6,7 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ServerGarbageCollection>false</ServerGarbageCollection>
 		<AssemblyVersion>0.8.2</AssemblyVersion>
-		<Version>2023.10.27.1927</Version>
+		<Version>2023.10.30.1526</Version>
 		<RootNamespace>BLAZAM</RootNamespace>
 		<GenerateDocumentationFile>False</GenerateDocumentationFile>
 

diff --git a/BLAZAM/Middleware/UserStateMiddleware.cs b/BLAZAM/Middleware/UserStateMiddleware.cs
@@ -2,6 +2,7 @@
 using BLAZAM.Session.Interfaces;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
+using Org.BouncyCastle.Ocsp;
 using System.Threading.Tasks;
 
 namespace BLAZAM.Server.Middleware
@@ -21,6 +22,7 @@ public UserStateMiddleware(RequestDelegate next)
         public Task Invoke(HttpContext httpContext,ICurrentUserStateService currentUserStateService,IApplicationUserStateService userStateService)
         {
             currentUserStateService.State = userStateService.GetUserState(httpContext.User);
+
             return _next(httpContext);
         }
     }

diff --git a/BLAZAM/Pages/Index.razor b/BLAZAM/Pages/Index.razor
@@ -81,6 +81,13 @@
 
                 }
             }
+            else
+            {
+                if (tester.AppReady == ServiceConnectionState.Up)
+                {
+                    NavManager.NavigateTo("/install", true);
+                }
+            }
             if (!waitingForLoadToComplete)
                 Task.Delay(1000).Wait();
 
@@ -101,7 +108,7 @@
     {
         if (newStatus == ServiceConnectionState.Up)
 
-            if (NavManager.ToBaseRelativePath(NavManager.Uri) == "")
+            if (ApplicationInfo.InstallationCompleted && NavManager.ToBaseRelativePath(NavManager.Uri) == "")
             {
                 waitingForLoadToComplete = false;
 

diff --git a/BLAZAMCommon/Data/LoginRequest.cs b/BLAZAMCommon/Data/LoginRequest.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using System.Net;
 using System.Security;
 using System.Security.Claims;
 using BLAZAM.Helpers;
@@ -28,5 +29,6 @@ public bool Valid
 
         public bool Impersonation { get; set; } = false;
         public ClaimsPrincipal? ImpersonatorClaims { get; set; }
+        public IPAddress IPAddress { get; set; }
     }
 }
diff --git a/BLAZAMGui/UI/Dev/DevTools.razor b/BLAZAMGui/UI/Dev/DevTools.razor
@@ -25,6 +25,7 @@
         <MudDataGrid Items="@UserStateService.UserStates">
             <Columns>
                 <PropertyColumn Title="Username" Property="x => x.User.Identity==null?null:x.User.Identity.Name" />
+                <PropertyColumn Title="IP Address" Property="x => x.IPAddress==null?null:x.IPAddress.ToString()" />
 
                 <PropertyColumn Title="Auth Type" Property="x => x.User.Identity==null || x.User.Identity.AuthenticationType==null?null:x.User.Identity.AuthenticationType.ToString()" />
                 <PropertyColumn Title="Authenticated" Property="x => x.User.Identity==null?null:x.User.Identity.IsAuthenticated.ToString()" />

diff --git a/BLAZAMServices/AppAuthenticationStateProvider.cs b/BLAZAMServices/AppAuthenticationStateProvider.cs
@@ -154,6 +154,7 @@ public async Task<LoginResult> Login(LoginRequest loginReq)
         {
             LoginResult loginResult = new();
              var newUserState = _userStateService.CreateUserState(null);
+            newUserState.IPAddress = loginReq.IPAddress;
 
 
             AuthenticationState? result = null;

diff --git a/BLAZAMServices/AuditLogger.cs b/BLAZAMServices/AuditLogger.cs
@@ -370,7 +370,8 @@ protected virtual async Task<bool> Log<T>(
                     Sid = relatedEntry.SID.ToSidString(),
                     BeforeAction = beforeAction,
                     AfterAction = afterAction,
-                    Username = CurrentUser.AuditUsername
+                    Username = CurrentUser.AuditUsername,
+                    IpAddress = CurrentUser.IPAddress?.ToString(),
                 };
                 table.Add(auditEntry);
                 context.SaveChanges();

diff --git a/BLAZAMSession/ApplicationUserState.cs b/BLAZAMSession/ApplicationUserState.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
 using System;
+using System.Net;
 using System.Security.Claims;
 using System.Xml;
 
@@ -43,6 +44,8 @@ public class ApplicationUserState : IApplicationUserState
         public DateTime LastAccessed { get; set; } = DateTime.UtcNow;
 
 
+        public IPAddress IPAddress { get; set; }
+
 
 
         public IList<UserNotification>? Notifications

diff --git a/BLAZAMSession/CurentUserStateService.cs b/BLAZAMSession/CurentUserStateService.cs
@@ -35,6 +35,8 @@ public CurrentUserStateService(IApplicationUserStateService applicationUserState
             {
                 _retryTimer = new Timer(RetryGetCurrentUserState, null, 500, 500);
             }
+            if (State.IsAuthenticated)
+                State.IPAddress = _httpContextAccessor.HttpContext.Connection.RemoteIpAddress;
         }
 
         private void RetryGetCurrentUserState(object? state = null)

diff --git a/BLAZAMSession/Interfaces/IApplicationUserState.cs b/BLAZAMSession/Interfaces/IApplicationUserState.cs
@@ -5,6 +5,7 @@
 using BLAZAM.Database.Models.User;
 using BLAZAM.Server.Data;
 using Microsoft.AspNetCore.Authentication;
+using System.Net;
 using System.Security.Claims;
 
 namespace BLAZAM.Session.Interfaces
@@ -62,6 +63,7 @@ public interface IApplicationUserState
         IList<UserNotification>? Notifications { get; }
         IApplicationUserSessionCache Cache { get; set; }
 
+        IPAddress IPAddress { get; set; }
 
         string LastUri { get; set; }
         bool IsAuthenticated { get; }