Moonlight-Panel/Servers
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started improving server shares and general api controller structure

Browse Source
This commit is contained in:
ChiaraBm
2025-07-24 18:28:10 +02:00
parent a2db7be26f
commit 1f94752c54
29 changed files with 318 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MoonlightServers.ApiServer/Http/Controllers/Client/FilesController.cs
View File

@@ -7,6 +7,7 @@ using Moonlight.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Services;
using MoonlightServers.DaemonShared.Enums;
using MoonlightServers.Shared.Constants;
using MoonlightServers.Shared.Enums;
using MoonlightServers.Shared.Http.Requests.Client.Servers.Files;
using MoonlightServers.Shared.Http.Responses.Client.Servers.Files;
@@ -39,7 +40,7 @@ public class FilesController : Controller
[HttpGet("list")]
public async Task<ServerFilesEntryResponse[]> List([FromRoute] int serverId, [FromQuery] string path)
{
var server = await GetServerById(serverId, ServerPermissionType.Read);
var server = await GetServerById(serverId, ServerPermissionLevel.Read);
var entries = await ServerFileSystemService.List(server, path);
@@ -56,7 +57,7 @@ public class FilesController : Controller
[HttpPost("move")]
public async Task Move([FromRoute] int serverId, [FromQuery] string oldPath, [FromQuery] string newPath)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
await ServerFileSystemService.Move(server, oldPath, newPath);
}
@@ -64,7 +65,7 @@ public class FilesController : Controller
[HttpDelete("delete")]
public async Task Delete([FromRoute] int serverId, [FromQuery] string path)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
await ServerFileSystemService.Delete(server, path);
}
@@ -72,15 +73,15 @@ public class FilesController : Controller
[HttpPost("mkdir")]
public async Task Mkdir([FromRoute] int serverId, [FromQuery] string path)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
await ServerFileSystemService.Mkdir(server, path);
}
[HttpPost("touch")]
public async Task Touch([FromRoute] int serverId, [FromQuery] string path)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
await ServerFileSystemService.Mkdir(server, path);
}
@@ -88,7 +89,7 @@ public class FilesController : Controller
[HttpGet("upload")]
public async Task<ServerFilesUploadResponse> Upload([FromRoute] int serverId)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
var accessToken = NodeService.CreateAccessToken(
server.Node,
@@ -115,7 +116,7 @@ public class FilesController : Controller
[HttpGet("download")]
public async Task<ServerFilesDownloadResponse> Download([FromRoute] int serverId, [FromQuery] string path)
{
var server = await GetServerById(serverId, ServerPermissionType.Read);
var server = await GetServerById(serverId, ServerPermissionLevel.Read);
var accessToken = NodeService.CreateAccessToken(
server.Node,
@@ -143,7 +144,7 @@ public class FilesController : Controller
[HttpPost("compress")]
public async Task Compress([FromRoute] int serverId, [FromBody] ServerFilesCompressRequest request)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
if (!Enum.TryParse(request.Type, true, out CompressType type))
throw new HttpApiException("Invalid compress type provided", 400);
@@ -154,7 +155,7 @@ public class FilesController : Controller
[HttpPost("decompress")]
public async Task Decompress([FromRoute] int serverId, [FromBody] ServerFilesDecompressRequest request)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
if (!Enum.TryParse(request.Type, true, out CompressType type))
throw new HttpApiException("Invalid compress type provided", 400);
@@ -162,7 +163,7 @@ public class FilesController : Controller
await ServerFileSystemService.Decompress(server, type, request.Path, request.Destination);
}
private async Task<Server> GetServerById(int serverId, ServerPermissionType type)
private async Task<Server> GetServerById(int serverId, ServerPermissionLevel level)
{
var server = await ServerRepository
.Get()
@@ -174,7 +175,8 @@ public class FilesController : Controller
var authorizeResult = await AuthorizeService.Authorize(
User, server,
permission => permission.Name == "files" && permission.Type >= type
ServerPermissionConstants.Files,
level
);
if (!authorizeResult.Succeeded)

9
MoonlightServers.ApiServer/Http/Controllers/Client/PowerController.cs
View File

@@ -7,6 +7,7 @@ using MoonCore.Helpers;
using Moonlight.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Services;
using MoonlightServers.Shared.Constants;
using MoonlightServers.Shared.Enums;
namespace MoonlightServers.ApiServer.Http.Controllers.Client;
@@ -17,19 +18,16 @@ namespace MoonlightServers.ApiServer.Http.Controllers.Client;
public class PowerController : Controller
{
private readonly DatabaseRepository<Server> ServerRepository;
private readonly DatabaseRepository<User> UserRepository;
private readonly ServerService ServerService;
private readonly ServerAuthorizeService AuthorizeService;
public PowerController(
DatabaseRepository<Server> serverRepository,
DatabaseRepository<User> userRepository,
ServerService serverService,
ServerAuthorizeService authorizeService
)
{
ServerRepository = serverRepository;
UserRepository = userRepository;
ServerService = serverService;
AuthorizeService = authorizeService;
}
@@ -70,7 +68,8 @@ public class PowerController : Controller
var authorizeResult = await AuthorizeService.Authorize(
User, server,
permission => permission.Name == "power" && permission.Type >= ServerPermissionType.ReadWrite
ServerPermissionConstants.Power,
ServerPermissionLevel.ReadWrite
);
if (!authorizeResult.Succeeded)
@@ -80,7 +79,7 @@ public class PowerController : Controller
403
);
}
return server;
}
}

50
MoonlightServers.ApiServer/Http/Controllers/Client/ServersController.cs
View File

@@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using System.Security.Claims;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -10,6 +11,7 @@ using MoonlightServers.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Extensions;
using MoonlightServers.ApiServer.Models;
using MoonlightServers.ApiServer.Services;
using MoonlightServers.Shared.Constants;
using MoonlightServers.Shared.Enums;
using MoonlightServers.Shared.Http.Requests.Client.Servers;
using MoonlightServers.Shared.Http.Responses.Client.Servers;
@@ -48,7 +50,10 @@ public class ServersController : Controller
}
[HttpGet]
public async Task<PagedData<ServerDetailResponse>> GetAll([FromQuery] int page, [FromQuery] int pageSize)
public async Task<PagedData<ServerDetailResponse>> GetAll(
[FromQuery] [Range(0, int.MaxValue)] int page,
[FromQuery] [Range(0, 100)] int pageSize
)
{
var userIdClaim = User.FindFirstValue("userId");
@@ -95,7 +100,10 @@ public class ServersController : Controller
}
[HttpGet("shared")]
public async Task<PagedData<ServerDetailResponse>> GetAllShared([FromQuery] int page, [FromQuery] int pageSize)
public async Task<PagedData<ServerDetailResponse>> GetAllShared(
[FromQuery] [Range(0, int.MaxValue)] int page,
[FromQuery] [Range(0, 100)] int pageSize
)
{
var userIdClaim = User.FindFirstValue("userId");
@@ -145,7 +153,7 @@ public class ServersController : Controller
Share = new()
{
SharedBy = owners.First(y => y.Id == x.Server.OwnerId).Username,
Permissions = x.Content.Permissions.ToArray()
Permissions = x.Content.Permissions
}
}).ToArray();
@@ -172,7 +180,12 @@ public class ServersController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
var authorizationResult = await AuthorizeService.Authorize(User, server);
var authorizationResult = await AuthorizeService.Authorize(
User,
server,
String.Empty,
ServerPermissionLevel.None
);
if (!authorizationResult.Succeeded)
{
@@ -210,7 +223,7 @@ public class ServersController : Controller
response.Share = new()
{
SharedBy = owner.Username,
Permissions = authorizationResult.Share.Content.Permissions.ToArray()
Permissions = authorizationResult.Share.Content.Permissions
};
}
@@ -220,7 +233,11 @@ public class ServersController : Controller
[HttpGet("{serverId:int}/status")]
public async Task<ServerStatusResponse> GetStatus([FromRoute] int serverId)
{
var server = await GetServerById(serverId);
var server = await GetServerById(
serverId,
ServerPermissionConstants.Console,
ServerPermissionLevel.None
);
var status = await ServerService.GetStatus(server);
@@ -235,7 +252,8 @@ public class ServersController : Controller
{
var server = await GetServerById(
serverId,
permission => permission is { Name: "console", Type: >= ServerPermissionType.Read }
ServerPermissionConstants.Console,
ServerPermissionLevel.Read
);
// TODO: Handle transparent node proxy
@@ -263,7 +281,8 @@ public class ServersController : Controller
{
var server = await GetServerById(
serverId,
permission => permission is { Name: "console", Type: >= ServerPermissionType.Read }
ServerPermissionConstants.Console,
ServerPermissionLevel.Read
);
var logs = await ServerService.GetLogs(server);
@@ -278,7 +297,9 @@ public class ServersController : Controller
public async Task<ServerStatsResponse> GetStats([FromRoute] int serverId)
{
var server = await GetServerById(
serverId
serverId,
ServerPermissionConstants.Console,
ServerPermissionLevel.Read
);
var stats = await ServerService.GetStats(server);
@@ -295,17 +316,18 @@ public class ServersController : Controller
}
[HttpPost("{serverId:int}/command")]
public async Task RunCommand([FromRoute] int serverId, [FromBody] ServerCommandRequest request)
public async Task Command([FromRoute] int serverId, [FromBody] ServerCommandRequest request)
{
var server = await GetServerById(
serverId,
permission => permission is { Name: "console", Type: >= ServerPermissionType.ReadWrite }
ServerPermissionConstants.Console,
ServerPermissionLevel.ReadWrite
);
await ServerService.RunCommand(server, request.Command);
}
private async Task<Server> GetServerById(int serverId, Func<ServerSharePermission, bool>? filter = null)
private async Task<Server> GetServerById(int serverId, string permissionId, ServerPermissionLevel level)
{
var server = await ServerRepository
.Get()
@@ -315,7 +337,7 @@ public class ServersController : Controller
if (server == null)
throw new HttpApiException("No server with this id found", 404);
var authorizeResult = await AuthorizeService.Authorize(User, server, filter);
var authorizeResult = await AuthorizeService.Authorize(User, server, permissionId, level);
if (!authorizeResult.Succeeded)
{

4
MoonlightServers.ApiServer/Http/Controllers/Client/SettingsController.cs
View File

@@ -5,6 +5,7 @@ using MoonCore.Exceptions;
using MoonCore.Extended.Abstractions;
using MoonlightServers.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Services;
using MoonlightServers.Shared.Constants;
using MoonlightServers.Shared.Enums;
namespace MoonlightServers.ApiServer.Http.Controllers.Client;
@@ -49,7 +50,8 @@ public class SettingsController : Controller
var authorizeResult = await AuthorizeService.Authorize(
User, server,
permission => permission is { Name: "settings", Type: >= ServerPermissionType.ReadWrite }
ServerPermissionConstants.Settings,
ServerPermissionLevel.ReadWrite
);
if (!authorizeResult.Succeeded)

25
MoonlightServers.ApiServer/Http/Controllers/Client/SharesController.cs
View File

@@ -8,6 +8,7 @@ using MoonCore.Models;
using Moonlight.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Services;
using MoonlightServers.Shared.Constants;
using MoonlightServers.Shared.Enums;
using MoonlightServers.Shared.Http.Requests.Client.Servers.Shares;
using MoonlightServers.Shared.Http.Responses.Client.Servers.Shares;
@@ -16,7 +17,7 @@ namespace MoonlightServers.ApiServer.Http.Controllers.Client;
[Authorize]
[ApiController]
[Route("api/client/servers")]
[Route("api/client/servers/{serverId:int}/shares")]
public class SharesController : Controller
{
private readonly DatabaseRepository<Server> ServerRepository;
@@ -37,7 +38,7 @@ public class SharesController : Controller
AuthorizeService = authorizeService;
}
[HttpGet("{serverId:int}/shares")]
[HttpGet]
public async Task<PagedData<ServerShareResponse>> GetAll(
[FromRoute] int serverId,
[FromQuery] [Range(0, int.MaxValue)] int page,
@@ -67,7 +68,7 @@ public class SharesController : Controller
{
Id = x.Id,
Username = users.First(y => y.Id == x.UserId).Username,
Permissions = x.Content.Permissions.ToArray()
Permissions = x.Content.Permissions
}).ToArray();
return new PagedData<ServerShareResponse>()
@@ -80,7 +81,7 @@ public class SharesController : Controller
};
}
[HttpGet("{serverId:int}/shares/{id:int}")]
[HttpGet("{id:int}")]
public async Task<ServerShareResponse> Get(
[FromRoute] int serverId,
[FromRoute] int id
@@ -103,13 +104,13 @@ public class SharesController : Controller
{
Id = share.Id,
Username = user.Username,
Permissions = share.Content.Permissions.ToArray()
Permissions = share.Content.Permissions
};
return mappedItem;
}
[HttpPost("{serverId:int}/shares")]
[HttpPost("")]
public async Task<ServerShareResponse> Create(
[FromRoute] int serverId,
[FromBody] CreateShareRequest request
@@ -142,13 +143,13 @@ public class SharesController : Controller
{
Id = finalShare.Id,
Username = user.Username,
Permissions = finalShare.Content.Permissions.ToArray()
Permissions = finalShare.Content.Permissions
};
return mappedItem;
}
[HttpPatch("{serverId:int}/shares/{id:int}")]
[HttpPatch("{id:int}")]
public async Task<ServerShareResponse> Update(
[FromRoute] int serverId,
[FromRoute] int id,
@@ -180,13 +181,13 @@ public class SharesController : Controller
{
Id = share.Id,
Username = user.Username,
Permissions = share.Content.Permissions.ToArray()
Permissions = share.Content.Permissions
};
return mappedItem;
}
[HttpDelete("{serverId:int}/shares/{id:int}")]
[HttpDelete("{id:int}")]
public async Task Delete(
[FromRoute] int serverId,
[FromRoute] int id
@@ -208,7 +209,6 @@ public class SharesController : Controller
{
var server = await ServerRepository
.Get()
.Include(x => x.Node)
.FirstOrDefaultAsync(x => x.Id == serverId);
if (server == null)
@@ -216,7 +216,8 @@ public class SharesController : Controller
var authorizeResult = await AuthorizeService.Authorize(
User, server,
permission => permission is { Name: "shares", Type: >= ServerPermissionType.ReadWrite }
ServerPermissionConstants.Shares,
ServerPermissionLevel.ReadWrite
);
if (!authorizeResult.Succeeded)

72
MoonlightServers.ApiServer/Http/Controllers/Client/VariablesController.cs
View File

@@ -1,42 +1,76 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using MoonCore.Exceptions;
using MoonCore.Extended.Abstractions;
using MoonCore.Models;
using Moonlight.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Database.Entities;
using MoonlightServers.ApiServer.Services;
using MoonlightServers.Shared.Constants;
using MoonlightServers.Shared.Enums;
using MoonlightServers.Shared.Http.Requests.Client.Servers.Variables;
using MoonlightServers.Shared.Http.Responses.Client.Servers.Shares;
using MoonlightServers.Shared.Http.Responses.Client.Servers.Variables;
namespace MoonlightServers.ApiServer.Http.Controllers.Client;
[Authorize]
[ApiController]
[Route("api/client/servers")]
[Route("api/client/servers/{serverId:int}/variables")]
public class VariablesController : Controller
{
private readonly DatabaseRepository<Server> ServerRepository;
private readonly DatabaseRepository<ServerVariable> ServerVariableRepository;
private readonly DatabaseRepository<StarVariable> StarVariableRepository;
private readonly ServerAuthorizeService AuthorizeService;
public VariablesController(
DatabaseRepository<Server> serverRepository,
ServerAuthorizeService authorizeService
ServerAuthorizeService authorizeService,
DatabaseRepository<ServerVariable> serverVariableRepository,
DatabaseRepository<StarVariable> starVariableRepository
)
{
ServerRepository = serverRepository;
AuthorizeService = authorizeService;
ServerVariableRepository = serverVariableRepository;
StarVariableRepository = starVariableRepository;
}
[HttpGet("{serverId:int}/variables")]
public async Task<ServerVariableDetailResponse[]> Get([FromRoute] int serverId)
[HttpGet]
public async Task<PagedData<ServerVariableDetailResponse>> Get(
[FromRoute] int serverId,
[FromQuery] [Range(0, int.MaxValue)] int page,
[FromQuery] [Range(1, 100)] int pageSize
)
{
var server = await GetServerById(serverId, ServerPermissionType.Read);
var server = await GetServerById(serverId, ServerPermissionLevel.Read);
return server.Star.Variables.Select(starVariable =>
var query = StarVariableRepository
.Get()
.Where(x => x.Star.Id == server.Star.Id);
var count = await query.CountAsync();
var starVariables = await query
.Skip(page * pageSize)
.Take(pageSize)
.ToArrayAsync();
var starVariableKeys = starVariables
.Select(x => x.Key)
.ToArray();
var serverVariables = await ServerVariableRepository
.Get()
.Where(x => x.Server.Id == server.Id && starVariableKeys.Contains(x.Key))
.ToArrayAsync();
var responses = starVariables.Select(starVariable =>
{
var serverVariable = server.Variables.First(x => x.Key == starVariable.Key);
var serverVariable = serverVariables.First(x => x.Key == starVariable.Key);
return new ServerVariableDetailResponse()
{
@@ -48,9 +82,18 @@ public class VariablesController : Controller
Filter = starVariable.Filter
};
}).ToArray();
return new PagedData<ServerVariableDetailResponse>()
{
Items = responses,
CurrentPage = page,
PageSize = pageSize,
TotalItems = count,
TotalPages = count == 0 ? 0 : count / pageSize
};
}
[HttpPut("{serverId:int}/variables")]
[HttpPut("")]
public async Task<ServerVariableDetailResponse> UpdateSingle(
[FromRoute] int serverId,
[FromBody] UpdateServerVariableRequest request
@@ -58,7 +101,7 @@ public class VariablesController : Controller
{
// TODO: Handle filter
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
var serverVariable = server.Variables.FirstOrDefault(x => x.Key == request.Key);
var starVariable = server.Star.Variables.FirstOrDefault(x => x.Key == request.Key);
@@ -80,13 +123,13 @@ public class VariablesController : Controller
};
}
[HttpPatch("{serverId:int}/variables")]
[HttpPatch("")]
public async Task<ServerVariableDetailResponse[]> Update(
[FromRoute] int serverId,
[FromBody] UpdateServerVariableRangeRequest request
)
{
var server = await GetServerById(serverId, ServerPermissionType.ReadWrite);
var server = await GetServerById(serverId, ServerPermissionLevel.ReadWrite);
foreach (var variable in request.Variables)
{
@@ -120,13 +163,11 @@ public class VariablesController : Controller
}).ToArray();
}
private async Task<Server> GetServerById(int serverId, ServerPermissionType type)
private async Task<Server> GetServerById(int serverId, ServerPermissionLevel level)
{
var server = await ServerRepository
.Get()
.Include(x => x.Variables)
.Include(x => x.Star)
.ThenInclude(x => x.Variables)
.FirstOrDefaultAsync(x => x.Id == serverId);
if (server == null)
@@ -134,7 +175,8 @@ public class VariablesController : Controller
var authorizeResult = await AuthorizeService.Authorize(
User, server,
permission => permission.Name == "variables" && permission.Type >= type
ServerPermissionConstants.Variables,
level
);
if (!authorizeResult.Succeeded)