Merge pull request #188 from Moonlight-Panel/ImproveLogging

Improved logging. Added better error handling for mysql database backup

.gitattributes

@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+Moonlight/wwwroot/* linguist-vendored

Moonlight/App/ApiClients/Modrinth/ModrinthApiHelper.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using RestSharp;
 
 namespace Moonlight.App.ApiClients.Modrinth;

Moonlight/App/Database/Interceptors/SqlLoggingInterceptor.cs

@@ -1,6 +1,6 @@
 using System.Data.Common;
-using Logging.Net;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Moonlight.App.Helpers;
 
 namespace Moonlight.App.Database.Interceptors;
 

Moonlight/App/Events/EventSystem.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics;
-using Logging.Net;
+using Moonlight.App.Helpers;
 
 namespace Moonlight.App.Events;
 

Moonlight/App/Exceptions/DisplayException.cs

@@ -5,6 +5,8 @@ namespace Moonlight.App.Exceptions;
 [Serializable]
 public class DisplayException : Exception
 {
+    public bool DoNotTranslate { get; set; } = false;
+    
     //
     // For guidelines regarding the creation of new exception types, see
     //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
@@ -20,6 +22,11 @@ public class DisplayException : Exception
     {
     }
     
+    public DisplayException(string message, bool doNotTranslate) : base(message)
+    {
+        DoNotTranslate = doNotTranslate;
+    }
+
     public DisplayException(string message, Exception inner) : base(message, inner)
     {
     }

Moonlight/App/Helpers/CacheLogger.cs

@@ -1,252 +0,0 @@
-using System.Diagnostics;
-using Logging.Net;
-using Logging.Net.Loggers.SB;
-using Moonlight.App.Models.Misc;
-using ILogger = Logging.Net.ILogger;
-
-namespace Moonlight.App.Helpers;
-
-public class CacheLogger : ILogger
-{
-    private SBLogger SbLogger = new();
-    private List<LogEntry> Messages = new();
-
-    public LogEntry[] GetMessages()
-    {
-        lock (Messages)
-        {
-            var result = new LogEntry[Messages.Count];
-            Messages.CopyTo(result);
-            return result;
-        }
-    }
-
-    public void Clear(int messages)
-    {
-        lock (Messages)
-        {
-            Messages.RemoveRange(0, Math.Min(messages, Messages.Count));
-        }
-    }
-
-    public void Info(string? s)
-    {
-        if (s == null)
-            return;
-
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "info",
-                Message = s
-            });
-        }
-
-        SbLogger.Info(s);
-    }
-
-    public void Debug(string? s)
-    {
-        if (s == null)
-            return;
-
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "debug",
-                Message = s
-            });
-        }
-
-        SbLogger.Debug(s);
-    }
-
-    public void Warn(string? s)
-    {
-        if (s == null)
-            return;
-
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "warn",
-                Message = s
-            });
-        }
-
-        SbLogger.Warn(s);
-    }
-
-    public void Error(string? s)
-    {
-        if (s == null)
-            return;
-
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "error",
-                Message = s
-            });
-        }
-
-        SbLogger.Error(s);
-    }
-
-    public void Fatal(string? s)
-    {
-        if (s == null)
-            return;
-
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "fatal",
-                Message = s
-            });
-        }
-
-        SbLogger.Fatal(s);
-    }
-
-    public void InfoEx(Exception ex)
-    {
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "info",
-                Message = ex.ToStringDemystified()
-            });
-        }
-
-        SbLogger.InfoEx(ex);
-    }
-
-    public void DebugEx(Exception ex)
-    {
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "debug",
-                Message = ex.ToStringDemystified()
-            });
-        }
-
-        SbLogger.DebugEx(ex);
-    }
-
-    public void WarnEx(Exception ex)
-    {
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "warn",
-                Message = ex.ToStringDemystified()
-            });
-        }
-
-        SbLogger.WarnEx(ex);
-    }
-
-    public void ErrorEx(Exception ex)
-    {
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "error",
-                Message = ex.ToStringDemystified()
-            });
-        }
-
-        SbLogger.ErrorEx(ex);
-    }
-
-    public void FatalEx(Exception ex)
-    {
-        lock (Messages)
-        {
-            Messages.Add(new()
-            {
-                Level = "fatal",
-                Message = ex.ToStringDemystified()
-            });
-        }
-
-        SbLogger.FatalEx(ex);
-    }
-
-    public LoggingConfiguration GetErrorConfiguration()
-    {
-        return SbLogger.GetErrorConfiguration();
-    }
-
-    public void SetErrorConfiguration(LoggingConfiguration configuration)
-    {
-        SbLogger.SetErrorConfiguration(configuration);
-    }
-
-    public LoggingConfiguration GetFatalConfiguration()
-    {
-        return SbLogger.GetFatalConfiguration();
-    }
-
-    public void SetFatalConfiguration(LoggingConfiguration configuration)
-    {
-        SbLogger.SetFatalConfiguration(configuration);
-    }
-
-    public LoggingConfiguration GetWarnConfiguration()
-    {
-        return SbLogger.GetWarnConfiguration();
-    }
-
-    public void SetWarnConfiguration(LoggingConfiguration configuration)
-    {
-        SbLogger.SetWarnConfiguration(configuration);
-    }
-
-    public LoggingConfiguration GetInfoConfiguration()
-    {
-        return SbLogger.GetInfoConfiguration();
-    }
-
-    public void SetInfoConfiguration(LoggingConfiguration configuration)
-    {
-        SbLogger.SetInfoConfiguration(configuration);
-    }
-
-    public LoggingConfiguration GetDebugConfiguration()
-    {
-        return SbLogger.GetDebugConfiguration();
-    }
-
-    public void SetDebugConfiguration(LoggingConfiguration configuration)
-    {
-        SbLogger.SetDebugConfiguration(configuration);
-    }
-
-    public ILoggingAddition GetAddition()
-    {
-        return SbLogger.GetAddition();
-    }
-
-    public void SetAddition(ILoggingAddition addition)
-    {
-        SbLogger.SetAddition(addition);
-    }
-
-    public bool LogCallingClass
-    {
-        get => SbLogger.LogCallingClass;
-        set => SbLogger.LogCallingClass = value;
-    }
-}

Moonlight/App/Helpers/DatabaseCheckupService.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Logging.Net;
 using Microsoft.EntityFrameworkCore;
 using Moonlight.App.Database;
 using Moonlight.App.Services;
@@ -82,6 +81,8 @@ public class DatabaseCheckupService
         Logger.Info($"Saving it to: {file}");
         Logger.Info("Starting backup...");
 
+        try
+        {
             var sw = new Stopwatch();
             sw.Start();
 
@@ -97,4 +98,15 @@ public class DatabaseCheckupService
             sw.Stop();
             Logger.Info($"Done. {sw.Elapsed.TotalSeconds}s");
         }
+        catch (Exception e)
+        {
+            Logger.Fatal("-----------------------------------------------");
+            Logger.Fatal("Unable to create backup for moonlight database");
+            Logger.Fatal("Moonlight will start anyways in 30 seconds");
+            Logger.Fatal("-----------------------------------------------");
+            Logger.Fatal(e);
+            
+            Thread.Sleep(TimeSpan.FromSeconds(30));
+        }
+    }
 }

Moonlight/App/Helpers/Files/SftpFileAccess.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using Renci.SshNet;
+using Renci.SshNet;
 using ConnectionInfo = Renci.SshNet.ConnectionInfo;
 
 namespace Moonlight.App.Helpers.Files;

Moonlight/App/Helpers/HostSystemHelper.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using Logging.Net;
 
 namespace Moonlight.App.Helpers;
 

Moonlight/App/Helpers/Logger.cs

@@ -0,0 +1,108 @@
+using System.Diagnostics;
+using System.Reflection;
+using Serilog;
+
+namespace Moonlight.App.Helpers;
+
+public static class Logger
+{
+    #region String method calls
+    public static void Verbose(string message, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Verbose("{Message}", message);
+    }
+    
+    public static void Info(string message, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Information("{Message}", message);
+    }
+    
+    public static void Debug(string message, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Debug("{Message}", message);
+    }
+    
+    public static void Error(string message, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Error("{Message}", message);
+    }
+    
+    public static void Warn(string message, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Warning("{Message}", message);
+    }
+    
+    public static void Fatal(string message, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Fatal("{Message}", message);
+    }
+    #endregion
+    
+    #region Exception method calls
+    public static void Verbose(Exception exception, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Verbose(exception, "");
+    }
+    
+    public static void Info(Exception exception, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Information(exception, "");
+    }
+    
+    public static void Debug(Exception exception, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Debug(exception, "");
+    }
+    
+    public static void Error(Exception exception, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Error(exception, "");
+    }
+    
+    public static void Warn(Exception exception, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Warning(exception, "");
+    }
+    
+    public static void Fatal(Exception exception, string channel = "default")
+    {
+        Log.ForContext("SourceContext", GetNameOfCallingClass())
+            .Fatal(exception, "");
+    }
+    #endregion
+    
+    private static string GetNameOfCallingClass(int skipFrames = 4)
+    {
+        string fullName;
+        Type declaringType;
+            
+        do
+        {
+            MethodBase method = new StackFrame(skipFrames, false).GetMethod();
+            declaringType = method.DeclaringType;
+            if (declaringType == null)
+            {
+                return method.Name;
+            }
+            skipFrames++;
+            if (declaringType.Name.Contains("<"))
+                fullName = declaringType.ReflectedType.Name;
+            else
+                fullName = declaringType.Name;
+        }
+        while (declaringType.Module.Name.Equals("mscorlib.dll", StringComparison.OrdinalIgnoreCase) | fullName.Contains("Logger"));
+
+        return fullName;
+    }
+}

Moonlight/App/Helpers/MustBeTrueAttribute.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel.DataAnnotations;
-using Logging.Net;
 
 namespace Moonlight.App.Helpers;
 

Moonlight/App/Helpers/ParseHelper.cs

@@ -1,6 +1,4 @@
-using Logging.Net;
-
-namespace Moonlight.App.Helpers;
+namespace Moonlight.App.Helpers;
 
 public static class ParseHelper
 {

Moonlight/App/Helpers/Wings/WingsConsole.cs

@@ -1,6 +1,5 @@
 using System.Net.WebSockets;
 using System.Text;
-using Logging.Net;
 using Moonlight.App.Helpers.Wings.Data;
 using Moonlight.App.Helpers.Wings.Enums;
 using Moonlight.App.Helpers.Wings.Events;

Moonlight/App/Http/Controllers/Api/Moonlight/Notifications/ListenController.cs

@@ -2,145 +2,166 @@
 using System.Text;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Moonlight.App.Database.Entities;
 using Moonlight.App.Database.Entities.Notification;
 using Moonlight.App.Models.Notifications;
 using Moonlight.App.Repositories;
 using Moonlight.App.Services;
 using Moonlight.App.Services.Notifications;
-using Moonlight.App.Services.Sessions;
 using Newtonsoft.Json;
 
 namespace Moonlight.App.Http.Controllers.Api.Moonlight.Notifications;
 
-public class ListenController : ControllerBase
+[ApiController]
+[Route("api/moonlight/notification/listen")]
+public class ListenController : Controller
 {
-    internal WebSocket ws;
-    private bool active = true;
-    private bool isAuth = false;
+    private WebSocket WebSocket;
     private NotificationClient Client;
+    private CancellationTokenSource CancellationTokenSource = new();
+
+    private User? CurrentUser;
 
-    private readonly IdentityService IdentityService;
-    private readonly NotificationRepository NotificationRepository;
     private readonly OneTimeJwtService OneTimeJwtService;
-    private readonly NotificationClientService NotificationClientService;
     private readonly NotificationServerService NotificationServerService;
+    private readonly Repository<NotificationClient> NotificationClientRepository;
 
-    public ListenController(IdentityService identityService, 
-        NotificationRepository notificationRepository, 
+    public ListenController(
         OneTimeJwtService oneTimeJwtService,
-        NotificationClientService notificationClientService,
-        NotificationServerService notificationServerService)
+        NotificationServerService notificationServerService, Repository<NotificationClient> notificationClientRepository)
     {
-        IdentityService = identityService;
-        NotificationRepository = notificationRepository;
         OneTimeJwtService = oneTimeJwtService;
-        NotificationClientService = notificationClientService;
         NotificationServerService = notificationServerService;
+        NotificationClientRepository = notificationClientRepository;
     }
 
     [Route("/api/moonlight/notifications/listen")]
-    public async Task Get()
+    public async Task<ActionResult> Get()
     {
         if (HttpContext.WebSockets.IsWebSocketRequest)
         {
-            using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
-            ws = webSocket;
-            await Echo();
+            WebSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
+
+            await ProcessWebsocket();
+
+            return new EmptyResult();
         }
         else
         {
-            HttpContext.Response.StatusCode = StatusCodes.Status403Forbidden;
+            return StatusCode(400);
         }
     }
 
-    private async Task Echo()
+    private async Task ProcessWebsocket()
     {
-        while (active)
+        while (!CancellationTokenSource.Token.IsCancellationRequested && WebSocket.State == WebSocketState.Open)
         {
-            byte[] bytes = new byte[1024 * 16]; 
-            var asg = new ArraySegment<byte>(bytes);
-            var res = await ws.ReceiveAsync(asg, CancellationToken.None);
-
-            var text = Encoding.UTF8.GetString(bytes).Trim('\0');
-
-            var obj = JsonConvert.DeserializeObject<BasicWSModel>(text);
-
-            if (!string.IsNullOrWhiteSpace(obj.Action))
+            try
             {
-                await HandleRequest(text, obj.Action);
+                byte[] buffer = new byte[1024 * 16];
+                _ = await WebSocket.ReceiveAsync(buffer, CancellationTokenSource.Token);
+                var text = Encoding.UTF8.GetString(buffer).Trim('\0');
+
+                var basicWsModel = JsonConvert.DeserializeObject<BasicWSModel>(text) ?? new();
+
+                if (!string.IsNullOrWhiteSpace(basicWsModel.Action))
+                {
+                    await HandleRequest(text, basicWsModel.Action);
                 }
 
-            active = ws.State == WebSocketState.Open;
+                if (WebSocket.State != WebSocketState.Open)
+                {
+                    CancellationTokenSource.Cancel();
                 }
             }
+            catch (WebSocketException e)
+            {
+                CancellationTokenSource.Cancel();
+            }
+        }
+
+        await NotificationServerService.UnRegisterClient(Client);
+    }
 
     private async Task HandleRequest(string text, string action)
     {
-        if (!isAuth && action == "login")
-            await Login(text);
-        else if (!isAuth)
-            await ws.SendAsync(Encoding.UTF8.GetBytes("{\"error\": \"Unauthorised\"}"), WebSocketMessageType.Text,
-                WebSocketMessageFlags.EndOfMessage, CancellationToken.None);
-        else switch (action)
+        if (CurrentUser == null && action != "login")
         {
+            await Send("{\"error\": \"Unauthorised\"}");
+        }
+
+        switch (action)
+        {
+            case "login":
+                await Login(text);
+                break;
             case "received":
                 await Received(text);
                 break;
             case "read":
                 await Read(text);
                 break;
-            default:
-                break;
         }
     }
 
+    private async Task Send(string text)
+    {
+        await WebSocket.SendAsync(
+            Encoding.UTF8.GetBytes(text),
+            WebSocketMessageType.Text,
+            WebSocketMessageFlags.EndOfMessage, CancellationTokenSource.Token
+        );
+    }
+
     private async Task Login(string json)
     {
-        var jwt = JsonConvert.DeserializeObject<Login>(json).token;
+        var loginModel = JsonConvert.DeserializeObject<Login>(json) ?? new();
 
-        var dict = await OneTimeJwtService.Validate(jwt);
+        var dict = await OneTimeJwtService.Validate(loginModel.Token);
 
         if (dict == null)
         {
-            string error = "{\"status\":false}";
-            var bytes = Encoding.UTF8.GetBytes(error);
-            await ws.SendAsync(bytes, WebSocketMessageType.Text, WebSocketMessageFlags.EndOfMessage, CancellationToken.None);
+            await Send("{\"status\":false}");
             return;
         }
 
-        var _clientId = dict["clientId"];
-        var clientId = int.Parse(_clientId);
-
-        var client = NotificationRepository.GetClients().Include(x => x.User).First(x => x.Id == clientId);
-
-        Client = client;
-        await InitWebsocket();
-        
-        string success = "{\"status\":true}";
-        var byt = Encoding.UTF8.GetBytes(success);
-        await ws.SendAsync(byt, WebSocketMessageType.Text, WebSocketMessageFlags.EndOfMessage, CancellationToken.None);
+        if (!int.TryParse(dict["clientId"], out int clientId))
+        {
+            await Send("{\"status\":false}");
+            return;
         }
 
-    private async Task InitWebsocket()
-    {
-        NotificationClientService.listenController = this;
-        NotificationClientService.WebsocketReady(Client);
+        Client = NotificationClientRepository
+            .Get()
+            .Include(x => x.User)
+            .First(x => x.Id == clientId);
 
-        isAuth = true;
+        CurrentUser = Client.User;
+
+        await NotificationServerService.RegisterClient(WebSocket, Client);
+
+        await Send("{\"status\":true}");
     }
 
     private async Task Received(string json)
     {
-        var id = JsonConvert.DeserializeObject<NotificationById>(json).notification;
+        var id = JsonConvert.DeserializeObject<NotificationById>(json).Notification;
 
         //TODO: Implement ws notification received
     }
 
     private async Task Read(string json)
     {
-        var id = JsonConvert.DeserializeObject<NotificationById>(json).notification;
+        var model = JsonConvert.DeserializeObject<NotificationById>(json) ?? new();
 
-        await NotificationServerService.SendAction(NotificationClientService.User,
-            JsonConvert.SerializeObject(new NotificationById() {Action = "hide", notification = id}));
+        await NotificationServerService.SendAction(
+            CurrentUser!,
+            JsonConvert.SerializeObject(
+                new NotificationById()
+                {
+                    Action = "hide", Notification = model.Notification
+                }
+            )
+        );
     }
 }

Moonlight/App/Http/Controllers/Api/Moonlight/OAuth2Controller.cs

@@ -1,5 +1,5 @@
-using Logging.Net;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
+using Moonlight.App.Helpers;
 using Moonlight.App.Services;
 using Moonlight.App.Services.Sessions;
 

Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs

@@ -1,12 +1,6 @@
-using System.Text;
-using Logging.Net;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Moonlight.App.Helpers;
-using Moonlight.App.Models.Misc;
-using Moonlight.App.Services;
 using Moonlight.App.Services.Files;
-using Moonlight.App.Services.LogServices;
-using Moonlight.App.Services.Sessions;
 
 namespace Moonlight.App.Http.Controllers.Api.Moonlight;
 
@@ -14,13 +8,10 @@ namespace Moonlight.App.Http.Controllers.Api.Moonlight;
 [Route("api/moonlight/resources")]
 public class ResourcesController : Controller
 {
-    private readonly SecurityLogService SecurityLogService;
     private readonly BucketService BucketService;
 
-    public ResourcesController(SecurityLogService securityLogService,
-        BucketService bucketService)
+    public ResourcesController(BucketService bucketService)
     {
-        SecurityLogService = securityLogService;
         BucketService = bucketService;
     }
 
@@ -29,10 +20,7 @@ public class ResourcesController : Controller
     {
         if (name.Contains(".."))
         {
-            await SecurityLogService.Log(SecurityLogType.PathTransversal, x =>
-            {
-                x.Add<string>(name);
-            });
+            Logger.Warn($"Detected an attempted path transversal. Path: {name}", "security");
             
             return NotFound();
         }
@@ -52,10 +40,7 @@ public class ResourcesController : Controller
     {
         if (name.Contains(".."))
         {
-            await SecurityLogService.Log(SecurityLogType.PathTransversal, x =>
-            {
-                x.Add<string>(name);
-            });
+            Logger.Warn($"Detected an attempted path transversal. Path: {name}", "security");
             
             return NotFound();
         }
@@ -75,10 +60,7 @@ public class ResourcesController : Controller
     {
         if (name.Contains(".."))
         {
-            await SecurityLogService.Log(SecurityLogType.PathTransversal, x =>
-            {
-                x.Add<string>(name);
-            });
+            Logger.Warn($"Detected an attempted path transversal. Path: {name}", "security");
             
             return NotFound();
         }

Moonlight/App/Http/Controllers/Api/Remote/DdosController.cs

@@ -1,10 +1,8 @@
-using Logging.Net;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
 using Moonlight.App.Http.Requests.Daemon;
 using Moonlight.App.Repositories;
-using Moonlight.App.Services;
 
 namespace Moonlight.App.Http.Controllers.Api.Remote;
 

Moonlight/App/LogMigrator/LogMigrator.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using ILogger = Microsoft.Extensions.Logging.ILogger;
+using Moonlight.App.Helpers;
 
 namespace Moonlight.App.LogMigrator;
 

Moonlight/App/Models/Misc/ActiveNotificationClient.cs

@@ -0,0 +1,19 @@
+using System.Net.WebSockets;
+using System.Text;
+using Moonlight.App.Database.Entities.Notification;
+
+namespace Moonlight.App.Models.Misc;
+
+public class ActiveNotificationClient
+{
+    public WebSocket WebSocket { get; set; }
+    public NotificationClient Client { get; set; }
+    
+    public async Task SendAction(string action)
+    {
+        await WebSocket.SendAsync(
+            Encoding.UTF8.GetBytes(action),
+            WebSocketMessageType.Text,
+            WebSocketMessageFlags.EndOfMessage, CancellationToken.None);
+    }
+}

Moonlight/App/Models/Misc/MalwareScanResult.cs

@@ -0,0 +1,8 @@
+namespace Moonlight.App.Models.Misc;
+
+public class MalwareScanResult
+{
+    public string Title { get; set; } = "";
+    public string Description { get; set; } = "";
+    public string Author { get; set; } = "";
+}

Moonlight/App/Models/Notifications/Login.cs

@@ -1,6 +1,8 @@
-namespace Moonlight.App.Models.Notifications;
+using Newtonsoft.Json;
+
+namespace Moonlight.App.Models.Notifications;
 
 public class Login : BasicWSModel
 {
-    public string token { get; set; }
+    [JsonProperty("token")] public string Token { get; set; } = "";
 }

Moonlight/App/Models/Notifications/NotificationById.cs

@@ -1,6 +1,9 @@
-namespace Moonlight.App.Models.Notifications;
+using Newtonsoft.Json;
+
+namespace Moonlight.App.Models.Notifications;
 
 public class NotificationById : BasicWSModel
 {
-    public int notification { get; set; }
+    [JsonProperty("notification")]
+    public int Notification { get; set; }
 }

Moonlight/App/OAuth2/Providers/DiscordOAuth2Provider.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using Logging.Net;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Exceptions;
 using Moonlight.App.Helpers;

Moonlight/App/OAuth2/Providers/GoogleOAuth2Provider.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using Logging.Net;
 using Moonlight.App.ApiClients.Google.Requests;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Exceptions;

Moonlight/App/Services/Background/CleanupService.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using MineStatLib;
 using Moonlight.App.ApiClients.Daemon.Resources;
 using Moonlight.App.ApiClients.Wings;
@@ -46,13 +45,11 @@ public class CleanupService
         
         var config = ConfigService.GetSection("Moonlight").GetSection("Cleanup");
 
-        /*
-         * if (!config.GetValue<bool>("Enable") || ConfigService.DebugMode)
+        if (!config.GetValue<bool>("Enable") || ConfigService.DebugMode)
         {
             Logger.Info("Disabling cleanup service");
             return;
         }
-         */
         
         Timer = new(TimeSpan.FromMinutes(config.GetValue<int>("Wait")));
 

Moonlight/App/Services/Background/DiscordNotificationService.cs

@@ -1,8 +1,8 @@
 using Discord;
 using Discord.Webhook;
-using Logging.Net;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
+using Moonlight.App.Helpers;
 using Moonlight.App.Services.Files;
 
 namespace Moonlight.App.Services.Background;

Moonlight/App/Services/Background/MalwareScanService.cs

@@ -0,0 +1,196 @@
+using Moonlight.App.ApiClients.Daemon.Resources;
+using Moonlight.App.Database.Entities;
+using Moonlight.App.Events;
+using Moonlight.App.Exceptions;
+using Moonlight.App.Helpers;
+using Moonlight.App.Models.Misc;
+using Moonlight.App.Repositories;
+
+namespace Moonlight.App.Services.Background;
+
+public class MalwareScanService
+{
+    private Repository<Server> ServerRepository;
+    private Repository<Node> NodeRepository;
+    private NodeService NodeService;
+    private ServerService ServerService;
+    
+    private readonly EventSystem Event;
+    private readonly IServiceScopeFactory ServiceScopeFactory;
+    
+    public bool IsRunning { get; private set; }
+    public readonly Dictionary<Server, MalwareScanResult[]> ScanResults;
+    public string Status { get; private set; } = "N/A";
+
+    public MalwareScanService(IServiceScopeFactory serviceScopeFactory, EventSystem eventSystem)
+    {
+        ServiceScopeFactory = serviceScopeFactory;
+        Event = eventSystem;
+
+        ScanResults = new();
+    }
+
+    public Task Start()
+    {
+        if (IsRunning)
+            throw new DisplayException("Malware scan is already running");
+        
+        Task.Run(Run);
+        
+        return Task.CompletedTask;
+    }
+
+    private async Task Run()
+    {
+        IsRunning = true;
+        Status = "Clearing last results";
+        await Event.Emit("malwareScan.status", IsRunning);
+
+        lock (ScanResults)
+        {
+            ScanResults.Clear();
+        }
+        
+        await Event.Emit("malwareScan.result");
+        
+        using var scope = ServiceScopeFactory.CreateScope();
+        
+        // Load services from di scope
+        NodeRepository = scope.ServiceProvider.GetRequiredService<Repository<Node>>();
+        ServerRepository = scope.ServiceProvider.GetRequiredService<Repository<Server>>();
+        NodeService = scope.ServiceProvider.GetRequiredService<NodeService>();
+        ServerService = scope.ServiceProvider.GetRequiredService<ServerService>();
+
+        var nodes = NodeRepository.Get().ToArray();
+        var containers = new List<Container>();
+
+        // Fetch and summarize all running containers from all nodes
+        Logger.Verbose("Fetching and summarizing all running containers from all nodes");
+        
+        Status = "Fetching and summarizing all running containers from all nodes";
+        await Event.Emit("malwareScan.status", IsRunning);
+        
+        foreach (var node in nodes)
+        {
+            var metrics = await NodeService.GetDockerMetrics(node);
+
+            foreach (var container in metrics.Containers)
+            {
+                containers.Add(container);
+            }
+        }
+
+        var containerServerMapped = new Dictionary<Server, Container>();
+
+        // Map all the containers to their corresponding server if existing
+        Logger.Verbose("Mapping all the containers to their corresponding server if existing");
+        
+        Status = "Mapping all the containers to their corresponding server if existing";
+        await Event.Emit("malwareScan.status", IsRunning);
+        
+        foreach (var container in containers)
+        {
+            if (Guid.TryParse(container.Name, out Guid uuid))
+            {
+                var server = ServerRepository
+                    .Get()
+                    .FirstOrDefault(x => x.Uuid == uuid);
+                
+                if(server == null)
+                    continue;
+                
+                containerServerMapped.Add(server, container);
+            }
+        }
+        
+        // Perform scan
+        var resultsMapped = new Dictionary<Server, MalwareScanResult[]>();
+        foreach (var mapping in containerServerMapped)
+        {
+            Logger.Verbose($"Scanning server {mapping.Key.Name} for malware");
+            
+            Status = $"Scanning server {mapping.Key.Name} for malware";
+            await Event.Emit("malwareScan.status", IsRunning);
+            
+            var results = await PerformScanOnServer(mapping.Key, mapping.Value);
+
+            if (results.Any())
+            {
+                resultsMapped.Add(mapping.Key, results);
+                Logger.Verbose($"{results.Length} findings on server {mapping.Key.Name}");
+            }
+        }
+        
+        Logger.Verbose($"Scan complete. Detected {resultsMapped.Count} servers with findings");
+        
+        IsRunning = false;
+        Status = $"Scan complete. Detected {resultsMapped.Count} servers with findings";
+        await Event.Emit("malwareScan.status", IsRunning);
+
+        lock (ScanResults)
+        {
+            foreach (var mapping in resultsMapped)
+            {
+                ScanResults.Add(mapping.Key, mapping.Value);
+            }
+        }
+        
+        await Event.Emit("malwareScan.result");
+    }
+
+    private async Task<MalwareScanResult[]> PerformScanOnServer(Server server, Container container)
+    {
+        var results = new List<MalwareScanResult>();
+        
+        // TODO: Move scans to an universal format / api
+        
+        // Define scans here
+        
+        async Task ScanSelfBot()
+        {
+            var access = await ServerService.CreateFileAccess(server, null!);
+            var fileElements = await access.Ls();
+
+            if (fileElements.Any(x => x.Name == "tokens.txt"))
+            {
+                results.Add(new ()
+                {
+                    Title = "Found SelfBot",
+                    Description = "Detected suspicious 'tokens.txt' file which may contain tokens for a selfbot",
+                    Author = "Marcel Baumgartner"
+                });
+            }
+        }
+
+        async Task ScanFakePlayerPlugins()
+        {
+            var access = await ServerService.CreateFileAccess(server, null!);
+            var fileElements = await access.Ls();
+
+            if (fileElements.Any(x => !x.IsFile && x.Name == "plugins")) // Check for plugins folder
+            {
+                await access.Cd("plugins");
+                fileElements = await access.Ls();
+
+                foreach (var fileElement in fileElements)
+                {
+                    if (fileElement.Name.ToLower().Contains("fake"))
+                    {
+                        results.Add(new()
+                        {
+                            Title = "Fake player plugin",
+                            Description = $"Suspicious plugin file: {fileElement.Name}",
+                            Author = "Marcel Baumgartner"
+                        });
+                    }
+                }
+            }
+        }
+
+        // Execute scans
+        await ScanSelfBot();
+        await ScanFakePlayerPlugins();
+
+        return results.ToArray();
+    }
+}

Moonlight/App/Services/ConfigService.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using Logging.Net;
 using Microsoft.Extensions.Primitives;
 using Moonlight.App.Helpers;
 using Moonlight.App.Services.Files;
@@ -42,8 +41,6 @@ public class ConfigService : IConfiguration
 
     public void Reload()
     {
-        Logger.Info($"Reading config from '{PathBuilder.File("storage", "configs", "config.json")}'");
-        
         Configuration = new ConfigurationBuilder().AddJsonStream(
             new MemoryStream(Encoding.ASCII.GetBytes(
                     File.ReadAllText(
@@ -51,8 +48,6 @@ public class ConfigService : IConfiguration
                     )
                 )
             )).Build();
-
-        Logger.Info("Reloaded configuration file");
     }
 
     public IEnumerable<IConfigurationSection> GetChildren()

Moonlight/App/Services/DiscordBot/Commands/ClearChannelCommand.cs

@@ -1,6 +1,5 @@
 using Discord;
 using Discord.WebSocket;
-using Logging.Net;
 
 namespace Moonlight.App.Services.DiscordBot.Commands;
 

Moonlight/App/Services/DiscordBot/Commands/ServerListCommand.cs

@@ -1,6 +1,5 @@
 using Discord;
 using Discord.WebSocket;
-using Logging.Net;
 using Microsoft.EntityFrameworkCore;
 using Moonlight.App.Repositories;
 using Moonlight.App.Repositories.Servers;

Moonlight/App/Services/DiscordBot/DiscordBotService.cs

@@ -1,8 +1,7 @@
 using System.Diagnostics;
 using Discord;
-using Discord.Commands;
 using Discord.WebSocket;
-using Logging.Net;
+using Moonlight.App.Helpers;
 using Moonlight.App.Services.DiscordBot.Commands;
 using Moonlight.App.Services.DiscordBot.Modules;
 

Moonlight/App/Services/DiscordBot/Modules/RemoveCommandsModule.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using Discord.WebSocket;
-using Logging.Net;
+using Moonlight.App.Helpers;
 
 namespace Moonlight.App.Services.DiscordBot.Modules;
 

Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs

@@ -1,8 +1,8 @@
 using Discord;
 using Discord.WebSocket;
-using Logging.Net;
 using Microsoft.EntityFrameworkCore;
 using Moonlight.App.ApiClients.Wings;
+using Moonlight.App.Helpers;
 using Moonlight.App.Repositories;
 using Moonlight.App.Repositories.Servers;
 

Moonlight/App/Services/DomainService.cs

@@ -5,13 +5,12 @@ using CloudFlare.Client.Api.Result;
 using CloudFlare.Client.Api.Zones;
 using CloudFlare.Client.Api.Zones.DnsRecord;
 using CloudFlare.Client.Enumerators;
-using Logging.Net;
 using Microsoft.EntityFrameworkCore;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Exceptions;
+using Moonlight.App.Helpers;
 using Moonlight.App.Models.Misc;
 using Moonlight.App.Repositories.Domains;
-using Moonlight.App.Services.LogServices;
 using DnsRecord = Moonlight.App.Models.Misc.DnsRecord;
 
 namespace Moonlight.App.Services;
@@ -21,18 +20,15 @@ public class DomainService
     private readonly DomainRepository DomainRepository;
     private readonly SharedDomainRepository SharedDomainRepository;
     private readonly CloudFlareClient Client;
-    private readonly AuditLogService AuditLogService;
     private readonly string AccountId;
 
     public DomainService(
         ConfigService configService,
         DomainRepository domainRepository,
-        SharedDomainRepository sharedDomainRepository,
-        AuditLogService auditLogService)
+        SharedDomainRepository sharedDomainRepository)
     {
         DomainRepository = domainRepository;
         SharedDomainRepository = sharedDomainRepository;
-        AuditLogService = auditLogService;
 
         var config = configService
             .GetSection("Moonlight")
@@ -191,11 +187,7 @@ public class DomainService
             }));
         }
         
-        await AuditLogService.Log(AuditLogType.AddDomainRecord, x =>
-        {
-            x.Add<Domain>(d.Id);
-            x.Add<DnsRecord>(dnsRecord.Name);
-        });
+        //TODO: AuditLog
     }
 
     public async Task UpdateDnsRecord(Domain d, DnsRecord dnsRecord)
@@ -225,11 +217,7 @@ public class DomainService
                 }));
         }
         
-        await AuditLogService.Log(AuditLogType.UpdateDomainRecord, x =>
-        {
-            x.Add<Domain>(d.Id);
-            x.Add<DnsRecord>(dnsRecord.Name);
-        });
+        //TODO: AuditLog
     }
 
     public async Task DeleteDnsRecord(Domain d, DnsRecord dnsRecord)
@@ -240,11 +228,7 @@ public class DomainService
             await Client.Zones.DnsRecords.DeleteAsync(domain.SharedDomain.CloudflareId, dnsRecord.Id)
         );
         
-        await AuditLogService.Log(AuditLogType.DeleteDomainRecord, x =>
-        {
-            x.Add<Domain>(d.Id);
-            x.Add<DnsRecord>(dnsRecord.Name);
-        });
+        //TODO: AuditLog
     }
 
     private Domain EnsureData(Domain domain)

Moonlight/App/Services/Files/StorageService.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using Moonlight.App.Helpers;
+using Moonlight.App.Helpers;
 
 namespace Moonlight.App.Services.Files;
 

Moonlight/App/Services/LogServices/AuditLogService.cs

@@ -1,93 +0,0 @@
-using Moonlight.App.Database.Entities.LogsEntries;
-using Moonlight.App.Models.Log;
-using Moonlight.App.Models.Misc;
-using Moonlight.App.Repositories.LogEntries;
-using Moonlight.App.Services.Sessions;
-using Newtonsoft.Json;
-
-namespace Moonlight.App.Services.LogServices;
-
-public class AuditLogService
-{
-    private readonly AuditLogEntryRepository Repository;
-    private readonly IHttpContextAccessor HttpContextAccessor;
-
-    public AuditLogService(
-        AuditLogEntryRepository repository,
-        IHttpContextAccessor httpContextAccessor)
-    {
-        Repository = repository;
-        HttpContextAccessor = httpContextAccessor;
-    }
-
-    public Task Log(AuditLogType type, Action<AuditLogParameters> data)
-    {
-        var ip = GetIp();
-        var al = new AuditLogParameters();
-        data(al);
-        
-        var entry = new AuditLogEntry()
-        {
-            Ip = ip,
-            Type = type,
-            System = false,
-            JsonData = al.Build()
-        };
-
-        Repository.Add(entry);
-        
-        return Task.CompletedTask;
-    }
-    
-    public Task LogSystem(AuditLogType type, Action<AuditLogParameters> data)
-    {
-        var al = new AuditLogParameters();
-        data(al);
-        
-        var entry = new AuditLogEntry()
-        {
-            Type = type,
-            System = true,
-            JsonData = al.Build()
-        };
-
-        Repository.Add(entry);
-        
-        return Task.CompletedTask;
-    }
-    
-    private string GetIp()
-    {
-        if (HttpContextAccessor.HttpContext == null)
-            return "N/A";
-
-        if(HttpContextAccessor.HttpContext.Request.Headers.ContainsKey("X-Real-IP"))
-        {
-            return HttpContextAccessor.HttpContext.Request.Headers["X-Real-IP"]!;
-        }
-        
-        return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString();
-    }
-    
-    public class AuditLogParameters
-    {
-        private List<LogData> Data = new List<LogData>();
-
-        public void Add<T>(object? data)
-        {
-            if(data == null)
-                return;
-            
-            Data.Add(new LogData()
-            {
-                Type = typeof(T),
-                Value = data.ToString()
-            });
-        }
-
-        internal string Build()
-        {
-            return JsonConvert.SerializeObject(Data);
-        }
-    }
-}

Moonlight/App/Services/LogServices/ErrorLogService.cs

@@ -1,118 +0,0 @@
-using System.Diagnostics;
-using System.Reflection;
-using Moonlight.App.Database.Entities.LogsEntries;
-using Moonlight.App.Models.Log;
-using Moonlight.App.Repositories.LogEntries;
-using Moonlight.App.Services.Sessions;
-using Newtonsoft.Json;
-
-namespace Moonlight.App.Services.LogServices;
-
-public class ErrorLogService
-{
-    private readonly ErrorLogEntryRepository Repository;
-    private readonly IHttpContextAccessor HttpContextAccessor;
-    
-    public ErrorLogService(ErrorLogEntryRepository repository, IHttpContextAccessor httpContextAccessor)
-    {
-        Repository = repository;
-        HttpContextAccessor = httpContextAccessor;
-    }
-    
-    public Task Log(Exception exception, Action<ErrorLogParameters> data)
-    {
-        var ip = GetIp();
-        var al = new ErrorLogParameters();
-        data(al);
-        
-        var entry = new ErrorLogEntry()
-        {
-            Ip = ip,
-            System = false,
-            JsonData = al.Build(),
-            Class = NameOfCallingClass(),
-            Stacktrace = exception.ToStringDemystified()
-        };
-
-        Repository.Add(entry);
-        
-        return Task.CompletedTask;
-    }
-    
-    public Task LogSystem(Exception exception, Action<ErrorLogParameters> data)
-    {
-        var al = new ErrorLogParameters();
-        data(al);
-        
-        var entry = new ErrorLogEntry()
-        {
-            System = true,
-            JsonData = al.Build(),
-            Class = NameOfCallingClass(),
-            Stacktrace = exception.ToStringDemystified()
-        };
-
-        Repository.Add(entry);
-        
-        return Task.CompletedTask;
-    }
-    
-    private string NameOfCallingClass(int skipFrames = 4)
-    {
-        string fullName;
-        Type? declaringType;
-            
-        do
-        {
-            MethodBase method = new StackFrame(skipFrames, false).GetMethod()!;
-            declaringType = method.DeclaringType;
-            if (declaringType == null)
-            {
-                return method.Name;
-            }
-            skipFrames++;
-            if (declaringType.Name.Contains("<"))
-                fullName = declaringType.ReflectedType!.Name;
-            else
-                fullName = declaringType.Name;
-        }
-        while (declaringType.Module.Name.Equals("mscorlib.dll", StringComparison.OrdinalIgnoreCase) | fullName.Contains("Log"));
-
-        return fullName;
-    }
-    
-    private string GetIp()
-    {
-        if (HttpContextAccessor.HttpContext == null)
-            return "N/A";
-
-        if(HttpContextAccessor.HttpContext.Request.Headers.ContainsKey("X-Real-IP"))
-        {
-            return HttpContextAccessor.HttpContext.Request.Headers["X-Real-IP"]!;
-        }
-        
-        return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString();
-    }
-    
-    public class ErrorLogParameters
-    {
-        private List<LogData> Data = new List<LogData>();
-
-        public void Add<T>(object? data)
-        {
-            if(data == null)
-                return;
-
-            Data.Add(new LogData()
-            {
-                Type = typeof(T),
-                Value = data.ToString()
-            });
-        }
-
-        internal string Build()
-        {
-            return JsonConvert.SerializeObject(Data);
-        }
-    }
-}

Moonlight/App/Services/LogServices/LogService.cs

@@ -1,45 +0,0 @@
-using Logging.Net;
-using Moonlight.App.Helpers;
-using Moonlight.App.Models.Misc;
-
-namespace Moonlight.App.Services.LogServices;
-
-public class LogService
-{
-    public LogService()
-    {
-        Task.Run(ClearLog);
-    }
-
-    private async Task ClearLog()
-    {
-        while (true)
-        {
-            await Task.Delay(TimeSpan.FromMinutes(15));
-
-            if (GetMessages().Length > 500)
-            {
-                if (Logger.UsedLogger is CacheLogger cacheLogger)
-                {
-                    cacheLogger.Clear(250); //TODO: config
-                }
-                else
-                {
-                    Logger.Warn("Log service cannot access cache. Is Logging.Net using CacheLogger?");
-                }
-            }
-        }
-    }
-    
-    public LogEntry[] GetMessages()
-    {
-        if (Logger.UsedLogger is CacheLogger cacheLogger)
-        {
-            return cacheLogger.GetMessages();
-        }
-
-        Logger.Warn("Log service cannot access cache. Is Logging.Net using CacheLogger?");
-        
-        return Array.Empty<LogEntry>();
-    }
-}

Moonlight/App/Services/LogServices/SecurityLogService.cs

@@ -1,92 +0,0 @@
-using Moonlight.App.Database.Entities.LogsEntries;
-using Moonlight.App.Models.Log;
-using Moonlight.App.Models.Misc;
-using Moonlight.App.Repositories.LogEntries;
-using Moonlight.App.Services.Sessions;
-using Newtonsoft.Json;
-
-namespace Moonlight.App.Services.LogServices;
-
-public class SecurityLogService
-{
-    private readonly SecurityLogEntryRepository Repository;
-    private readonly IHttpContextAccessor HttpContextAccessor;
-
-    public SecurityLogService(SecurityLogEntryRepository repository, IHttpContextAccessor httpContextAccessor)
-    {
-        Repository = repository;
-        HttpContextAccessor = httpContextAccessor;
-    }
-
-    public Task Log(SecurityLogType type, Action<SecurityLogParameters> data)
-    {
-        var ip = GetIp();
-        var al = new SecurityLogParameters();
-        data(al);
-        
-        var entry = new SecurityLogEntry()
-        {
-            Ip = ip,
-            Type = type,
-            System = false,
-            JsonData = al.Build()
-        };
-
-        Repository.Add(entry);
-        
-        return Task.CompletedTask;
-    }
-    
-    public Task LogSystem(SecurityLogType type, Action<SecurityLogParameters> data)
-    {
-        var al = new SecurityLogParameters();
-        data(al);
-        
-        var entry = new SecurityLogEntry()
-        {
-            Type = type,
-            System = true,
-            JsonData = al.Build()
-        };
-
-        Repository.Add(entry);
-        
-        return Task.CompletedTask;
-    }
-    
-    private string GetIp()
-    {
-        if (HttpContextAccessor.HttpContext == null)
-            return "N/A";
-
-        if(HttpContextAccessor.HttpContext.Request.Headers.ContainsKey("X-Real-IP"))
-        {
-            return HttpContextAccessor.HttpContext.Request.Headers["X-Real-IP"]!;
-        }
-        
-        return HttpContextAccessor.HttpContext.Connection.RemoteIpAddress!.ToString();
-    }
-    
-    
-    public class SecurityLogParameters
-    {
-        private List<LogData> Data = new List<LogData>();
-
-        public void Add<T>(object? data)
-        {
-            if(data == null)
-                return;
-
-            Data.Add(new LogData()
-            {
-                Type = typeof(T),
-                Value = data.ToString()
-            });
-        }
-
-        internal string Build()
-        {
-            return JsonConvert.SerializeObject(Data);
-        }
-    }
-}

Moonlight/App/Services/Mail/MailService.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using MimeKit;
+using MimeKit;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Exceptions;
 using Moonlight.App.Helpers;

Moonlight/App/Services/Mail/TrashMailDetectorService.cs

@@ -1,5 +1,5 @@
 using System.Net;
-using Logging.Net;
+using Moonlight.App.Helpers;
 
 namespace Moonlight.App.Services.Mail;
 

Moonlight/App/Services/MoonlightService.cs

@@ -1,4 +1,4 @@
-using Logging.Net;
+using Moonlight.App.Helpers;
 using Octokit;
 using Repository = LibGit2Sharp.Repository;
 
@@ -33,9 +33,6 @@ public class MoonlightService
 
     private async Task FetchChangeLog()
     {
-        if(AppVersion == "unknown")
-            return;
-
         if (ConfigService.DebugMode)
         {
             ChangeLog.Add(new[]

Moonlight/App/Services/Notifications/NotificationClientService.cs

@@ -1,43 +0,0 @@
-using System.Net.WebSockets;
-using System.Text;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Database.Entities.Notification;
-using Moonlight.App.Http.Controllers.Api.Moonlight.Notifications;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.Sessions;
-
-namespace Moonlight.App.Services.Notifications;
-
-public class NotificationClientService
-{
-    private readonly NotificationRepository NotificationRepository;
-    private readonly NotificationServerService NotificationServerService;
-    internal ListenController listenController;
-    
-    public NotificationClientService(NotificationRepository notificationRepository, NotificationServerService notificationServerService)
-    {
-        NotificationRepository = notificationRepository;
-        NotificationServerService = notificationServerService;
-    }
-
-    public User User => NotificationClient.User;
-    
-    public NotificationClient NotificationClient { get; set; }
-
-    public async Task SendAction(string action)
-    {
-        await listenController.ws.SendAsync(Encoding.UTF8.GetBytes(action), WebSocketMessageType.Text,
-            WebSocketMessageFlags.EndOfMessage, CancellationToken.None);
-    }
-
-    public void WebsocketReady(NotificationClient client)
-    {
-        NotificationClient = client;
-        NotificationServerService.AddClient(this);
-    }
-
-    public void WebsocketClosed()
-    {
-        NotificationServerService.RemoveClient(this);
-    }
-}

Moonlight/App/Services/Notifications/NotificationServerService.cs

@@ -1,56 +1,75 @@
-using Microsoft.EntityFrameworkCore;
+using System.Net.WebSockets;
+using System.Text;
+using Microsoft.EntityFrameworkCore;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Database.Entities.Notification;
+using Moonlight.App.Events;
+using Moonlight.App.Models.Misc;
 using Moonlight.App.Repositories;
 
 namespace Moonlight.App.Services.Notifications;
 
 public class NotificationServerService
 {
-    private UserRepository UserRepository;
-    private NotificationRepository NotificationRepository;
+    private readonly List<ActiveNotificationClient> ActiveClients = new();
 
     private readonly IServiceScopeFactory ServiceScopeFactory;
-    private IServiceScope ServiceScope;
+    private readonly EventSystem Event;
 
-    public NotificationServerService(IServiceScopeFactory serviceScopeFactory)
+    public NotificationServerService(IServiceScopeFactory serviceScopeFactory, EventSystem eventSystem)
     {
         ServiceScopeFactory = serviceScopeFactory;
-        Task.Run(Run);
+        Event = eventSystem;
     }
 
-    private Task Run()
+    public Task<ActiveNotificationClient[]> GetActiveClients()
     {
-        ServiceScope = ServiceScopeFactory.CreateScope();
-
-        UserRepository = ServiceScope
-            .ServiceProvider
-            .GetRequiredService<UserRepository>();
-
-        NotificationRepository = ServiceScope
-            .ServiceProvider
-            .GetRequiredService<NotificationRepository>();
-        
-        return Task.CompletedTask;
+        lock (ActiveClients)
+        {
+            return Task.FromResult(ActiveClients.ToArray());
+        }
     }
 
-    private List<NotificationClientService> connectedClients = new();
-
-    public List<NotificationClientService> GetConnectedClients()
+    public Task<ActiveNotificationClient[]> GetUserClients(User user)
     {
-        return connectedClients.ToList();
+        lock (ActiveClients)
+        {
+            return Task.FromResult(
+                ActiveClients
+                    .Where(x => x.Client.User.Id == user.Id)
+                    .ToArray()
+            );
         }
-
-    public List<NotificationClientService> GetConnectedClients(User user)
-    {
-        return connectedClients.Where(x => x.User == user).ToList();
     }
 
     public async Task SendAction(User user, string action)
     {
-        var clients = NotificationRepository.GetClients().Include(x => x.User).Where(x => x.User == user).ToList();
+        using var scope = ServiceScopeFactory.CreateScope();
+        var notificationClientRepository =
+            scope.ServiceProvider.GetRequiredService<Repository<NotificationClient>>();
+        
+        var clients = notificationClientRepository
+            .Get()
+            .Include(x => x.User)
+            .Where(x => x.User == user)
+            .ToList();
 
         foreach (var client in clients)
+        {
+            ActiveNotificationClient[] connectedUserClients;
+
+            lock (ActiveClients)
+            {
+                connectedUserClients = ActiveClients
+                    .Where(x => x.Client.Id == user.Id)
+                    .ToArray();
+            }
+            
+            if (connectedUserClients.Length > 0)
+            {
+                await connectedUserClients[0].SendAction(action);
+            }
+            else
             {
                 var notificationAction = new NotificationAction()
                 {
@@ -58,27 +77,37 @@ public class NotificationServerService
                     NotificationClient = client
                 };
                 
-            var connected = connectedClients.Where(x => x.NotificationClient.Id == client.Id).ToList();
+                var notificationActionsRepository =
+                    scope.ServiceProvider.GetRequiredService<Repository<NotificationAction>>();
 
-            if (connected.Count > 0)
-            {
-                var clientService = connected[0];
-                await clientService.SendAction(action);
-            }
-            else
-            {
-                NotificationRepository.AddAction(notificationAction);
+                notificationActionsRepository.Add(notificationAction);
             }
         }
     }
 
-    public void AddClient(NotificationClientService notificationClientService)
+    public async Task RegisterClient(WebSocket webSocket, NotificationClient notificationClient)
     {
-        connectedClients.Add(notificationClientService);
+        var newClient = new ActiveNotificationClient()
+        {
+            WebSocket = webSocket,
+            Client = notificationClient
+        };
+        
+        lock (ActiveClients)
+        {
+            ActiveClients.Add(newClient);
         }
 
-    public void RemoveClient(NotificationClientService notificationClientService)
+        await Event.Emit("notifications.addClient", notificationClient);
+    }
+
+    public async Task UnRegisterClient(NotificationClient client)
     {
-        connectedClients.Remove(notificationClientService);
+        lock (ActiveClients)
+        {
+            ActiveClients.RemoveAll(x => x.Client == client);
+        }
+        
+        await Event.Emit("notifications.removeClient", client);
     }
 }

Moonlight/App/Services/OneTimeJwtService.cs

@@ -4,9 +4,7 @@ using JWT.Builder;
 using JWT.Exceptions;
 using Moonlight.App.Exceptions;
 using Moonlight.App.Helpers;
-using Moonlight.App.Models.Misc;
 using Moonlight.App.Repositories;
-using Moonlight.App.Services.LogServices;
 
 namespace Moonlight.App.Services;
 
@@ -14,15 +12,12 @@ public class OneTimeJwtService
 {
     private readonly ConfigService ConfigService;
     private readonly RevokeRepository RevokeRepository;
-    private readonly SecurityLogService SecurityLogService;
 
     public OneTimeJwtService(ConfigService configService,
-        RevokeRepository revokeRepository,
-        SecurityLogService securityLogService)
+        RevokeRepository revokeRepository)
     {
         ConfigService = configService;
         RevokeRepository = revokeRepository;
-        SecurityLogService = securityLogService;
     }
 
     public string Generate(Action<Dictionary<string, string>> options, TimeSpan? validTime = null)
@@ -76,10 +71,7 @@ public class OneTimeJwtService
         }
         catch (SignatureVerificationException)
         {
-            await SecurityLogService.LogSystem(SecurityLogType.ManipulatedJwt, x =>
-            {
-                x.Add<string>(token);
-            });
+            Logger.Warn($"Detected a manipulated JWT: {token}", "security");
             return null;
         }
         catch (Exception e)

Moonlight/App/Services/ServerService.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Moonlight.App.ApiClients.Wings;
 using Moonlight.App.ApiClients.Wings.Requests;
 using Moonlight.App.ApiClients.Wings.Resources;
@@ -13,7 +12,6 @@ using Moonlight.App.Helpers.Wings;
 using Moonlight.App.Models.Misc;
 using Moonlight.App.Repositories;
 using Moonlight.App.Repositories.Servers;
-using Moonlight.App.Services.LogServices;
 using FileAccess = Moonlight.App.Helpers.Files.FileAccess;
 
 namespace Moonlight.App.Services;
@@ -30,9 +28,6 @@ public class ServerService
     private readonly UserService UserService;
     private readonly ConfigService ConfigService;
     private readonly WingsJwtHelper WingsJwtHelper;
-    private readonly SecurityLogService SecurityLogService;
-    private readonly AuditLogService AuditLogService;
-    private readonly ErrorLogService ErrorLogService;
     private readonly NodeService NodeService;
     private readonly DateTimeService DateTimeService;
     private readonly EventSystem Event;
@@ -46,9 +41,6 @@ public class ServerService
         UserService userService,
         ConfigService configService,
         WingsJwtHelper wingsJwtHelper,
-        SecurityLogService securityLogService,
-        AuditLogService auditLogService,
-        ErrorLogService errorLogService,
         NodeService nodeService,
         NodeAllocationRepository nodeAllocationRepository,
         DateTimeService dateTimeService,
@@ -63,9 +55,6 @@ public class ServerService
         UserService = userService;
         ConfigService = configService;
         WingsJwtHelper = wingsJwtHelper;
-        SecurityLogService = securityLogService;
-        AuditLogService = auditLogService;
-        ErrorLogService = errorLogService;
         NodeService = nodeService;
         NodeAllocationRepository = nodeAllocationRepository;
         DateTimeService = dateTimeService;
@@ -107,11 +96,7 @@ public class ServerService
             Action = rawSignal
         });
 
-        await AuditLogService.Log(AuditLogType.ChangePowerState, x =>
-        {
-            x.Add<Server>(server.Uuid);
-            x.Add<PowerSignal>(rawSignal);
-        });
+        //TODO: AuditLog
     }
 
     public async Task<ServerBackup> CreateBackup(Server server)
@@ -140,12 +125,7 @@ public class ServerService
             Ignore = ""
         });
 
-        await AuditLogService.Log(AuditLogType.CreateBackup,
-            x =>
-            {
-                x.Add<Server>(server.Uuid);
-                x.Add<ServerBackup>(backup.Uuid);
-            });
+        //TODO: AuditLog
 
         return backup;
     }
@@ -182,12 +162,7 @@ public class ServerService
                 Adapter = "wings"
             });
 
-        await AuditLogService.Log(AuditLogType.RestoreBackup,
-            x =>
-            {
-                x.Add<Server>(server.Uuid);
-                x.Add<ServerBackup>(serverBackup.Uuid);
-            });
+        //TODO: AuditLog
     }
 
     public async Task DeleteBackup(Server server, ServerBackup serverBackup)
@@ -220,13 +195,7 @@ public class ServerService
 
         await Event.Emit("wings.backups.delete", backup);
 
-        await AuditLogService.Log(AuditLogType.DeleteBackup,
-            x =>
-            {
-                x.Add<Server>(server.Uuid);
-                x.Add<ServerBackup>(backup.Uuid);
-            }
-        );
+        //TODO: AuditLog
     }
 
     public async Task<string> DownloadBackup(Server s, ServerBackup serverBackup)
@@ -239,12 +208,7 @@ public class ServerService
             claims.Add("backup_uuid", serverBackup.Uuid.ToString());
         });
 
-        await AuditLogService.Log(AuditLogType.DownloadBackup,
-            x =>
-            {
-                x.Add<Server>(server.Uuid);
-                x.Add<ServerBackup>(serverBackup.Uuid);
-            });
+        //TODO: AuditLog
 
         if (server.Node.Ssl)
             return $"https://{server.Node.Fqdn}:{server.Node.HttpPort}/download/backup?token={token}";
@@ -346,17 +310,14 @@ public class ServerService
                 StartOnCompletion = false
             });
 
-            await AuditLogService.Log(AuditLogType.CreateServer, x => { x.Add<Server>(newServerData.Uuid); });
+            //TODO: AuditLog
             
             return newServerData;
         }
         catch (Exception e)
         {
-            await ErrorLogService.Log(e, x =>
-            {
-                x.Add<Server>(newServerData.Uuid);
-                x.Add<Node>(node.Id);
-            });
+            Logger.Error("Error creating server on wings");
+            Logger.Error(e);
 
             ServerRepository.Delete(newServerData); //TODO Remove unsinged table stuff
 
@@ -373,7 +334,7 @@ public class ServerService
         server.Installing = true;
         ServerRepository.Update(server);
         
-        await AuditLogService.Log(AuditLogType.ReinstallServer, x => { x.Add<Server>(server.Uuid); });
+        //TODO: AuditLog
     }
 
     public async Task<Server> SftpServerLogin(int serverId, int id, string password)
@@ -382,7 +343,7 @@ public class ServerService
 
         if (server == null)
         {
-            await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, x => { x.Add<int>(id); });
+            Logger.Warn($"Detected an sftp bruteforce attempt. ID: {id} Password: {password}", "security");
             throw new Exception("Server not found");
         }
 

Moonlight/App/Services/Sessions/DynamicBackgroundService.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using Moonlight.App.Services.Files;
+using Moonlight.App.Services.Files;
 
 namespace Moonlight.App.Services.Sessions;
 

Moonlight/App/Services/Sessions/IdentityService.cs

@@ -2,12 +2,10 @@
 using JWT.Algorithms;
 using JWT.Builder;
 using JWT.Exceptions;
-using Logging.Net;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Helpers;
 using Moonlight.App.Models.Misc;
 using Moonlight.App.Repositories;
-using Moonlight.App.Services.LogServices;
 using UAParser;
 
 namespace Moonlight.App.Services.Sessions;
@@ -16,8 +14,6 @@ public class IdentityService
 {
     private readonly UserRepository UserRepository;
     private readonly CookieService CookieService;
-    private readonly SecurityLogService SecurityLogService;
-    private readonly ErrorLogService ErrorLogService;
     private readonly IHttpContextAccessor HttpContextAccessor;
     private readonly string Secret;
     
@@ -27,15 +23,11 @@ public class IdentityService
         CookieService cookieService,
         UserRepository userRepository,
         IHttpContextAccessor httpContextAccessor,
-        ConfigService configService,
-        SecurityLogService securityLogService,
-        ErrorLogService errorLogService)
+        ConfigService configService)
     {
         CookieService = cookieService;
         UserRepository = userRepository;
         HttpContextAccessor = httpContextAccessor;
-        SecurityLogService = securityLogService;
-        ErrorLogService = errorLogService;
 
         Secret = configService
             .GetSection("Moonlight")
@@ -90,15 +82,13 @@ public class IdentityService
             }
             catch (SignatureVerificationException)
             {
-                await SecurityLogService.Log(SecurityLogType.ManipulatedJwt, x =>
-                {
-                    x.Add<string>(token);
-                });
+                Logger.Warn($"Detected a manipulated JWT: {token}", "security");
                 return null;
             }
             catch (Exception e)
             {
-                await ErrorLogService.Log(e, x => {});
+                Logger.Error("Error reading jwt");
+                Logger.Error(e);
                 return null;
             }
 
@@ -134,7 +124,8 @@ public class IdentityService
         }
         catch (Exception e)
         {
-            await ErrorLogService.Log(e, x => {});
+            Logger.Error("Unexpected error while processing token");
+            Logger.Error(e);
             return null;
         }
     }
@@ -159,8 +150,17 @@ public class IdentityService
 
         try
         {
+            var userAgent = HttpContextAccessor.HttpContext.Request.Headers.UserAgent.ToString();
+
+            if (userAgent.Contains("Moonlight.App"))
+            {
+                var version = userAgent.Remove(0, "Moonlight.App/".Length).Split(' ').FirstOrDefault();
+
+                return "Moonlight App " + version;
+            }
+            
             var uaParser = Parser.GetDefault();
-            var info = uaParser.Parse(HttpContextAccessor.HttpContext.Request.Headers.UserAgent);
+            var info = uaParser.Parse(userAgent);
 
             return $"{info.OS} - {info.Device}";
         }

Moonlight/App/Services/Sessions/KeyListenerService.cs

@@ -0,0 +1,38 @@
+using Microsoft.JSInterop;
+
+namespace Moonlight.App.Services.Sessions;
+
+public class KeyListenerService
+{
+    private readonly IJSRuntime _jsRuntime;
+    private DotNetObjectReference<KeyListenerService> _objRef;
+
+    public event EventHandler<string> KeyPressed;
+
+    public KeyListenerService(IJSRuntime jsRuntime)
+    {
+        _jsRuntime = jsRuntime;
+    }
+
+    public async Task Initialize()
+    {
+        _objRef = DotNetObjectReference.Create(this);
+        await _jsRuntime.InvokeVoidAsync("moonlight.keyListener.register", _objRef);
+    }
+
+    [JSInvokable]
+    public void OnKeyPress(string key)
+    {
+        KeyPressed?.Invoke(this, key);
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        try
+        {
+            await _jsRuntime.InvokeVoidAsync("moonlight.keyListener.unregister", _objRef);
+            _objRef.Dispose();
+        }
+        catch (Exception) { /* ignored */}
+    }
+}

Moonlight/App/Services/SmartTranslateService.cs

@@ -78,7 +78,7 @@ public class SmartTranslateService
         }
         catch (Exception ex)
         {
-            Logging.Net.Logger.Error(ex);
+            Logger.Error(ex);
             return key;
         }
     }

Moonlight/App/Services/Statistics/StatisticsCaptureService.cs

@@ -1,6 +1,5 @@
-using Logging.Net;
-using Moonlight.App.Database;
-using Moonlight.App.Database.Entities;
+using Moonlight.App.Database.Entities;
+using Moonlight.App.Helpers;
 using Moonlight.App.Repositories;
 using Moonlight.App.Services.Sessions;
 
@@ -66,8 +65,6 @@ public class StatisticsCaptureService
                 AddEntry("databasesCount", databasesRepo.Get().Count());
                 AddEntry("sessionsCount", sessionService.GetAll().Length);
             }
-            
-            Logger.Log("Statistics are weird");
         }
         catch (Exception e)
         {

Moonlight/App/Services/SupportChat/SupportChatClientService.cs

@@ -1,5 +1,4 @@
-using Logging.Net;
-using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Forms;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
 using Moonlight.App.Services.Files;

Moonlight/App/Services/TotpService.cs

@@ -1,7 +1,4 @@
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Models.Misc;
-using Moonlight.App.Repositories;
-using Moonlight.App.Services.LogServices;
+using Moonlight.App.Repositories;
 using Moonlight.App.Services.Sessions;
 using OtpNet;
 
@@ -11,16 +8,13 @@ public class TotpService
 {
     private readonly IdentityService IdentityService;
     private readonly UserRepository UserRepository;
-    private readonly AuditLogService AuditLogService;
 
     public TotpService(
         IdentityService identityService, 
-        UserRepository userRepository, 
-        AuditLogService auditLogService)
+        UserRepository userRepository)
     {
         IdentityService = identityService;
         UserRepository = userRepository;
-        AuditLogService = auditLogService;
     }
 
     public Task<bool> Verify(string secret, string code)
@@ -52,10 +46,7 @@ public class TotpService
         
         UserRepository.Update(user);
 
-        await AuditLogService.Log(AuditLogType.EnableTotp, x =>
-        {
-            x.Add<User>(user.Email);
-        });
+        //TODO: AuditLog
     }
 
     public async Task EnforceTotpLogin()
@@ -74,10 +65,7 @@ public class TotpService
 
         UserRepository.Update(user);
         
-        await AuditLogService.Log(AuditLogType.DisableTotp,x =>
-        {
-            x.Add<User>(user.Email);
-        });
+        //TODO: AuditLog
     }
 
     private string GenerateSecret()

Moonlight/App/Services/UserService.cs

@@ -5,7 +5,6 @@ using Moonlight.App.Exceptions;
 using Moonlight.App.Helpers;
 using Moonlight.App.Models.Misc;
 using Moonlight.App.Repositories;
-using Moonlight.App.Services.LogServices;
 using Moonlight.App.Services.Mail;
 using Moonlight.App.Services.Sessions;
 
@@ -15,8 +14,6 @@ public class UserService
 {
     private readonly UserRepository UserRepository;
     private readonly TotpService TotpService;
-    private readonly SecurityLogService SecurityLogService;
-    private readonly AuditLogService AuditLogService;
     private readonly MailService MailService;
     private readonly IdentityService IdentityService;
     private readonly IpLocateService IpLocateService;
@@ -28,8 +25,6 @@ public class UserService
         UserRepository userRepository,
         TotpService totpService,
         ConfigService configService,
-        SecurityLogService securityLogService,
-        AuditLogService auditLogService,
         MailService mailService,
         IdentityService identityService,
         IpLocateService ipLocateService,
@@ -37,8 +32,6 @@ public class UserService
     {
         UserRepository = userRepository;
         TotpService = totpService;
-        SecurityLogService = securityLogService;
-        AuditLogService = auditLogService;
         MailService = mailService;
         IdentityService = identityService;
         IpLocateService = ipLocateService;
@@ -85,10 +78,7 @@ public class UserService
 
         await MailService.SendMail(user!, "register", values => {});
         
-        await AuditLogService.Log(AuditLogType.Register, x =>
-        {
-            x.Add<User>(user.Email);
-        });
+        //TODO: AuditLog
 
         return await GenerateToken(user);
     }
@@ -102,11 +92,7 @@ public class UserService
 
         if (user == null)
         {
-            await SecurityLogService.Log(SecurityLogType.LoginFail, x =>
-            {
-                x.Add<User>(email);
-                x.Add<string>(password);
-            });
+            Logger.Warn($"Failed login attempt. Email: {email} Password: {password}", "security");
             throw new DisplayException("Email and password combination not found");
         }
 
@@ -115,11 +101,7 @@ public class UserService
             return user.TotpEnabled;
         }
 
-        await SecurityLogService.Log(SecurityLogType.LoginFail, x =>
-        {
-            x.Add<User>(email);
-            x.Add<string>(password);
-        });
+        Logger.Warn($"Failed login attempt. Email: {email} Password: {password}", "security");
         throw new DisplayException("Email and password combination not found");;
     }
 
@@ -144,28 +126,18 @@ public class UserService
 
             if (totpCodeValid)
             {
-                await AuditLogService.Log(AuditLogType.Login, x =>
-                {
-                    x.Add<User>(email);
-                });
+                //TODO: AuditLog
                 return await GenerateToken(user, true);
             }
             else
             {
-                await SecurityLogService.Log(SecurityLogType.LoginFail, x =>
-                {
-                    x.Add<User>(email);
-                    x.Add<string>(password);
-                });
+                Logger.Warn($"Failed login attempt. Email: {email} Password: {password}", "security");
                 throw new DisplayException("2FA code invalid");
             }
         }
         else
         {
-            await AuditLogService.Log(AuditLogType.Login, x =>
-            {
-                x.Add<User>(email);
-            });
+            //TODO: AuditLog
             return await GenerateToken(user!, true);
         }
     }
@@ -178,10 +150,7 @@ public class UserService
 
         if (isSystemAction)
         {
-            await AuditLogService.LogSystem(AuditLogType.ChangePassword, x=>
-            {
-                x.Add<User>(user.Email);
-            });
+            //TODO: AuditLog
         }
         else
         {
@@ -194,10 +163,7 @@ public class UserService
                 values.Add("Location", location);
             });
 
-            await AuditLogService.Log(AuditLogType.ChangePassword, x =>
-            {
-                x.Add<User>(user.Email);
-            });
+            //TODO: AuditLog
         }
     }
 
@@ -207,28 +173,18 @@ public class UserService
 
         if (user == null)
         {
-            await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, x =>
-            {
-                x.Add<int>(id);
-            });
+            Logger.Warn($"Detected an sftp bruteforce attempt. ID: {id} Password: {password}", "security");
             
             throw new Exception("Invalid username");
         }
         
         if (BCrypt.Net.BCrypt.Verify(password, user.Password))
         {
-            await AuditLogService.LogSystem(AuditLogType.Login, x =>
-            {
-                x.Add<User>(user.Email);
-            });
+            //TODO: AuditLog
             return user;
         }
         
-        await SecurityLogService.LogSystem(SecurityLogType.SftpBruteForce, x =>
-        {
-            x.Add<int>(id);
-            x.Add<string>(password);
-        });
+        Logger.Warn($"Detected an sftp bruteforce attempt. ID: {id} Password: {password}", "security");
         throw new Exception("Invalid userid or password");
     }
 
@@ -271,7 +227,7 @@ public class UserService
         var newPassword = StringHelper.GenerateString(16);
         await ChangePassword(user, newPassword, true);
 
-        await AuditLogService.Log(AuditLogType.PasswordReset, x => {});
+        //TODO: AuditLog
 
         var location = await IpLocateService.GetLocation();
 

Moonlight/App/Services/WebSpaceService.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using DnsClient;
+using Microsoft.EntityFrameworkCore;
 using Moonlight.App.ApiClients.CloudPanel;
 using Moonlight.App.ApiClients.CloudPanel.Requests;
 using Moonlight.App.Database.Entities;
@@ -18,7 +19,8 @@ public class WebSpaceService
 
     private readonly CloudPanelApiHelper CloudPanelApiHelper;
 
-    public WebSpaceService(Repository<CloudPanel> cloudPanelRepository, Repository<WebSpace> webSpaceRepository, CloudPanelApiHelper cloudPanelApiHelper, Repository<MySqlDatabase> databaseRepository)
+    public WebSpaceService(Repository<CloudPanel> cloudPanelRepository, Repository<WebSpace> webSpaceRepository,
+        CloudPanelApiHelper cloudPanelApiHelper, Repository<MySqlDatabase> databaseRepository)
     {
         CloudPanelRepository = cloudPanelRepository;
         WebSpaceRepository = webSpaceRepository;
@@ -121,6 +123,52 @@ public class WebSpaceService
     {
         var webspace = EnsureData(w);
 
+        var dns = new LookupClient(new LookupClientOptions()
+        {
+            CacheFailedResults = false,
+            UseCache = false
+        });
+
+        var ipOfWebspaceQuery = await dns.QueryAsync(
+            webspace.Domain,
+            QueryType.A
+        );
+
+        var ipOfWebspaceWwwQuery = await dns.QueryAsync(
+            "www." + webspace.Domain,
+            QueryType.CNAME
+        );
+
+        var ipOfWebspace = ipOfWebspaceQuery.Answers.ARecords().FirstOrDefault();
+        var ipOfWebspaceWww = ipOfWebspaceWwwQuery.Answers.CnameRecords().FirstOrDefault();
+
+        if (ipOfWebspace == null)
+            throw new DisplayException($"Unable to find any a records for {webspace.Domain}", true);
+
+        if (ipOfWebspaceWww == null)
+            throw new DisplayException($"Unable to find any cname records for www.{webspace.Domain}", true);
+
+        var ipOfHostQuery = await dns.QueryAsync(
+            webspace.CloudPanel.Host,
+            QueryType.A
+        );
+
+        var ipOfHost = ipOfHostQuery.Answers.ARecords().FirstOrDefault();
+
+
+        if (ipOfHost == null)
+            throw new DisplayException("Unable to find a record of host system");
+
+        if (ipOfHost.Address.ToString() != ipOfWebspace.Address.ToString())
+            throw new DisplayException("The dns records of your webspace do not point to the host system");
+
+        Logger.Debug($"{ipOfWebspaceWww.CanonicalName.Value}");
+
+        if (ipOfWebspaceWww.CanonicalName.Value != webspace.CloudPanel.Host + ".")
+            throw new DisplayException(
+                $"The dns record www.{webspace.Domain} does not point to {webspace.CloudPanel.Host}", true);
+
+
         await CloudPanelApiHelper.Post(webspace.CloudPanel, "letsencrypt/install/certificate", new InstallLetsEncrypt()
         {
             DomainName = webspace.Domain
@@ -180,7 +228,8 @@ public class WebSpaceService
         var webspace = EnsureData(w);
 
         return Task.FromResult<FileAccess>(
-            new SftpFileAccess(webspace.CloudPanel.Host, webspace.UserName, webspace.Password, 22, true, $"/htdocs/{webspace.Domain}")
+            new SftpFileAccess(webspace.CloudPanel.Host, webspace.UserName, webspace.Password, 22, true,
+                $"/htdocs/{webspace.Domain}")
         );
     }
 

Moonlight/Moonlight.csproj

@@ -21,11 +21,11 @@
     <PackageReference Include="CurrieTechnologies.Razor.SweetAlert2" Version="5.4.0" />
     <PackageReference Include="Discord.Net" Version="3.10.0" />
     <PackageReference Include="Discord.Net.Webhook" Version="3.10.0" />
+    <PackageReference Include="DnsClient" Version="1.7.0" />
     <PackageReference Include="FluentFTP" Version="46.0.2" />
     <PackageReference Include="GravatarSharp.Core" Version="1.0.1.2" />
     <PackageReference Include="JWT" Version="10.0.2" />
     <PackageReference Include="LibGit2Sharp" Version="0.27.2" />
-    <PackageReference Include="Logging.Net" Version="1.1.3" />
     <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Mappy.Net" Version="1.0.2" />
     <PackageReference Include="Markdig" Version="0.31.0" />
@@ -46,6 +46,9 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
     <PackageReference Include="QRCoder" Version="1.4.3" />
     <PackageReference Include="RestSharp" Version="109.0.0-preview.1" />
+    <PackageReference Include="Serilog" Version="3.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00910" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
     <PackageReference Include="SSH.NET" Version="2020.0.2" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="XtermBlazor" Version="1.8.1" />

Moonlight/Program.cs

@@ -2,7 +2,6 @@ using BlazorDownloadFile;
 using BlazorTable;
 using CurrieTechnologies.Razor.SweetAlert2;
 using HealthChecks.UI.Client;
-using Logging.Net;
 using Moonlight.App.ApiClients.CloudPanel;
 using Moonlight.App.ApiClients.Daemon;
 using Moonlight.App.ApiClients.Modrinth;
@@ -24,13 +23,14 @@ using Moonlight.App.Services.Background;
 using Moonlight.App.Services.DiscordBot;
 using Moonlight.App.Services.Files;
 using Moonlight.App.Services.Interop;
-using Moonlight.App.Services.LogServices;
 using Moonlight.App.Services.Mail;
 using Moonlight.App.Services.Minecraft;
 using Moonlight.App.Services.Notifications;
 using Moonlight.App.Services.Sessions;
 using Moonlight.App.Services.Statistics;
 using Moonlight.App.Services.SupportChat;
+using Serilog;
+using Serilog.Sinks.SystemConsole.Themes;
 
 namespace Moonlight
 {
@@ -38,14 +38,31 @@ namespace Moonlight
     {
         public static async Task Main(string[] args)
         {
-            Logger.UsedLogger = new CacheLogger();
+            // This will also copy all default config files
+            var configService = new ConfigService(new StorageService());
+
+            if (configService.DebugMode)
+            {
+                Log.Logger = new LoggerConfiguration()
+                    .MinimumLevel.Verbose()
+                    .Enrich.FromLogContext()
+                    .WriteTo.Console(
+                        outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}")
+                    .CreateLogger();
+            }
+            else
+            {
+                Log.Logger = new LoggerConfiguration()
+                    .MinimumLevel.Information()
+                    .Enrich.FromLogContext()
+                    .WriteTo.Console(
+                        outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}")
+                    .CreateLogger();
+            }
             
             Logger.Info($"Working dir: {Directory.GetCurrentDirectory()}");
 
             Logger.Info("Running pre-init tasks");
-            
-            // This will also copy all default config files
-            var configService = new ConfigService(new StorageService());
             var databaseCheckupService = new DatabaseCheckupService(configService);
                 
             await databaseCheckupService.Perform();
@@ -118,7 +135,6 @@ namespace Moonlight
             builder.Services.AddScoped<OneTimeJwtService>();
             builder.Services.AddSingleton<NotificationServerService>();
             builder.Services.AddScoped<NotificationAdminService>();
-            builder.Services.AddScoped<NotificationClientService>();
             builder.Services.AddScoped<ModalService>();
             builder.Services.AddScoped<SmartDeployService>();
             builder.Services.AddScoped<WebSpaceService>();
@@ -135,15 +151,12 @@ namespace Moonlight
             builder.Services.AddSingleton<OAuth2Service>();
             builder.Services.AddScoped<DynamicBackgroundService>();
             builder.Services.AddScoped<ServerAddonPluginService>();
+            builder.Services.AddScoped<KeyListenerService>();
 
             builder.Services.AddScoped<SubscriptionService>();
             builder.Services.AddScoped<SubscriptionAdminService>();
 
             // Loggers
-            builder.Services.AddScoped<SecurityLogService>();
-            builder.Services.AddScoped<AuditLogService>();
-            builder.Services.AddScoped<ErrorLogService>();
-            builder.Services.AddScoped<LogService>();
             builder.Services.AddScoped<MailService>();
             builder.Services.AddSingleton<TrashMailDetectorService>();
 
@@ -169,6 +182,7 @@ namespace Moonlight
             builder.Services.AddSingleton<StatisticsCaptureService>();
             builder.Services.AddSingleton<DiscordNotificationService>();
             builder.Services.AddSingleton<CleanupService>();
+            builder.Services.AddSingleton<MalwareScanService>();
             
             // Other
             builder.Services.AddSingleton<MoonlightService>();
@@ -207,6 +221,7 @@ namespace Moonlight
             _ = app.Services.GetRequiredService<DiscordBotService>();
             _ = app.Services.GetRequiredService<StatisticsCaptureService>();
             _ = app.Services.GetRequiredService<DiscordNotificationService>();
+            _ = app.Services.GetRequiredService<MalwareScanService>();
             
             _ = app.Services.GetRequiredService<MoonlightService>();
 

Moonlight/Properties/launchSettings.json

@@ -31,6 +31,20 @@
       },
       "applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118",
       "dotnetRunMessages": true
+    },
+    "Watch": {
+      "commandName": "Executable",
+      "executablePath": "dotnet",
+      "workingDirectory": "$(ProjectDir)",
+      "hotReloadEnabled": true,
+      "hotReloadProfile": "aspnetcore",
+      "commandLineArgs": "watch run",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ML_DEBUG": "true"
+      },
+      "applicationUrl": "http://moonlight.testy:5118;https://localhost:7118;http://localhost:5118"
     }
   }
 }

Moonlight/Shared/Components/Alerts/NotFoundAlert.razor

@@ -0,0 +1,31 @@
+<div class="mx-auto">
+    <div class="card">
+        <div class="d-flex justify-content-center pt-5">
+            <img height="300" width="300" src="/assets/media/svg/notfound.svg" alt="Not found"/>
+        </div>
+        <span class="card-title text-center fs-3">
+            <TL>The requested resource was not found</TL>
+        </span>
+        <p class="card-body text-center fs-4 text-gray-800">
+            <TL>We were not able to find the requested resource. This can have following reasons</TL>
+
+            <div class="mt-4 d-flex flex-column align-items-center">
+                <li class="d-flex align-items-center py-2">
+                    <span class="bullet me-5"></span> <TL>The resource was deleted</TL>
+                </li>
+                <li class="d-flex align-items-center py-2">
+                    <span class="bullet me-5"></span> <TL>You have to permission to access this resource</TL>
+                </li>
+                <li class="d-flex align-items-center py-2">
+                    <span class="bullet me-5"></span> <TL>You may have entered invalid data</TL>
+                </li>
+                <li class="d-flex align-items-center py-2">
+                    <span class="bullet me-5"></span> <TL>A unknown bug occured</TL>
+                </li>
+                <li class="d-flex align-items-center py-2">
+                    <span class="bullet me-5"></span> <TL>An api was down and not proper handled</TL>
+                </li>
+            </div>
+        </p>
+    </div>
+</div>

Moonlight/Shared/Components/Auth/Login.razor

@@ -8,11 +8,11 @@
 @using Moonlight.App.Services.Interop
 @using Moonlight.App.Services
 @using Moonlight.App.Exceptions
-@using Logging.Net
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services.Sessions
 @using System.ComponentModel.DataAnnotations
+@using Moonlight.App.Helpers
 @using Moonlight.App.Models.Forms
 
 @inject AlertService AlertService

Moonlight/Shared/Components/ErrorBoundaries/ComponentErrorBoundary.razor

@@ -1,66 +0,0 @@
-@using Logging.Net
-@using Moonlight.App.Services.LogServices
-@using Moonlight.App.Services.Sessions
-
-@inherits ErrorBoundary
-
-@inject ErrorLogService ErrorLogService
-
-@if (CurrentException is null)
-{
-    @ChildContent
-}
-else if (ErrorContent is not null)
-{
-    <div class="card card-flush h-md-100">
-        <div class="card-body d-flex flex-column justify-content-between mt-9 bgi-no-repeat bgi-size-cover bgi-position-x-center pb-0">
-            <div class="mb-10">
-                <div class="fs-2hx fw-bold text-gray-800 text-center mb-13">
-                    <span class="me-2">
-                        <TL>Ooops. This component is crashed</TL>
-                    </span>
-                </div>
-                <div class="text-center">
-                    <TL>This component is crashed. The error has been reported to the moonlight team</TL>
-                </div>
-            </div>
-        </div>
-    </div>
-}
-else
-{
-    <div class="card card-flush h-md-100">
-        <div class="card-body d-flex flex-column justify-content-between mt-9 bgi-no-repeat bgi-size-cover bgi-position-x-center pb-0">
-            <div class="mb-10">
-                <div class="fs-2hx fw-bold text-gray-800 text-center mb-13">
-                    <span class="me-2">
-                        <TL>Ooops. This component is crashed</TL>
-                    </span>
-                </div>
-                <div class="text-center">
-                    <TL>This component is crashed. The error has been reported to the moonlight team</TL>
-                </div>
-            </div>
-        </div>
-    </div>
-}
-
-@code
-{
-    List<Exception> receivedExceptions = new();
-
-    protected override async Task OnErrorAsync(Exception exception)
-    {
-        receivedExceptions.Add(exception);
-
-        await ErrorLogService.Log(exception, x => {});
-
-        await base.OnErrorAsync(exception);
-    }
-
-    public new void Recover()
-    {
-        receivedExceptions.Clear();
-        base.Recover();
-    }
-}

Moonlight/Shared/Components/ErrorBoundaries/GlobalErrorBoundary.razor

@@ -1,5 +1,5 @@
-@using Logging.Net
-@using Moonlight.App.Services.Sessions
+@using Moonlight.App.Services.Sessions
+@using Moonlight.App.Helpers
 
 @inherits ErrorBoundary
 

Moonlight/Shared/Components/ErrorBoundaries/PageErrorBoundary.razor

@@ -1,5 +1,5 @@
-@using Logging.Net
-@using Moonlight.App.Exceptions
+@using Moonlight.App.Exceptions
+@using Moonlight.App.Helpers
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
 @using Moonlight.App.Services.Sessions

Moonlight/Shared/Components/ErrorBoundaries/SoftErrorBoundary.razor

@@ -1,11 +1,11 @@
 @using Moonlight.App.Services.Interop
 @using Moonlight.App.Exceptions
 @using Moonlight.App.Services
-@using Logging.Net
 @using Moonlight.App.ApiClients.CloudPanel
 @using Moonlight.App.ApiClients.Daemon
 @using Moonlight.App.ApiClients.Modrinth
 @using Moonlight.App.ApiClients.Wings
+@using Moonlight.App.Helpers
 @inherits ErrorBoundaryBase
 
 @inject AlertService AlertService
@@ -42,15 +42,24 @@ else
     {
         if (ConfigService.DebugMode)
         {
-            Logger.Warn(exception);
+            Logger.Verbose(exception);
         }
         
         if (exception is DisplayException displayException)
+        {
+            if (displayException.DoNotTranslate)
+            {
+                await AlertService.Error(
+                    displayException.Message
+                    );
+            }
+            else
             {
                 await AlertService.Error(
                     SmartTranslateService.Translate(displayException.Message)
                     );
             }
+        }
         else if (exception is CloudflareException cloudflareException)
         {
             await AlertService.Error(

Moonlight/Shared/Components/FileManagerPartials/FileEditor.razor

@@ -1,10 +1,15 @@
 @using BlazorMonaco
 @using Moonlight.App.Services
+@using Moonlight.App.Services.Interop
+@using Moonlight.App.Services.Sessions
 @using Moonlight.Shared.Components.Partials
 
 @inject SmartTranslateService TranslationService
+@inject KeyListenerService KeyListenerService
 @inject IJSRuntime JsRuntime
 
+@implements IDisposable
+
 <div class="card bg-black rounded">
     <div class="card-body">
         <MonacoEditor CssClass="h-100" @ref="Editor" Id="vseditor" ConstructionOptions="(x) => EditorOptions"/>
@@ -65,6 +70,16 @@
             },
             AutoIndent = true
         };
+        
+        KeyListenerService.KeyPressed += KeyPressed;
+    }
+
+    private async void KeyPressed(object? sender, string e)
+    {
+        if (e == "saveShortcut")
+        {
+            await Submit();
+        }
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -111,4 +126,10 @@
     {
         return await Editor.GetValue();
     }
+
+    public void Dispose()
+    {
+        Editor.Dispose();
+        KeyListenerService.KeyPressed -= KeyPressed;
+    }
 }

Moonlight/Shared/Components/FileManagerPartials/FileManager.razor

@@ -1,6 +1,5 @@
 @using Moonlight.App.Helpers.Files
 @using Moonlight.App.Helpers
-@using Logging.Net
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
 @using BlazorDownloadFile
@@ -17,7 +16,7 @@
                 InitialData="@EditorInitialData"
                 Language="@EditorLanguage"
                 OnCancel="() => Cancel()"
-                OnSubmit="(_) => Cancel(true)"
+                OnSubmit="(_) => Save()"
                 HideControls="false">
     </FileEditor>
 }
@@ -255,6 +254,13 @@ else
         return false;
     }
     
+    private async void Save()
+    {
+        var data = await Editor.GetData();
+        await Access.Write(EditingFile, data);
+        await ToastService.Success(SmartTranslateService.Translate("Successfully saved file"));
+    }
+
     private async void Cancel(bool save = false)
     {
         if (save)

Moonlight/Shared/Components/FileManagerPartials/FilePath.razor

@@ -1,5 +1,4 @@
 @using Moonlight.App.Helpers.Files
-@using Logging.Net
 
 <div class="badge badge-lg badge-light-primary">
     <div class="d-flex align-items-center flex-wrap">

Moonlight/Shared/Components/FileManagerPartials/FileUpload.razor

@@ -1,7 +1,7 @@
 @using Moonlight.App.Helpers.Files
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
-@using Logging.Net
+@using Moonlight.App.Helpers
 
 @inject ToastService ToastService
 @inject SmartTranslateService SmartTranslateService

Moonlight/Shared/Components/FileManagerPartials/FileView.razor

@@ -1,5 +1,4 @@
 @using Moonlight.App.Helpers.Files
-@using Logging.Net
 @using BlazorContextMenu
 @using Moonlight.App.Helpers
 

Moonlight/Shared/Components/Forms/SmartDropdown.razor

@@ -1,5 +1,4 @@
 @typeparam T
-@using Logging.Net
 @inherits InputBase<T>
 
 <div class="dropdown w-100">

Moonlight/Shared/Components/Forms/SmartFileSelect.razor

@@ -1,7 +1,6 @@
 @using Moonlight.App.Helpers.Files
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
-@using Logging.Net
 
 @inject ToastService ToastService
 @inject SmartTranslateService SmartTranslateService

Moonlight/Shared/Components/Forms/SmartReCaptcha.razor

@@ -1,5 +1,4 @@
 @using Moonlight.App.Services.Interop
-@using Logging.Net
 
 @inject ReCaptchaService ReCaptchaService
 

Moonlight/Shared/Components/Forms/WButton.razor

@@ -2,6 +2,7 @@
 {
     <button class="btn @(CssClasses)" @onclick="Do">
         @Text
+        @ChildContent
     </button>
 }
 else
@@ -20,14 +21,17 @@ else
     public string CssClasses { get; set; } = "btn-primary";
 
     [Parameter]
-    public string Text { get; set; } = "Mache was";
+    public string Text { get; set; } = "";
 
     [Parameter]
-    public string WorkingText { get; set; } = "Verarbeite...";
+    public string WorkingText { get; set; } = "";
     
     [Parameter]
     public Func<Task>? OnClick { get; set; }
 
+    [Parameter]
+    public RenderFragment ChildContent { get; set; }
+
     private async Task Do()
     {
         Working = true;

Moonlight/Shared/Components/Navigations/AdminSystemNavigation.razor

@@ -15,8 +15,8 @@
                 </a>
             </li>
             <li class="nav-item mt-2">
-                <a class="nav-link text-active-primary ms-0 me-10 py-5 @(Index == 2 ? "active" : "")" href="/admin/system/auditlog">
-                    <TL>AuditLog</TL>
+                <a class="nav-link text-active-primary ms-0 me-10 py-5 @(Index == 2 ? "active" : "")" href="/admin/system/malware">
+                    <TL>Malware</TL>
                 </a>
             </li>
             <li class="nav-item mt-2">

Moonlight/Shared/Components/Partials/TL.razor

@@ -1,5 +1,4 @@
 @using Microsoft.AspNetCore.Components.Rendering
-@using Logging.Net
 @using Moonlight.App.Services
 
 @inject SmartTranslateService SmartTranslateService

Moonlight/Shared/Layouts/MainLayout.razor

@@ -21,6 +21,7 @@
 @inject SmartTranslateService SmartTranslateService
 @inject IpBanService IpBanService
 @inject DynamicBackgroundService DynamicBackgroundService
+@inject KeyListenerService KeyListenerService
 
 @{
     var uri = new Uri(NavigationManager.Uri);
@@ -40,6 +41,7 @@
     }
 }
 
+<GlobalErrorBoundary>
     <CascadingValue Value="User">
         <PageTitle>@(string.IsNullOrEmpty(title) ? "Dashboard - " : title)Moonlight</PageTitle>
 
@@ -59,6 +61,7 @@
                             <div id="kt_app_content" class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: url('@(DynamicBackgroundService.BackgroundImageUrl)')">
                                 <div id="kt_app_content_container" class="app-container container-fluid">
                                     <div class="mt-10">
+                                        <SoftErrorBoundary>
                                             @if (!IsIpBanned)
                                             {
                                                 if (UserProcessed)
@@ -140,6 +143,7 @@
                                                     </div>
                                                 </div>
                                             }
+                                        </SoftErrorBoundary>
                                     </div>
                                 </div>
                             </div>
@@ -150,6 +154,7 @@
             </div>
         </div>
     </CascadingValue>
+</GlobalErrorBoundary>
 
 @code
 {
@@ -203,10 +208,14 @@
                 UserProcessed = true;
                 await InvokeAsync(StateHasChanged);
 
+                try
+                {
                     await JsRuntime.InvokeVoidAsync("document.body.removeAttribute", "data-kt-app-reset-transition");
                     await JsRuntime.InvokeVoidAsync("document.body.removeAttribute", "data-kt-app-page-loading");
                     await JsRuntime.InvokeVoidAsync("KTMenu.createInstances");
                     await JsRuntime.InvokeVoidAsync("KTDrawer.createInstances");
+                }
+                catch (Exception){ /* ignore errors to make sure that the session call is executed */ }
 
                 await SessionService.Register();
 
@@ -232,6 +241,8 @@
                         });
                 }
 
+                await KeyListenerService.Initialize();
+
                 RunDelayedMenu(0);
                 RunDelayedMenu(1);
                 RunDelayedMenu(3);
@@ -248,6 +259,8 @@
     {
         SessionService.Close();
 
+        await KeyListenerService.DisposeAsync();
+
         if (User != null)
         {
             await Event.Off($"supportChat.{User.Id}.message", this);

Moonlight/Shared/Views/Admin/Index.razor

@@ -3,10 +3,10 @@
 @using Moonlight.App.Repositories
 @using Moonlight.App.Repositories.Domains
 @using Moonlight.App.Database.Entities
+@using Moonlight.App.Helpers
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services
 @using Newtonsoft.Json
-@using Logging.Net
 
 @inject ServerRepository ServerRepository
 @inject UserRepository UserRepository

Moonlight/Shared/Views/Admin/Nodes/Index.razor

@@ -4,9 +4,9 @@
 @using Moonlight.Shared.Components.Navigations
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
-@using Logging.Net
 @using BlazorTable
 @using Moonlight.App.ApiClients.Wings.Resources
+@using Moonlight.App.Helpers
 
 @inject NodeRepository NodeRepository
 @inject AlertService AlertService
@@ -131,7 +131,8 @@
                     }
                     catch (Exception e)
                     {
-                        Logger.Debug(e.Message);
+                        Logger.Verbose($"Error fetching status for node '{node.Name}'");
+                        Logger.Verbose(e);
                     }
 
                     await InvokeAsync(StateHasChanged);

Moonlight/Shared/Views/Admin/Notifications/Debugging.razor

@@ -1,33 +1,74 @@
 @page "/admin/notifications/debugging"
 @using Moonlight.App.Services.Notifications
+@using Moonlight.App.Models.Misc
+@using Moonlight.App.Events
+@using BlazorTable
+@using Moonlight.App.Database.Entities.Notification
+@using Moonlight.App.Services
 
 @inject NotificationServerService NotificationServerService
+@inject SmartTranslateService SmartTranslateService
+@inject EventSystem Event
+
+@implements IDisposable
 
 <OnlyAdmin>
     <LazyLoader Load="Load">
-        <h1>Notification Debugging</h1>
-        @foreach (var client in Clients)
-        {
-            <hr/>
-            <div>
-                <p>Id: @client.NotificationClient.Id User: @client.User.Email</p>
-                <button @onclick="async () => await SendSampleNotification(client)"></button>
+        <div class="card card-body">
+            <Table TableItem="ActiveNotificationClient" Items="Clients" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                <Column TableItem="ActiveNotificationClient" Title="@(SmartTranslateService.Translate("Id"))" Field="@(x => x.Client.Id)" Sortable="false" Filterable="true"/>
+                <Column TableItem="ActiveNotificationClient" Title="@(SmartTranslateService.Translate("User"))" Field="@(x => x.Client.User.Email)" Sortable="false" Filterable="true"/>
+                <Column TableItem="ActiveNotificationClient" Title="" Field="@(x => x.Client.Id)" Sortable="false" Filterable="false">
+                    <Template>
+                        <WButton Text="@(SmartTranslateService.Translate("Send notification"))"
+                                 WorkingText="@(SmartTranslateService.Translate("Working"))"
+                                 CssClasses="btn-primary"
+                                 OnClick="() => SendSampleNotification(context)">
+                        </WButton>
+                    </Template>
+                </Column>
+                <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+            </Table>
         </div>
-        }
     </LazyLoader>
 </OnlyAdmin>
 
 
-@code {
-    private List<NotificationClientService> Clients;
+@code
+{
+    private ActiveNotificationClient[] Clients;
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            await Event.On<NotificationClient>("notifications.addClient", this, async client =>
+            {
+                Clients = await NotificationServerService.GetActiveClients();
+                await InvokeAsync(StateHasChanged);
+            });
+
+            await Event.On<NotificationClient>("notifications.removeClient", this, async client =>
+            {
+                Clients = await NotificationServerService.GetActiveClients();
+                await InvokeAsync(StateHasChanged);
+            });
+        }
+    }
 
     private async Task Load(LazyLoader loader)
     {
-        Clients = NotificationServerService.GetConnectedClients();
+        Clients = await NotificationServerService.GetActiveClients();
     }
 
-    private async Task SendSampleNotification(NotificationClientService client)
+    private async Task SendSampleNotification(ActiveNotificationClient client)
     {
-        await client.SendAction(@"{""action"": ""notify"",""notification"":{""id"":999,""channel"":""Sample Channel"",""content"":""This is a sample Notification"",""title"":""Sample Notification""}}");
+        await client.SendAction(@"{""action"": ""notify"",""notification"":{""id"":999,""channel"":""Sample Channel"",""content"":""This is a sample Notification"",""title"":""Sample Notification"",""url"":""server/9b724fe2-d882-49c9-8c34-3414c7e4a17e""}}");
+    }
+
+    public async void Dispose()
+    {
+        await Event.Off("notifications.addClient", this);
+        await Event.Off("notifications.removeClient", this);
     }
 }

Moonlight/Shared/Views/Admin/Servers/Cleanup.razor

@@ -1,13 +1,8 @@
 @page "/admin/servers/cleanup"
-
-@using Moonlight.App.Services
-@using Moonlight.App.Models.Misc
-@using Moonlight.App.Services.LogServices
 @using Moonlight.App.Events
 @using Moonlight.App.Services.Background
 
 @inject CleanupService CleanupService
-@inject AuditLogService AuditLogService
 @inject EventSystem Event
 
 @implements IDisposable

Moonlight/Shared/Views/Admin/Servers/Images/Index.razor

@@ -1,13 +1,13 @@
 @page "/admin/servers/images"
 
 @using BlazorTable
-@using Logging.Net
 @using Microsoft.EntityFrameworkCore
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Repositories
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
 @using System.Text
+@using Moonlight.App.Helpers
 @using Newtonsoft.Json
 
 @inject Repository<Image> ImageRepository

Moonlight/Shared/Views/Admin/Servers/New.razor

@@ -4,8 +4,8 @@
 @using Moonlight.App.Services
 @using Microsoft.EntityFrameworkCore
 @using Moonlight.App.Exceptions
+@using Moonlight.App.Helpers
 @using Moonlight.App.Services.Interop
-@using Logging.Net
 @using Moonlight.App.Models.Forms
 
 @inject NodeRepository NodeRepository

Moonlight/Shared/Views/Admin/Servers/View/Allocations.razor

@@ -0,0 +1,85 @@
+@using Moonlight.App.Database.Entities
+@using Moonlight.App.Repositories
+@using Microsoft.EntityFrameworkCore
+@using Moonlight.App.Services
+@using Moonlight.App.Services.Interop
+@using BlazorTable
+
+@inject Repository<Server> ServerRepository
+@inject Repository<NodeAllocation> NodeAllocationRepository
+@inject AlertService AlertService
+@inject SmartTranslateService SmartTranslateService
+
+<div class="row">
+    <div class="col-12 col-md-6 mb-5">
+        <div class="card card-body">
+            <WButton Text="@(SmartTranslateService.Translate("Add allocation"))"
+                     WorkingText="@(SmartTranslateService.Translate("Searching"))"
+                     CssClasses="btn-primary"
+                     OnClick="AddAllocation">
+            </WButton>
+        </div>
+    </div>
+    <div class="col-12 col-md-6">
+        <div class="card card-body">
+            <div class="table-responsive">
+                <table class="table table-bordered">
+                    <tbody>
+                    @foreach (var allocation in Server.Allocations)
+                    {
+                        <tr>
+                            <td class="align-middle fs-5">
+                                @(Server.Node.Fqdn + ":" + allocation.Port)
+                            </td>
+                            <td>
+                                <WButton Text="@(SmartTranslateService.Translate("Delete"))"
+                                         WorkingText="@(SmartTranslateService.Translate("Deleting"))"
+                                         CssClasses="btn-danger"
+                                         OnClick="() => DeleteAllocation(allocation)">
+                                </WButton>
+                            </td>
+                        </tr>
+                    }
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+@code
+{
+    [CascadingParameter]
+    public Server Server { get; set; }
+
+    private async Task AddAllocation()
+    {
+    // We have sadly no choice to use entity framework to do what the sql call does, there
+    // are only slower ways, so we will use a raw sql call as a exception
+
+        var freeAllocation = NodeAllocationRepository
+            .Get()
+            .FromSqlRaw($"SELECT * FROM `NodeAllocations` WHERE ServerId IS NULL AND NodeId={Server.Node.Id} LIMIT 1")
+            .FirstOrDefault();
+
+        if (freeAllocation == null)
+        {
+            await AlertService.Error(
+                SmartTranslateService.Translate("No free allocation found"));
+            return;
+        }
+
+        Server.Allocations.Add(freeAllocation);
+        ServerRepository.Update(Server);
+
+        await InvokeAsync(StateHasChanged);
+    }
+
+    private async Task DeleteAllocation(NodeAllocation nodeAllocation)
+    {
+        Server.Allocations.Remove(nodeAllocation);
+        ServerRepository.Update(Server);
+
+        await InvokeAsync(StateHasChanged);
+    }
+}

Moonlight/Shared/Views/Admin/Servers/View/Index.razor

@@ -33,6 +33,7 @@
                     </Route>
                     <Route Path="/allocations">
                         <AdminServersViewNavigation Index="3" Server="Server"/>
+                        <Allocations />
                     </Route>
                     <Route Path="/archive">
                         <AdminServersViewNavigation Index="4" Server="Server"/>
@@ -72,6 +73,7 @@
             .Include(x => x.Allocations)
             .Include(x => x.MainAllocation)
             .Include(x => x.Variables)
+            .Include(x => x.Node)
             .FirstOrDefault(x => x.Id == Id);
 
         return Task.CompletedTask;

Moonlight/Shared/Views/Admin/Sys/Logs.razor

@@ -3,37 +3,18 @@
 @using BlazorTable
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services
-@using Moonlight.App.Services.LogServices
 @using Moonlight.Shared.Components.Navigations
 
-@inject LogService LogService
 @inject SmartTranslateService SmartTranslateService
 
 <OnlyAdmin>
     <AdminSystemNavigation Index="1"/>
-
-    <div class="card">
-        <div class="card-body">
-            <LazyLoader Load="Load">
-                <Table TableItem="LogEntry" Items="LogEntries" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
-                    <Column TableItem="LogEntry" Title="@(SmartTranslateService.Translate("Time"))" Field="@(x => x.CreatedAt)" Sortable="true" Filterable="false"></Column>
-                    <Column TableItem="LogEntry" Title="@(SmartTranslateService.Translate("Log level"))" Field="@(x => x.Level)" Sortable="true" Filterable="false"></Column>
-                    <Column TableItem="LogEntry" Title="@(SmartTranslateService.Translate("Log message"))" Field="@(x => x.Message)" Sortable="false" Filterable="true"></Column>
-                    <Pager ShowPageNumber="true" ShowTotalCount="true"/>
-                </Table>
-            </LazyLoader>
-        </div>
-    </div>
 </OnlyAdmin>
 
 @code
 {
-    private LogEntry[] LogEntries;
-
     private Task Load(LazyLoader arg)
     {
-        LogEntries = LogService.GetMessages();
-
         return Task.CompletedTask;
     }
 }

Moonlight/Shared/Views/Admin/Sys/Malware.razor

@@ -0,0 +1,134 @@
+@page "/admin/system/malware"
+
+@using Moonlight.Shared.Components.Navigations
+@using Moonlight.App.Services.Background
+@using Moonlight.App.Services
+@using BlazorTable
+@using Moonlight.App.Database.Entities
+@using Moonlight.App.Events
+@using Moonlight.App.Models.Misc
+
+@inject MalwareScanService MalwareScanService
+@inject SmartTranslateService SmartTranslateService
+@inject EventSystem Event
+
+@implements IDisposable
+
+<OnlyAdmin>
+    <AdminSystemNavigation Index="2"/>
+
+    <div class="row">
+        <div class="col-12 col-lg-6">
+            <div class="card">
+                <div class="card-body">
+                    @if (MalwareScanService.IsRunning)
+                    {
+                        <span class="fs-3 spinner-border align-middle me-3"></span>
+                    }
+
+                    <span class="fs-3">@(MalwareScanService.Status)</span>
+                </div>
+                <div class="card-footer">
+                    @if (MalwareScanService.IsRunning)
+                    {
+                        <button class="btn btn-success disabled">
+                            <TL>Scan in progress</TL>
+                        </button>
+                    }
+                    else
+                    {
+                        <WButton Text="@(SmartTranslateService.Translate("Start scan"))"
+                                 CssClasses="btn-success"
+                                 OnClick="MalwareScanService.Start">
+                        </WButton>
+                    }
+                </div>
+            </div>
+        </div>
+        <div class="col-12 col-lg-6">
+            <div class="card">
+                <div class="card-header">
+                    <span class="card-title">
+                        <TL>Results</TL>
+                    </span>
+                </div>
+                <div class="card-body">
+                    <LazyLoader @ref="LazyLoaderResults" Load="LoadResults">
+                        <div class="table-responsive">
+                            <Table TableItem="Server" Items="ScanResults.Keys" PageSize="25" TableClass="table table-row-bordered table-row-gray-100 align-middle gs-0 gy-3" TableHeadClass="fw-bold text-muted">
+                                <Column TableItem="Server" Title="@(SmartTranslateService.Translate("Server"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                                    <Template>
+                                        <a href="/server/@(context.Uuid)">@(context.Name)</a>
+                                    </Template>
+                                </Column>
+                                <Column TableItem="Server" Title="@(SmartTranslateService.Translate("Results"))" Field="@(x => x.Id)" Sortable="false" Filterable="false">
+                                    <Template>
+                                        <div class="row">
+                                            @foreach (var result in ScanResults[context])
+                                            {
+                                                <div class="col-12 col-md-6 p-3">
+                                                    <div class="accordion" id="scanResult@(result.GetHashCode())">
+                                                        <div class="accordion-item">
+                                                            <h2 class="accordion-header" id="scanResult-header@(result.GetHashCode())">
+                                                                <button class="accordion-button fs-4 fw-semibold collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#scanResult-body@(result.GetHashCode())" aria-expanded="false" aria-controls="scanResult-body@(result.GetHashCode())">
+                                                                    <span>@(result.Title)</span>
+                                                                </button>
+                                                            </h2>
+                                                            <div id="scanResult-body@(result.GetHashCode())" class="accordion-collapse collapse" aria-labelledby="scanResult-header@(result.GetHashCode())" data-bs-parent="#scanResult">
+                                                                <div class="accordion-body">
+                                                                    <p>
+                                                                        @(result.Description)
+                                                                    </p>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            }
+                                        </div>
+                                    </Template>
+                                </Column>
+                                <Pager ShowPageNumber="true" ShowTotalCount="true"/>
+                            </Table>
+                        </div>
+                    </LazyLoader>
+                </div>
+            </div>
+        </div>
+    </div>
+</OnlyAdmin>
+
+@code
+{
+    private readonly Dictionary<Server, MalwareScanResult[]> ScanResults = new();
+
+    private LazyLoader LazyLoaderResults;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await Event.On<Object>("malwareScan.status", this, async o => { await InvokeAsync(StateHasChanged); });
+
+        await Event.On<Object>("malwareScan.result", this, async o => { await LazyLoaderResults.Reload(); });
+    }
+
+    private Task LoadResults(LazyLoader arg)
+    {
+        ScanResults.Clear();
+
+        lock (MalwareScanService.ScanResults)
+        {
+            foreach (var result in MalwareScanService.ScanResults)
+            {
+                ScanResults.Add(result.Key, result.Value);
+            }
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public async void Dispose()
+    {
+        await Event.Off("malwareScan.status", this);
+        await Event.Off("malwareScan.result", this);
+    }
+}

Moonlight/Shared/Views/Admin/Users/Sessions.razor

@@ -3,7 +3,6 @@
 @using Moonlight.Shared.Components.Navigations
 @using Moonlight.App.Services.Sessions
 @using BlazorTable
-@using Logging.Net
 @using Moonlight.App.Helpers
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services

Moonlight/Shared/Views/Profile/Security.razor

@@ -2,7 +2,6 @@
 
 @using Moonlight.Shared.Components.Navigations
 @using QRCoder
-@using Moonlight.App.Services.LogServices
 @using Moonlight.App.Services.Sessions
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
@@ -11,7 +10,6 @@
 @using Moonlight.App.Models.Misc
 
 @inject SmartTranslateService SmartTranslateService
-@inject AuditLogService AuditLogService
 @inject TotpService TotpService
 @inject NavigationManager NavigationManager
 @inject IdentityService IdentityService
@@ -257,7 +255,7 @@
 
     private async void Enable()
     {
-        await AuditLogService.Log(AuditLogType.EnableTotp, x => x.Add<string>("Totp enabled"));
+    //TODO: AuditLog
         await TotpService.Enable();
         TotpEnabled = await TotpService.GetEnabled();
         TotpSecret = await TotpService.GetSecret();
@@ -283,7 +281,7 @@
 
     private async void Disable()
     {
-        await AuditLogService.Log(AuditLogType.DisableTotp, x => x.Add<string>("Totp disabled"));
+    //TODO: AuditLog
         await TotpService.Disable();
         NavigationManager.NavigateTo(NavigationManager.Uri, true);
     }
@@ -307,7 +305,7 @@
         {
             await UserService.ChangePassword(User, Password);
 
-            await AuditLogService.Log(AuditLogType.PasswordChange, x => x.Add<string>("The password has been set to a new one"));
+    //TODO: AuditLog
 
     // Reload to make the user login again
             NavigationManager.NavigateTo(NavigationManager.Uri, true);

Moonlight/Shared/Views/Server/Index.razor

@@ -2,7 +2,6 @@
 @using Task = System.Threading.Tasks.Task
 @using Moonlight.App.Repositories.Servers
 @using Microsoft.EntityFrameworkCore
-@using Logging.Net
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Events
 @using Moonlight.App.Helpers.Wings
@@ -27,19 +26,7 @@
 <LazyLoader Load="LoadData">
     @if (CurrentServer == null)
     {
-        <div class="d-flex justify-content-center flex-center">
-            <div class="card">
-                <img src="/assets/media/svg/nodata.svg" class="card-img-top w-50 mx-auto pt-5" alt="Not found image"/>
-                <div class="card-body text-center">
-                    <h1 class="card-title">
-                        <TL>Server not found</TL>
-                    </h1>
-                    <p class="card-text fs-4">
-                        <TL>A server with that id cannot be found or you have no access for this server</TL>
-                    </p>
-                </div>
-            </div>
-        </div>
+        <NotFoundAlert />
     }
     else
     {
@@ -305,10 +292,6 @@
                     await DynamicBackgroundService.Change(Image.BackgroundImageUrl);
             }
         }
-        else
-        {
-            Logger.Debug("Server is null");
-        }
     }
 
     private async Task ReconnectConsole()

Moonlight/Shared/Views/Server/ServerAddons.razor

@@ -2,7 +2,7 @@
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Addon
 @using Moonlight.App.ApiClients.Modrinth.Resources
-@using Logging.Net
+@using Moonlight.App.Helpers
 @using Moonlight.App.Services.Interop
 
 @inject ServerAddonPluginService AddonPluginService
@@ -33,14 +33,14 @@
         </div>
         <div class="card-body">
             <LazyLoader @ref="PluginsLazyLoader" Load="LoadPlugins">
-                @foreach (var pluginsPart in Plugins.Chunk(3))
+                @if (Plugins.Any())
                 {
                     <div class="row">
-                        @foreach (var plugin in pluginsPart)
+                        @foreach (var plugin in Plugins)
                         {
-                            <div class="col">
-                                <div class="card p-2 card-bordered border-active">
-                                    <div class="d-flex justify-content-center">
+                            <div class="col-12 col-md-4 p-3">
+                                <div class="card bg-hover-secondary position-relative">
+                                    <div class="d-flex justify-content-center pt-5">
                                         <img height="100" width="100" src="@(plugin.IconUrl)" alt="@(plugin.Title)"/>
                                     </div>
                                     <div class="card-body">
@@ -48,10 +48,14 @@
                                         <p class="card-text">
                                             @(plugin.Description)
                                         </p>
-                                        <WButton Text="@(SmartTranslateService.Translate("Install"))"
-                                                 WorkingText="@(SmartTranslateService.Translate("Installing"))"
-                                                 CssClasses="btn-primary"
+                                    </div>
+                                    <div class="position-absolute top-0 end-0 mt-3 me-3">
+                                        <a href="https://modrinth.com/plugin/@(plugin.Slug)" class="btn btn-primary p-2" target="_blank">
+                                            <i class="ps-1 bx bx-sm bx-link"></i>
+                                        </a>
+                                        <WButton CssClasses="btn-success p-2"
                                                  OnClick="() => InstallPlugin(plugin)">
+                                            <i class="ps-1 bx bx-sm bx-download"></i>
                                         </WButton>
                                     </div>
                                 </div>
@@ -59,6 +63,10 @@
                         }
                     </div>
                 }
+                else
+                {
+                    <NotFoundAlert />
+                }
             </LazyLoader>
         </div>
     </div>
@@ -131,13 +139,7 @@ else
 
             await ToastService.CreateProcessToast("pluginDownload", "Preparing");
 
-            await AddonPluginService.InstallPlugin(fileAccess, version, project, delegate(string s)
-            {
-                Task.Run(async () =>
-                {
-                    await ToastService.UpdateProcessToast("pluginDownload", s);
-                });
-            });
+            await AddonPluginService.InstallPlugin(fileAccess, version, project, delegate(string s) { Task.Run(async () => { await ToastService.UpdateProcessToast("pluginDownload", s); }); });
 
             await ToastService.Success(
                 SmartTranslateService.Translate("Successfully installed " + project.Slug)
@@ -145,7 +147,8 @@ else
         }
         catch (Exception e)
         {
-            Logger.Info(e.Message);
+            Logger.Warn("Error installing plugin");
+            Logger.Warn(e);
             throw;
         }
         finally
@@ -155,4 +158,3 @@ else
         }
     }
 }
-

Moonlight/Shared/Views/Server/ServerBackups.razor

@@ -1,6 +1,5 @@
 @using Moonlight.App.Services
 @using Moonlight.App.Helpers
-@using Logging.Net
 @using BlazorContextMenu
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Events

Moonlight/Shared/Views/Server/ServerNavigation.razor

@@ -42,10 +42,7 @@
                 </div>
             </div>
         </div>
-        <div class="row">
-            <div class="separator my-5"></div>
-        </div>
-        <div class="row">
+        <div class="row mt-3">
             <div class="card card-body">
                 <div class="row align-items-center">
                     <div class="col fs-5">
@@ -107,8 +104,8 @@
             </div>
         </div>
         <div class="mt-5 row">
-            <div class="d-flex flex-column flex-md-row card card-body p-10">
-                <ul class="nav nav-tabs nav-pills flex-row border-0 flex-md-column me-5 mb-3 mb-md-0 fs-6 min-w-lg-200px">
+            <div class="d-flex flex-column flex-md-row card card-body p-5">
+                <ul class="nav nav-tabs nav-pills flex-row border-0 flex-md-column fs-6 pe-5 mb-5">
                     <li class="nav-item w-100 me-0 mb-md-2">
                         <a href="/server/@(CurrentServer.Uuid)/" class="nav-link w-100 btn btn-flex @(Index == 0 ? "active" : "") btn-active-light-primary">
                             <i class="bx bx-terminal bx-sm me-2"></i>

Moonlight/Shared/Views/Server/ServerNetwork.razor

@@ -1,7 +1,6 @@
 @using Moonlight.App.Repositories
 @using Moonlight.Shared.Components.Partials
 @using Task = System.Threading.Tasks.Task
-@using Logging.Net
 @using Moonlight.App.Database.Entities
 
 @inject NodeRepository NodeRepository

Moonlight/Shared/Views/Server/ServerSettings.razor

@@ -3,12 +3,14 @@
 @using Microsoft.AspNetCore.Components.Rendering
 
 <LazyLoader Load="Load">
-    <div class="accordion" id="serverSetting">
+    <div class="row">
         @foreach (var setting in Settings)
         {
+            <div class="col-12 col-md-6 p-3">
+                <div class="accordion" id="serverSetting@(setting.GetHashCode())">
                     <div class="accordion-item">
                         <h2 class="accordion-header" id="serverSetting-header@(setting.GetHashCode())">
-                    <button class="accordion-button fs-4 fw-semibold" type="button" data-bs-toggle="collapse" data-bs-target="#serverSetting-body@(setting.GetHashCode())" aria-expanded="true" aria-controls="serverSetting-body@(setting.GetHashCode())">
+                            <button class="accordion-button fs-4 fw-semibold collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#serverSetting-body@(setting.GetHashCode())" aria-expanded="false" aria-controls="serverSetting-body@(setting.GetHashCode())">
                                 <TL>@(setting.Key)</TL>
                             </button>
                         </h2>
@@ -18,6 +20,8 @@
                             </div>
                         </div>
                     </div>
+                </div>
+            </div>
         }
     </div>
 </LazyLoader>

Moonlight/Shared/Views/Server/Settings/ForgeVersionSetting.razor

@@ -3,7 +3,6 @@
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Repositories
 @using Moonlight.App.Repositories.Servers
-@using Logging.Net
 @using Moonlight.App.Helpers
 @using Moonlight.App.Services.Minecraft
 

Moonlight/Shared/Views/Server/Settings/Join2StartSetting.razor

@@ -1,10 +1,6 @@
 @using Moonlight.App.Services
 @using Task = System.Threading.Tasks.Task
-@using Moonlight.Shared.Components.Partials
-@using Moonlight.App.Helpers
-@using Moonlight.App.Repositories
 @using Moonlight.App.Repositories.Servers
-@using Logging.Net
 @using Moonlight.App.ApiClients.Wings
 @using Moonlight.App.Database.Entities
 

Moonlight/Shared/Views/Support.razor

@@ -3,7 +3,6 @@
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Helpers
 @using Moonlight.App.Services.SupportChat
-@using Logging.Net
 @using System.Text.RegularExpressions
 @using Moonlight.App.Services.Files
 

Moonlight/wwwroot/assets/js/moonlight.js

@@ -347,5 +347,28 @@
                 anchorElement.remove();
                 URL.revokeObjectURL(url);
             }
+        },
+        keyListener: {
+            register: function (dotNetObjRef)
+            {
+                moonlight.keyListener.listener = (event) => 
+                {
+                    // filter here what key events should be sent to moonlight
+                    
+                    console.log(event);
+
+                    if(event.code === "KeyS" && event.ctrlKey)
+                    {
+                        event.preventDefault();
+                        dotNetObjRef.invokeMethodAsync('OnKeyPress', "saveShortcut");
+                    }
+                };
+                
+                window.addEventListener('keydown', moonlight.keyListener.listener);
+            },
+            unregister: function (dotNetObjRef)
+            {
+                window.removeEventListener('keydown', moonlight.keyListener.listener);
+            }
         }
     };