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

fixes for server auth

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-11 14:31:33 +01:00
parent 617bc6afc8
commit c1f329c233
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,5 +15,5 @@ public class ControllerBase : Controller
} }
protected string MareUser => HttpContext.User.Claims.First(f => string.Equals(f.Type, MareClaimTypes.Uid, StringComparison.Ordinal)).Value; protected string MareUser => HttpContext.User.Claims.First(f => string.Equals(f.Type, MareClaimTypes.Uid, StringComparison.Ordinal)).Value;
protected string Authorization => "Bearer " + _generator.Token; protected string Authorization => _generator.Token;
} }

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

@@ -12,7 +12,7 @@ public class RequestController : ControllerBase
private readonly CachedFileProvider _cachedFileProvider; private readonly CachedFileProvider _cachedFileProvider;
private readonly RequestQueueService _requestQueue; private readonly RequestQueueService _requestQueue;
public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue, public RequestController(ILogger<RequestController> logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue,
ServerTokenGenerator generator) : base(logger, generator) ServerTokenGenerator generator) : base(logger, generator)
{ {
_cachedFileProvider = cachedFileProvider; _cachedFileProvider = cachedFileProvider;
@@ -25,6 +25,7 @@ public class RequestController : ControllerBase
{ {
foreach (var file in files) foreach (var file in files)
{ {
_logger.LogDebug("Prerequested file: " + file);
_cachedFileProvider.DownloadFileWhenRequired(file, Authorization); _cachedFileProvider.DownloadFileWhenRequired(file, Authorization);
} }

2
MareSynchronosServer/MareSynchronosStaticFilesServer/Services/CachedFileProvider.cs
View File

@@ -35,7 +35,7 @@ public class CachedFileProvider
_logger.LogInformation("Did not find {hash}, downloading from {server}", hash, downloadUrl); _logger.LogInformation("Did not find {hash}, downloading from {server}", hash, downloadUrl);
using var requestMessage = new HttpRequestMessage(HttpMethod.Get, downloadUrl); using var requestMessage = new HttpRequestMessage(HttpMethod.Get, downloadUrl);
requestMessage.Headers.Authorization = new AuthenticationHeaderValue(auth); requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", auth);
var response = await _httpClient.SendAsync(requestMessage).ConfigureAwait(false); var response = await _httpClient.SendAsync(requestMessage).ConfigureAwait(false);
try try