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

refactor server auth on files server, add checking request queue

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-18 10:20:24 +01:00
parent 20d8970a15
commit 9b4e298b66
6 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/CacheController.cs
View File

@@ -14,7 +14,7 @@ public class CacheController : ControllerBase
private readonly RequestQueueService _requestQueue;
public CacheController(ILogger<CacheController> logger, RequestFileStreamResultFactory requestFileStreamResultFactory,
CachedFileProvider cachedFileProvider, RequestQueueService requestQueue, ServerTokenGenerator generator) : base(logger, generator)
CachedFileProvider cachedFileProvider, RequestQueueService requestQueue) : base(logger)
{
_requestFileStreamResultFactory = requestFileStreamResultFactory;
_cachedFileProvider = cachedFileProvider;
@@ -30,7 +30,7 @@ public class CacheController : ControllerBase
_requestQueue.ActivateRequest(requestId);
var fs = await _cachedFileProvider.GetAndDownloadFileStream(request.FileId, Authorization);
var fs = await _cachedFileProvider.GetAndDownloadFileStream(request.FileId);
if (fs == null)
{
_requestQueue.FinishRequest(requestId);

5
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ControllerBase.cs
View File

@@ -6,14 +6,11 @@ namespace MareSynchronosStaticFilesServer.Controllers;
public class ControllerBase : Controller
{
protected ILogger _logger;
private readonly ServerTokenGenerator _generator;
public ControllerBase(ILogger logger, ServerTokenGenerator generator)
public ControllerBase(ILogger logger)
{
_logger = logger;
_generator = generator;
}
protected string MareUser => HttpContext.User.Claims.First(f => string.Equals(f.Type, MareClaimTypes.Uid, StringComparison.Ordinal)).Value;
protected string Authorization => _generator.Token;
}

29
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs
View File

@@ -10,10 +10,9 @@ public class RequestController : ControllerBase
{
private readonly CachedFileProvider _cachedFileProvider;
private readonly RequestQueueService _requestQueue;
private static SemaphoreSlim _parallelRequestSemaphore = new(500);
private static readonly SemaphoreSlim _parallelRequestSemaphore = new(500);
public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue,
ServerTokenGenerator generator) : base(logger, generator)
public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue) : base(logger)
{
_cachedFileProvider = cachedFileProvider;
_requestQueue = requestQueue;
@@ -46,7 +45,7 @@ public class RequestController : ControllerBase
foreach (var file in files)
{
_logger.LogDebug("Prerequested file: " + file);
_cachedFileProvider.DownloadFileWhenRequired(file, Authorization);
_cachedFileProvider.DownloadFileWhenRequired(file);
}
return Ok();
@@ -66,7 +65,7 @@ public class RequestController : ControllerBase
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
Guid g = Guid.NewGuid();
_cachedFileProvider.DownloadFileWhenRequired(file, Authorization);
_cachedFileProvider.DownloadFileWhenRequired(file);
await _requestQueue.EnqueueUser(new(g, MareUser, file));
return Ok(g);
}
@@ -76,4 +75,22 @@ public class RequestController : ControllerBase
_parallelRequestSemaphore.Release();
}
}
}
[HttpGet]
[Route(MareFiles.Request_Check)]
public async Task<IActionResult> CheckQueueAsync(Guid requestId)
{
try
{
await _parallelRequestSemaphore.WaitAsync(HttpContext.RequestAborted);
if (_requestQueue.StillEnqueued(requestId, MareUser))
return Ok();
return BadRequest();
}
catch (OperationCanceledException) { return BadRequest(); }
finally
{
_parallelRequestSemaphore.Release();
}
}
}

2
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ServerFilesController.cs
View File

@@ -11,7 +11,7 @@ public class ServerFilesController : ControllerBase
{
private readonly CachedFileProvider _cachedFileProvider;
public ServerFilesController(ILogger<ServerFilesController> logger, CachedFileProvider cachedFileProvider, ServerTokenGenerator generator) : base(logger, generator)
public ServerFilesController(ILogger<ServerFilesController> logger, CachedFileProvider cachedFileProvider) : base(logger)
{
_cachedFileProvider = cachedFileProvider;
}