WIP

Controller/Phantom.Controller.Services/Users/UserPasswords.cs

@@ -4,7 +4,7 @@ using Phantom.Controller.Database.Entities;
 
 namespace Phantom.Controller.Services.Users;
 
-internal static class UserPasswords {
+static class UserPasswords {
 	private static PasswordHasher<UserEntity> Hasher { get; } = new ();
 
 	private const int MinimumLength = 16;

Utils/Phantom.Utils/IO/Files.cs

@@ -17,6 +17,34 @@ public static class Files {
 		await stream.WriteAsync(bytes);
 	}
 
+	public static async Task ReadExactlyBytesAsync(string path, Memory<byte> bytes) {
+		var options = new FileStreamOptions {
+			Mode = FileMode.Open,
+			Access = FileAccess.Read,
+			Options = FileOptions.Asynchronous,
+			Share = FileShare.Read
+		};
+		
+		await using var stream = new FileStream(path, options);
+		
+		bool wrongLength = false;
+
+		if (stream.Length == bytes.Length) {
+			try {
+				await stream.ReadExactlyAsync(bytes);
+			} catch (EndOfStreamException) {
+				wrongLength = true;
+			}
+		}
+		else {
+			wrongLength = true;
+		}
+
+		if (wrongLength) {
+			throw new IOException("Expected file size to be exactly " + bytes.Length + " B, actual size is " + stream.Length + " B.");
+		}
+	}
+
 	public static void RequireMaximumFileSize(string path, long maximumBytes) {
 		var actualBytes = new FileInfo(path).Length;
 		if (actualBytes > maximumBytes) {

Web/Phantom.Web.Identity/Authentication/PhantomLoginManager.cs

@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Phantom.Common.Logging;
-using Phantom.Controller.Services.Users;
 using Phantom.Utils.Cryptography;
 using Phantom.Web.Identity.Interfaces;
 using ILogger = Serilog.ILogger;

Web/Phantom.Web.Identity/Authorization/PermissionBasedPolicyRequirement.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Authorization;
-using Phantom.Web.Identity.Data;
 
 namespace Phantom.Web.Identity.Authorization; 
 

Web/Phantom.Web.Identity/Interfaces/ILoginEvents.cs

@@ -1,6 +1,4 @@
-using Phantom.Controller.Database.Entities;
+namespace Phantom.Web.Identity.Interfaces; 
-
-namespace Phantom.Web.Identity.Interfaces; 
 
 public interface ILoginEvents {
 	void UserLoggedIn(UserEntity user);

Web/Phantom.Web/Base/LoginEvents.cs

@@ -1,6 +1,4 @@
-using Phantom.Controller.Database.Entities;
+using Phantom.Web.Identity.Interfaces;
-using Phantom.Controller.Services.Audit;
-using Phantom.Web.Identity.Interfaces;
 
 namespace Phantom.Web.Base;
 

Web/Phantom.Web/Base/PhantomComponent.cs

@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Phantom.Common.Logging;
-using Phantom.Web.Identity.Authorization;
-using Phantom.Web.Identity.Data;
 using ILogger = Serilog.ILogger;
 
 namespace Phantom.Web.Base; 

Web/Phantom.Web/Launcher.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.DataProtection;
-using Phantom.Controller.Services;
 using Phantom.Utils.Tasks;
 using Phantom.Web.Base;
 using Phantom.Web.Identity;

Web/Phantom.Web/Layout/NavMenu.razor

@@ -1,5 +1,4 @@
-@using Phantom.Controller.Services
+@inject ServiceConfiguration Configuration
-@inject ServiceConfiguration Configuration
 @inject PermissionManager PermissionManager
 
 <div class="navbar navbar-dark">

Web/Phantom.Web/Pages/Agents.razor

@@ -1,5 +1,4 @@
 @page "/agents"
-@using Phantom.Controller.Services.Agents
 @using Phantom.Utils.Collections
 @implements IDisposable
 @inject AgentManager AgentManager

Web/Phantom.Web/Pages/Audit.razor

@@ -1,10 +1,6 @@
 @page "/audit"
 @attribute [Authorize(Permission.ViewAuditPolicy)]
-@using Phantom.Controller.Services.Audit
-@using Phantom.Controller.Services.Instances
-@using Phantom.Controller.Services.Users
 @using System.Collections.Immutable
-@using Phantom.Controller.Database.Enums
 @implements IDisposable
 @inject AuditLog AuditLog
 @inject InstanceManager InstanceManager

Web/Phantom.Web/Pages/Events.razor

@@ -1,10 +1,6 @@
 @page "/events"
 @attribute [Authorize(Permission.ViewEventsPolicy)]
 @using System.Collections.Immutable
-@using Phantom.Controller.Services.Events
-@using Phantom.Controller.Services.Instances
-@using Phantom.Controller.Database.Enums
-@using Phantom.Controller.Services.Agents
 @implements IDisposable
 @inject AgentManager AgentManager
 @inject EventLog EventLog

Web/Phantom.Web/Pages/InstanceDetail.razor

@@ -1,10 +1,6 @@
 @page "/instances/{InstanceGuid:guid}"
 @attribute [Authorize(Permission.ViewInstancesPolicy)]
 @inherits PhantomComponent
-@using Phantom.Common.Data.Instance
-@using Phantom.Common.Data.Replies
-@using Phantom.Controller.Services.Audit
-@using Phantom.Controller.Services.Instances
 @implements IDisposable
 @inject InstanceManager InstanceManager
 @inject AuditLog AuditLog

Web/Phantom.Web/Pages/InstanceEdit.razor

@@ -1,7 +1,5 @@
 @page "/instances/{InstanceGuid:guid}/edit"
 @attribute [Authorize(Permission.CreateInstancesPolicy)]
-@using Phantom.Common.Data.Instance
-@using Phantom.Controller.Services.Instances
 @inherits PhantomComponent
 @inject InstanceManager InstanceManager
 

Web/Phantom.Web/Pages/Instances.razor

@@ -1,8 +1,6 @@
 @page "/instances"
 @attribute [Authorize(Permission.ViewInstancesPolicy)]
 @using System.Collections.Immutable
-@using Phantom.Controller.Services.Instances
-@using Phantom.Controller.Services.Agents
 @implements IDisposable
 @inject AgentManager AgentManager
 @inject InstanceManager InstanceManager

Web/Phantom.Web/Pages/Setup.razor

@@ -1,12 +1,8 @@
 @page "/setup"
-@using Phantom.Controller.Services.Users
-@using Phantom.Utils.Cryptography
 @using Phantom.Utils.Tasks
-@using Phantom.Controller.Database.Entities
-@using Phantom.Controller.Services
-@using Phantom.Controller.Services.Audit
 @using Phantom.Web.Identity.Authentication
 @using System.ComponentModel.DataAnnotations
+@using Phantom.Utils.Cryptography
 @using System.Security.Cryptography
 @attribute [AllowAnonymous]
 @inject ServiceConfiguration ServiceConfiguration

Web/Phantom.Web/Pages/Users.razor

@@ -1,6 +1,4 @@
 @page "/users"
-@using Phantom.Controller.Database.Entities
-@using Phantom.Controller.Services.Users
 @using System.Collections.Immutable
 @attribute [Authorize(Permission.ViewUsersPolicy)]
 @inject UserManager UserManager

Web/Phantom.Web/Program.cs

@@ -1,6 +1,5 @@
 using System.Reflection;
 using Phantom.Common.Logging;
-using Phantom.Controller.Services;
 using Phantom.Utils.Cryptography;
 using Phantom.Utils.IO;
 using Phantom.Utils.Runtime;
@@ -30,7 +29,7 @@ try {
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel web...");
 	PhantomLogger.Root.Information("Web version: {Version}", fullVersion);
 
-	var (webServerHost, webServerPort, webBasePath) = Variables.LoadOrStop();
+	var (controllerHost, controllerPort, webKeyToken, webKeyFilePath, webServerHost, webServerPort, webBasePath) = Variables.LoadOrStop();
 
 	string webKeysPath = Path.GetFullPath("./keys");
 	CreateFolderOrStop(webKeysPath, Chmod.URWX);

Web/Phantom.Web/ServiceConfiguration.cs

@@ -1,4 +1,4 @@
-namespace Phantom.Controller.Services;
+namespace Phantom.Web;
 
 public sealed record ServiceConfiguration(
 	string Version,

Web/Phantom.Web/Shared/UserEditDialogBase.cs

@@ -1,9 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
-using Phantom.Controller.Database.Entities;
 using Phantom.Web.Base;
 using Phantom.Web.Components.Forms;
-using Phantom.Web.Identity.Data;
 
 namespace Phantom.Web.Shared;