Basic filters, refactorization.

src/Nyangate.Cli/Nyangate.Cli.csproj

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

src/Nyangate.Cli/Program.cs

@@ -1 +1 @@
-Console.WriteLine("meow~");
+Console.WriteLine("meow~");

src/Nyangate.Lib/Nyangate.Lib.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

src/Nyangate/Middleware/Authenticator.cs

@@ -0,0 +1,17 @@
+namespace Nyangate.Middleware;
+
+public class Authenticator
+{
+    private readonly RequestDelegate _next;
+
+    public Authenticator(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext ctx)
+    {
+        //do smth
+        await _next.Invoke(ctx);
+    }
+}

src/Nyangate/Middleware/Filter.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Nyangate.Middleware;
+
+public class Filter
+{
+    private readonly RequestDelegate _next;
+    public Filter(RequestDelegate next)
+    {
+        this._next = next;
+    }
+
+    public async Task Invoke(HttpContext ctx)
+    {
+        //do smth
+        await _next.Invoke(ctx);
+    }
+}

src/Nyangate/Middleware/IDSFilter.cs

@@ -0,0 +1,17 @@
+namespace Nyangate.Middleware;
+
+public class IDSFilter
+{
+    private readonly RequestDelegate _next;
+
+    public IDSFilter(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext ctx)
+    {
+        //do smth
+        await _next.Invoke(ctx);
+    }
+}

src/Nyangate/Middleware/IPFilter.cs

@@ -0,0 +1,17 @@
+namespace Nyangate.Middleware;
+
+public class IPFilter
+{
+    private readonly RequestDelegate _next;
+
+    public IPFilter(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext ctx)
+    {
+        //do smth
+        await _next.Invoke(ctx);
+    }
+}

src/Nyangate/Middleware/Router.cs

@@ -0,0 +1,25 @@
+using Nyangate.Services;
+
+namespace Nyangate.Middleware
+{
+    public class Router
+    {
+        private readonly RequestDelegate _next;
+        private readonly RoutingMap _map;
+
+        public Router(RequestDelegate next, RoutingMap map)
+        {
+            _next = next;
+            _map = map;
+        }
+
+        public async Task Invoke(HttpContext ctx)
+        {
+            string host = ctx.Request.Host.Host;
+            //check ctx.Request.IsHttps if strict https required
+            Console.WriteLine($"meow: {ctx.Connection.RemoteIpAddress}");
+            ctx.Response.StatusCode = 200;
+            await _next.Invoke(ctx);
+        }
+    }
+}

src/Nyangate/Nyangate.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>

src/Nyangate/Program.cs

@@ -1,6 +1,34 @@
-var builder = WebApplication.CreateBuilder(args);
-var app = builder.Build();
-
-app.MapGet("/", () => "meow~");
-
-app.Run();
+using Microsoft.AspNetCore.Components.Routing;
+using Nyangate;
+using Nyangate.Middleware;
+using Nyangate.Services;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddSingleton<ServerCertificateRegistry>();
+builder.Services.AddSingleton<RoutingMap>();
+
+//TODO: Replace with DI
+var certs = new ServerCertificateRegistry();
+
+builder.WebHost.UseKestrel(o =>
+{
+    o.AddServerHeader = false;
+    o.ConfigureHttpsDefaults(https =>
+    {
+        https.ServerCertificateSelector = (_, name) =>
+            name is not null ? certs.GetOrDefault(name) : certs.Default();
+    });
+    o.ConfigureEndpointDefaults(ep =>
+    {
+        ep.UseConnectionLogging();
+    });
+});
+
+var app = builder.Build();
+
+app.UseMiddleware<Authenticator>();
+app.UseMiddleware<Filter>();
+app.UseMiddleware<Nyangate.Middleware.Router>();
+
+app.Run();

src/Nyangate/Properties/launchSettings.json

@@ -1,37 +1,37 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:17984",
-      "sslPort": 44337
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5178",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:7056;http://localhost:5178",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:17984",
+      "sslPort": 44337
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:5178",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:7056;http://localhost:5178",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

src/Nyangate/Services/BlacklistRegistry.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Nyangate.Services;
+
+public class BlacklistRegistry
+{
+
+}

src/Nyangate/Services/RoutingMap.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Nyangate.Services;
+
+public class RoutingMap
+{
+
+}

src/Nyangate/Services/ServerCertificateRegistry.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+
+namespace Nyangate.Services;
+
+public class ServerCertificateRegistry
+{
+    private readonly Dictionary<string, X509Certificate2> _registry = new();
+    public X509Certificate2 GetOrDefault(string hostname)
+    {
+        return _registry.GetValueOrDefault(hostname, Default());
+    }
+
+    public X509Certificate2 Default()
+    {
+        throw new NotImplementedException();
+    }
+}

src/Nyangate/appsettings.Development.json

@@ -1,8 +1,8 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}

src/Nyangate/appsettings.json

@@ -1,9 +1,9 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}

test/Nyangate.Test/Nyangate.Test.csproj

@@ -1,24 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Nyangate.Lib\Nyangate.Lib.csproj" />
+    <ProjectReference Include="..\..\src\Nyangate\Nyangate.csproj" />
+    <ProjectReference Include="..\..\src\Nyangate.Cli\Nyangate.Cli.csproj" />
+  </ItemGroup>
+
+</Project>