t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add nginx ssi support for client file transfers as well why not

Browse Source
This commit is contained in:
Loporrit
2024-09-13 16:43:44 +00:00
parent 49695b4403
commit 61821c0775
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronosServer/MareSynchronosShared/Utils/StaticFilesServerConfiguration.cs
View File

@@ -34,6 +34,8 @@ public class StaticFilesServerConfiguration : MareConfigurationBase
public bool UseXAccelRedirect { get; set; } = false; public bool UseXAccelRedirect { get; set; } = false;
public string XAccelRedirectPrefix { get; set; } = "/_internal/mare-files/"; public string XAccelRedirectPrefix { get; set; } = "/_internal/mare-files/";
public bool UseSSI { get; set; } = false;
public string SSIContentType { get; set; } = "application/x-block-file-list";
public override string ToString() public override string ToString()
{ {

33
MareSynchronosServer/MareSynchronosStaticFilesServer/Utils/RequestBlockFileListResult.cs
View File

@@ -1,4 +1,5 @@
using MareSynchronosShared.Metrics; using MareSynchronosShared.Metrics;
using MareSynchronosShared.Services;
using MareSynchronosStaticFilesServer.Services; using MareSynchronosStaticFilesServer.Services;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Globalization; using System.Globalization;
@@ -12,14 +13,17 @@ public class RequestBlockFileListResult : IActionResult
private readonly RequestQueueService _requestQueueService; private readonly RequestQueueService _requestQueueService;
private readonly MareMetrics _mareMetrics; private readonly MareMetrics _mareMetrics;
private readonly IEnumerable<FileInfo> _fileList; private readonly IEnumerable<FileInfo> _fileList;
private readonly IConfigurationService<StaticFilesServerConfiguration> _configurationService;
public RequestBlockFileListResult(Guid requestId, RequestQueueService requestQueueService, MareMetrics mareMetrics, IEnumerable<FileInfo> fileList) public RequestBlockFileListResult(Guid requestId, RequestQueueService requestQueueService, MareMetrics mareMetrics, IEnumerable<FileInfo> fileList,
IConfigurationService<StaticFilesServerConfiguration> configurationService)
{ {
_requestId = requestId; _requestId = requestId;
_requestQueueService = requestQueueService; _requestQueueService = requestQueueService;
_mareMetrics = mareMetrics; _mareMetrics = mareMetrics;
_mareMetrics.IncGauge(MetricsAPI.GaugeCurrentDownloads); _mareMetrics.IncGauge(MetricsAPI.GaugeCurrentDownloads);
_fileList = fileList; _fileList = fileList;
_configurationService = configurationService;
} }
public async Task ExecuteResultAsync(ActionContext context) public async Task ExecuteResultAsync(ActionContext context)
@@ -28,13 +32,34 @@ public class RequestBlockFileListResult : IActionResult
{ {
ArgumentNullException.ThrowIfNull(context); ArgumentNullException.ThrowIfNull(context);
var useSSI = _configurationService.GetValueOrDefault(nameof(StaticFilesServerConfiguration.UseSSI), false);
context.HttpContext.Response.StatusCode = 200; context.HttpContext.Response.StatusCode = 200;
context.HttpContext.Response.ContentType = "application/octet-stream";
if (useSSI)
context.HttpContext.Response.ContentType = _configurationService.GetValue<string>(nameof(StaticFilesServerConfiguration.SSIContentType));
else
context.HttpContext.Response.ContentType = "application/octet-stream";
string ssiFilePrefix = null;
if (useSSI)
ssiFilePrefix = _configurationService.GetValue<string>(nameof(StaticFilesServerConfiguration.XAccelRedirectPrefix));
foreach (var file in _fileList) foreach (var file in _fileList)
{ {
await context.HttpContext.Response.WriteAsync("#" + file.Name + ":" + file.Length.ToString(CultureInfo.InvariantCulture) + "#", Encoding.ASCII); if (useSSI)
await context.HttpContext.Response.SendFileAsync(file.FullName); {
var internalName = Path.Combine(ssiFilePrefix, file.Name);
await context.HttpContext.Response.WriteAsync(
"#" + file.Name + ":" + file.Length.ToString(CultureInfo.InvariantCulture) + "#"
+ "<!--#include file=\"" + internalName + "\" -->", Encoding.ASCII);
}
else
{
await context.HttpContext.Response.WriteAsync("#" + file.Name + ":" + file.Length.ToString(CultureInfo.InvariantCulture) + "#", Encoding.ASCII);
await context.HttpContext.Response.SendFileAsync(file.FullName);
}
} }
} }
catch catch

2
MareSynchronosServer/MareSynchronosStaticFilesServer/Utils/RequestBlockFileListResultFactory.cs
View File

@@ -19,6 +19,6 @@ public class RequestBlockFileListResultFactory
public RequestBlockFileListResult Create(Guid requestId, IEnumerable<FileInfo> fileList) public RequestBlockFileListResult Create(Guid requestId, IEnumerable<FileInfo> fileList)
{ {
return new RequestBlockFileListResult(requestId, _requestQueueService, _metrics, fileList); return new RequestBlockFileListResult(requestId, _requestQueueService, _metrics, fileList, _configurationService);
} }
} }