Added authentication for the node against the api server. Cleaned up routes

MoonlightServers.ApiServer/Database/Entities/Node.cs

@@ -14,6 +14,7 @@ public class Node
     // Connection details
     public string Fqdn { get; set; }
     public string Token { get; set; }
+    public string TokenId { get; set; }
     public int HttpPort { get; set; }
     public int FtpPort { get; set; }
     public bool UseSsl { get; set; }

MoonlightServers.ApiServer/Database/Migrations/20250301142415_AddedTokenIdField.Designer.cs

@@ -0,0 +1,456 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using MoonlightServers.ApiServer.Database;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace MoonlightServers.ApiServer.Database.Migrations
+{
+    [DbContext(typeof(ServersDataContext))]
+    [Migration("20250301142415_AddedTokenIdField")]
+    partial class AddedTokenIdField
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.11")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Allocation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("IpAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("NodeId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NodeId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("Servers_Allocations", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Node", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("EnableDynamicFirewall")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("EnableTransparentMode")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Fqdn")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("FtpPort")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("HttpPort")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TokenId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("UseSsl")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Servers_Nodes", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Bandwidth")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Cpu")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Disk")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("DockerImageIndex")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Memory")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("NodeId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("OwnerId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("StarId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("StartupOverride")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("UseVirtualDisk")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NodeId");
+
+                    b.HasIndex("StarId");
+
+                    b.ToTable("Servers_Servers", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.ServerBackup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("Completed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("CompletedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("Size")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Successful")
+                        .HasColumnType("boolean");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("Servers_ServerBackups", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.ServerVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("Servers_ServerVariables", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Star", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AllowDockerImageChange")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("DefaultDockerImage")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("DonateUrl")
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallDockerImage")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallScript")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InstallShell")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OnlineDetection")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ParseConfiguration")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RequiredAllocations")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("StartupCommand")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("StopCommand")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("UpdateUrl")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Servers_Stars", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.StarDockerImage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AutoPulling")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Identifier")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("StarId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StarId");
+
+                    b.ToTable("Servers_StarDockerImages", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.StarVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("AllowEditing")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("AllowViewing")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("DefaultValue")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Filter")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("StarId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StarId");
+
+                    b.ToTable("Servers_StarVariables", (string)null);
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Allocation", b =>
+                {
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Node", "Node")
+                        .WithMany("Allocations")
+                        .HasForeignKey("NodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Server", "Server")
+                        .WithMany("Allocations")
+                        .HasForeignKey("ServerId");
+
+                    b.Navigation("Node");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Server", b =>
+                {
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Node", "Node")
+                        .WithMany("Servers")
+                        .HasForeignKey("NodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Star", "Star")
+                        .WithMany()
+                        .HasForeignKey("StarId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Node");
+
+                    b.Navigation("Star");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.ServerBackup", b =>
+                {
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Server", null)
+                        .WithMany("Backups")
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.ServerVariable", b =>
+                {
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Server", "Server")
+                        .WithMany("Variables")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.StarDockerImage", b =>
+                {
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Star", "Star")
+                        .WithMany("DockerImages")
+                        .HasForeignKey("StarId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Star");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.StarVariable", b =>
+                {
+                    b.HasOne("MoonlightServers.ApiServer.Database.Entities.Star", "Star")
+                        .WithMany("Variables")
+                        .HasForeignKey("StarId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Star");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Node", b =>
+                {
+                    b.Navigation("Allocations");
+
+                    b.Navigation("Servers");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Server", b =>
+                {
+                    b.Navigation("Allocations");
+
+                    b.Navigation("Backups");
+
+                    b.Navigation("Variables");
+                });
+
+            modelBuilder.Entity("MoonlightServers.ApiServer.Database.Entities.Star", b =>
+                {
+                    b.Navigation("DockerImages");
+
+                    b.Navigation("Variables");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

MoonlightServers.ApiServer/Database/Migrations/20250301142415_AddedTokenIdField.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace MoonlightServers.ApiServer.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedTokenIdField : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "TokenId",
+                table: "Servers_Nodes",
+                type: "text",
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "TokenId",
+                table: "Servers_Nodes");
+        }
+    }
+}

MoonlightServers.ApiServer/Database/Migrations/ServersDataContextModelSnapshot.cs

@@ -84,6 +84,10 @@ namespace MoonlightServers.ApiServer.Database.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<string>("TokenId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
                     b.Property<bool>("UseSsl")
                         .HasColumnType("boolean");
 

MoonlightServers.ApiServer/Http/Controllers/Admin/Nodes/NodesController.cs

@@ -49,6 +49,7 @@ public class NodesController : Controller
         var node = Mapper.Map<Node>(request);
 
         node.Token = Formatter.GenerateString(32);
+        node.TokenId = Formatter.GenerateString(6);
 
         var finalNode = await NodeRepository.Add(node);
 

MoonlightServers.ApiServer/Http/Controllers/Remote/Nodes/NodeTripController.cs

@@ -1,9 +1,11 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace MoonlightServers.ApiServer.Http.Controllers.Remote.Node;
+namespace MoonlightServers.ApiServer.Http.Controllers.Remote.Nodes;
 
 [ApiController]
-[Route("api/servers/remote/node")]
+[Route("api/remote/server/node")]
+[Authorize(AuthenticationSchemes = "serverNodeAuthentication")]
 public class NodeTripController : Controller
 {
     [HttpGet("trip")]

MoonlightServers.ApiServer/Http/Controllers/Remote/ServersController.cs

@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using MoonCore.Exceptions;
@@ -6,35 +7,45 @@ using MoonCore.Models;
 using MoonlightServers.ApiServer.Database.Entities;
 using MoonlightServers.DaemonShared.PanelSide.Http.Responses;
 
-namespace MoonlightServers.ApiServer.Http.Controllers.Remote.Servers;
+namespace MoonlightServers.ApiServer.Http.Controllers.Remote;
 
 [ApiController]
-[Route("api/servers/remote/servers")]
-public class RemoteServersController : Controller
+[Route("api/remote/servers")]
+[Authorize(AuthenticationSchemes = "serverNodeAuthentication")]
+public class ServersController : Controller
 {
     private readonly DatabaseRepository<Server> ServerRepository;
-    private readonly ILogger<RemoteServersController> Logger;
+    private readonly DatabaseRepository<Node> NodeRepository;
+    private readonly ILogger<ServersController> Logger;
 
-    public RemoteServersController(
+    public ServersController(
         DatabaseRepository<Server> serverRepository,
-        ILogger<RemoteServersController> logger
-    )
+        DatabaseRepository<Node> nodeRepository,
+        ILogger<ServersController> logger)
     {
         ServerRepository = serverRepository;
+        NodeRepository = nodeRepository;
         Logger = logger;
     }
 
     [HttpGet]
     public async Task<PagedData<ServerDataResponse>> Get([FromQuery] int page, [FromQuery] int pageSize)
     {
+        // Load the node via the token id
+        var tokenId = User.Claims.First(x => x.Type == "iss").Value;
+
+        var node = await NodeRepository
+            .Get()
+            .FirstAsync(x => x.TokenId == tokenId);
+        
         var total = await ServerRepository
             .Get()
-            .Where(x => x.Node.Id == 1)
+            .Where(x => x.Node.Id == node.Id)
             .CountAsync();
 
         var servers = await ServerRepository
             .Get()
-            .Where(x => x.Node.Id == 1)
+            .Where(x => x.Node.Id == node.Id)
             .Include(x => x.Star)
             .ThenInclude(x => x.DockerImages)
             .Include(x => x.Variables)
@@ -48,12 +59,14 @@ public class RemoteServersController : Controller
         foreach (var server in servers)
         {
             var dockerImage = server.Star.DockerImages
-                .FirstOrDefault(x => x.Id == server.DockerImageIndex);
+                .Skip(server.DockerImageIndex)
+                .FirstOrDefault();
 
             if (dockerImage == null)
             {
                 dockerImage = server.Star.DockerImages
-                    .FirstOrDefault(x => x.Id == server.Star.DefaultDockerImage);
+                    .Skip(server.Star.DefaultDockerImage)
+                    .FirstOrDefault();
             }
 
             if (dockerImage == null)
@@ -101,8 +114,18 @@ public class RemoteServersController : Controller
     [HttpGet("{id:int}/install")]
     public async Task<ServerInstallDataResponse> GetInstall([FromRoute] int id)
     {
+        // Load the node via the token id
+        var tokenId = User.Claims.First(x => x.Type == "iss").Value;
+
+        var node = await NodeRepository
+            .Get()
+            .FirstAsync(x => x.TokenId == tokenId);
+        
+        // Load the server with the star data attached. We filter by the node to ensure the node can only access
+        // servers linked to it
         var server = await ServerRepository
             .Get()
+            .Where(x => x.Node.Id == node.Id)
             .Include(x => x.Star)
             .FirstOrDefaultAsync(x => x.Id == id);
 

MoonlightServers.ApiServer/Implementations/NodeJwtBearerOptions.cs

@@ -0,0 +1,56 @@
+using System.Text;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.Options;
+using Microsoft.IdentityModel.Tokens;
+using MoonCore.Extended.Abstractions;
+using MoonlightServers.ApiServer.Database.Entities;
+
+namespace MoonlightServers.ApiServer.Implementations;
+
+public class NodeJwtBearerOptions : IConfigureNamedOptions<JwtBearerOptions>
+{
+    private readonly IServiceProvider ServiceProvider;
+
+    public NodeJwtBearerOptions(IServiceProvider serviceProvider)
+    {
+        ServiceProvider = serviceProvider;
+    }
+
+    public void Configure(JwtBearerOptions options)
+    {
+    }
+
+    public void Configure(string? name, JwtBearerOptions options)
+    {
+        // Dont configure any other scheme
+        if (name != "serverNodeAuthentication")
+            return;
+
+        options.TokenValidationParameters.IssuerSigningKeyResolver = (_, _, kid, _) =>
+        {
+            if (string.IsNullOrEmpty(kid))
+                return [];
+
+            if (kid.Length != 6)
+                return [];
+
+            using var scope = ServiceProvider.CreateScope();
+
+            var nodeRepo = scope.ServiceProvider.GetRequiredService<DatabaseRepository<Node>>();
+
+            var node = nodeRepo
+                .Get()
+                .FirstOrDefault(x => x.TokenId == kid);
+
+            if (node == null)
+                return [];
+
+            return
+            [
+                new SymmetricSecurityKey(
+                    Encoding.UTF8.GetBytes(node.Token)
+                )
+            ];
+        };
+    }
+}

MoonlightServers.ApiServer/MoonlightServers.ApiServer.csproj

@@ -23,7 +23,6 @@
         <Folder Include="Database\Migrations\"/>
         <Folder Include="Helpers\"/>
         <Folder Include="Http\Middleware\"/>
-        <Folder Include="Implementations\"/>
         <Folder Include="Interfaces\"/>
     </ItemGroup>
 

MoonlightServers.ApiServer/Startup/PluginStartup.cs

@@ -1,6 +1,9 @@
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.Options;
 using MoonCore.Extensions;
 using Moonlight.ApiServer.Interfaces.Startup;
 using MoonlightServers.ApiServer.Database;
+using MoonlightServers.ApiServer.Implementations;
 
 namespace MoonlightServers.ApiServer.Startup;
 
@@ -13,6 +16,24 @@ public class PluginStartup : IPluginStartup
 
         builder.Services.AddDbContext<ServersDataContext>();
         
+        // Configure authentication for the remote endpoints
+        builder.Services
+            .AddAuthentication()
+            .AddJwtBearer("serverNodeAuthentication", options =>
+            {
+                options.TokenValidationParameters = new()
+                {
+                    ClockSkew = TimeSpan.Zero,
+                    ValidateIssuer = false,
+                    ValidateActor = false,
+                    ValidateLifetime = true,
+                    ValidateAudience = false,
+                    ValidateIssuerSigningKey = true
+                };
+            });
+
+        builder.Services.AddSingleton<IConfigureOptions<JwtBearerOptions>, NodeJwtBearerOptions>();
+        
         return Task.CompletedTask;
     }