Added exception handling

.gitignore

@@ -236,4 +236,7 @@ _Pvt_Extensions
 .fake/
 
 # SQLite database
-*.sqlite3
+*.sqlite3
+
+# .NET Core logging
+logs/

Whyvra.Tunnel.Api/Filters/HttpExceptionFilter.cs

@@ -1,6 +1,7 @@
 using System;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Whyvra.Tunnel.Common.Models;
 
 namespace Whyvra.Tunnel.Api.Filters
 {
@@ -10,21 +11,33 @@ public void OnException(ExceptionContext context)
         {
             if (context.Exception.GetType() == typeof(NullReferenceException))
             {
-                var error = new {message = context.Exception.Message, status = "Not Found", statusCode = 404};
+                var error = new ApiMessage {Message = context.Exception.Message, Status = "Not Found", StatusCode = 404};
                 context.Result = new JsonResult(error)
                 {
                     StatusCode = 404
                 };
             }
-
-            if (context.Exception.GetType() == typeof(ArgumentException))
+            else if (context.Exception.GetType() == typeof(ArgumentException))
             {
-                var error = new {message = context.Exception.Message, status = "Bad Request", statusCode = 400};
+                var error = new ApiMessage {Message = context.Exception.Message, Status = "Bad Request", StatusCode = 400};
                 context.Result = new JsonResult(error)
                 {
                     StatusCode = 400
                 };
             }
+            else
+            {
+                var error = new ApiMessage {Message = context.Exception.Message, Status = "Inner Server Error", StatusCode = 500};
+                if (context.Exception.InnerException != null)
+                {
+                    error.InnerException = context.Exception.InnerException.Message;
+                }
+
+                context.Result = new JsonResult(error)
+                {
+                    StatusCode = 500
+                };
+            }
         }
     }
 }

Whyvra.Tunnel.Api/Program.cs

@@ -1,5 +1,7 @@
+using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using Serilog;
 
 namespace Whyvra.Tunnel.Api
 {
@@ -12,6 +14,13 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
+                .ConfigureWebHostDefaults(webBuilder => webBuilder
+                    .UseSerilog((context, loggerConfiguration) =>
+                        loggerConfiguration
+                            .ReadFrom.Configuration(context.Configuration)
+                            .Enrich.WithProperty("MachineName", Environment.MachineName)
+                    )
+                    .UseStartup<Startup>()
+                );
     }
 }

Whyvra.Tunnel.Api/Whyvra.Tunnel.Api.csproj

@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="FluentValidation.AspNetCore" Version="9.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.9" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
   </ItemGroup>
 

Whyvra.Tunnel.Api/appsettings.json

@@ -1,9 +1,30 @@
 {
-  "Logging": {
-    "LogLevel": {
+  "Serilog": {
+    "Using":  [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "MinimumLevel": {
       "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Override": {
+        "Microsoft": "Warning",
+        "Microsoft.EntityFrameworkCore.Database.Command": "Warning",
+        "Microsoft.Hosting.Lifetime": "Information",
+        "System": "Warning"
+      }
+    },
+    "WriteTo": [
+      { "Name": "Console" },
+      {
+        "Name": "File",
+        "Args": {
+          "formatter": "Serilog.Formatting.Compact.RenderedCompactJsonFormatter, Serilog.Formatting.Compact",
+          "path": "logs/api_log_.json",
+          "retainedFileCountLimit": 7,
+          "rollingInterval": "Day"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext" ],
+    "Properties": {
+        "Application": "Tunnel API"
     }
   },
   "AllowedHosts": "*",

Whyvra.Tunnel.Common/Models/ApiMessage.cs

@@ -0,0 +1,13 @@
+namespace Whyvra.Tunnel.Common.Models
+{
+    public class ApiMessage
+    {
+        public string InnerException { get; set; }
+
+        public string Message { get; set; }
+
+        public string Status { get; set; }
+
+        public int StatusCode { get; set; }
+    }
+}

Whyvra.Tunnel.Core/Clients/Commands/CreateClientCommandHandler.cs

@@ -36,7 +36,7 @@ public async Task<int> Handle(CreateClientCommand command, CancellationToken can
 
                 var addresses = await _context.Clients
                     .AsNoTracking()
-                    .Where(x => x.ServerId == command.ServerId && !x.IsRevoked)
+                    .Where(x => x.ServerId == command.ServerId)
                     .Select(x => x.AssignedIp.addr)
                     .ToListAsync();
 

Whyvra.Tunnel.Presentation/Components/Notification.razor

@@ -8,7 +8,7 @@
                 </span>
             </div>
             <div class="level-item">
-                @NotificationDto.Message
+                @((MarkupString) NotificationDto.Message)
             </div>
         </div>
     </div>

Whyvra.Tunnel.Presentation/Components/NotificationDto.cs

@@ -6,6 +6,8 @@ public class NotificationDto
 
         public string IconCss { get; set; }
 
+        public bool IsVisible { get; set; }
+
         public string Message { get; set; }
 
         public string Severity { get; set; }

Whyvra.Tunnel.Presentation/Configuration/TunnelException.cs

@@ -0,0 +1,32 @@
+using System;
+using Whyvra.Tunnel.Common.Models;
+
+namespace Whyvra.Tunnel.Presentation.Configuration
+{
+    public class TunnelException : Exception
+    {
+        private readonly string _formattedMessage;
+
+        public TunnelException() : base()
+        {
+        }
+
+        public TunnelException(string message) : base(message)
+        {
+        }
+
+        public TunnelException(string message, string formattedMessage, ApiMessage apiMessage) : base(message)
+        {
+            ApiMessage = apiMessage;
+            _formattedMessage = formattedMessage;
+        }
+
+        public TunnelException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        public ApiMessage ApiMessage { get; }
+
+        public string FormattedMessage => _formattedMessage ?? Message;
+    }
+}

Whyvra.Tunnel.Presentation/Logging/ExceptionHandler.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Whyvra.Tunnel.Presentation.Logging
+{
+    public class ExceptionHandler : IExceptionHandler
+    {
+        public event EventHandler<Exception> OnUnhandledException;
+
+        public void Handle(Exception e)
+        {
+            OnUnhandledException?.Invoke(this, e);
+        }
+    }
+}

Whyvra.Tunnel.Presentation/Logging/ExceptionLogger.cs

@@ -0,0 +1,38 @@
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Whyvra.Tunnel.Presentation.Logging
+{
+    public class ExceptionLogger : ILogger
+    {
+        private readonly IExceptionHandler _handler;
+
+        public ExceptionLogger(IExceptionHandler handler)
+        {
+            _handler = handler;
+        }
+
+        public IDisposable BeginScope<TState>(TState state)
+        {
+            return new NoopDisposable();
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return true;
+        }
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+        {
+            if (exception == null) return;
+            _handler.Handle(exception);
+        }
+
+        private class NoopDisposable : IDisposable
+        {
+            public void Dispose()
+            {
+            }
+        }
+    }
+}

Whyvra.Tunnel.Presentation/Logging/ExceptionLoggerProvider.cs

@@ -0,0 +1,23 @@
+using Microsoft.Extensions.Logging;
+
+namespace Whyvra.Tunnel.Presentation.Logging
+{
+    public class ExceptionLoggerProvider : ILoggerProvider
+    {
+        private readonly IExceptionHandler _handler;
+
+        public ExceptionLoggerProvider(IExceptionHandler handler)
+        {
+            _handler = handler;
+        }
+
+        public ILogger CreateLogger(string categoryName)
+        {
+            return new ExceptionLogger(_handler);
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}

Whyvra.Tunnel.Presentation/Logging/IExceptionHandler.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace Whyvra.Tunnel.Presentation.Logging
+{
+    public interface IExceptionHandler
+    {
+        event EventHandler<Exception> OnUnhandledException;
+
+        void Handle(Exception e);
+    }
+}

Whyvra.Tunnel.Presentation/Pages/Server.razor

@@ -107,9 +107,9 @@
     {
         <Modal Icon="server" IconCss="has-text-info" Title="Server configuration" OnClose="@(() => _showServerConfig = false)">
             <ChildContent>
-                @if (_isNotificationVisible)
+                @if (_notification.IsVisible)
                 {
-                    <Notification NotificationDto="@_notification" OnClose="@(() => _isNotificationVisible = false)"></Notification>
+                    <Notification NotificationDto="@_notification" OnClose="@(() => _notification.IsVisible = false)"></Notification>
                 }
                 <pre class="codeblock">
                     <code class="language-ini">@_serverConfig</code>
@@ -132,14 +132,25 @@
         </Modal>
     }
 }
+else if (_notFound)
+{
+    <div class="subtitle has-text-centered">
+        <div>
+            <span class="icon is-large">
+                <i class="fas fa-times-circle fa-3x"></i>
+            </span>
+        </div>
+        Looks like there is nothing here.
+    </div>
+}
 
 @code
 {
     private int? _clientId = null;
     private bool _isLoading;
-    private bool _isNotificationVisible;
     private bool _isRevokedShowing;
-    private NotificationDto _notification;
+    private bool _notFound;
+    private NotificationDto _notification = new NotificationDto();
     private string _serverConfig;
     private bool _showPopup;
     private bool _showServerConfig;
@@ -151,7 +162,14 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _server = await ServerService.Get(ServerId);
+        try {
+            _server = await ServerService.Get(ServerId);
+        }
+        catch (TunnelException e)
+        {
+            if (e.ApiMessage.StatusCode == 404) _notFound = true;
+            else throw e;
+        }
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -185,7 +203,7 @@
             Message = "Copied to clipboard! Don't forget to swap the server's private key.",
             Severity = "info"
         };
-        _isNotificationVisible = true;
+        _notification.IsVisible = true;
     }
 
     private async Task GetRevoked()