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

fix claims and logging in files controller

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-07 01:57:16 +01:00
parent 74b7fcdf89
commit d328056b9b
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MareSynchronosServer/MareSynchronosServer/Controllers/JwtController.cs
View File

@@ -1,6 +1,5 @@
using MareSynchronos.API; using MareSynchronos.API;
using MareSynchronosServer.Authentication; using MareSynchronosServer.Authentication;
using MareSynchronosServer.Hubs;
using MareSynchronosServer.Services; using MareSynchronosServer.Services;
using MareSynchronosShared; using MareSynchronosShared;
using MareSynchronosShared.Data; using MareSynchronosShared.Data;

1
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
View File

@@ -1,6 +1,7 @@
using MareSynchronosShared.Models; using MareSynchronosShared.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using MareSynchronosServer.Utils; using MareSynchronosServer.Utils;
using MareSynchronosShared.Utils;
namespace MareSynchronosServer.Hubs; namespace MareSynchronosServer.Hubs;

1
MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs
View File

@@ -1,5 +1,6 @@
using AspNetCoreRateLimit; using AspNetCoreRateLimit;
using MareSynchronosShared; using MareSynchronosShared;
using MareSynchronosShared.Utils;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;

2
MareSynchronosServer/MareSynchronosServer/RequirementHandlers/UserRequirementHandler.cs
View File

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.SignalR;
using MareSynchronosShared.Data; using MareSynchronosShared.Data;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using MareSynchronosServer.Services; using MareSynchronosServer.Services;
using MareSynchronosServer.Hubs; using MareSynchronosShared.Utils;
namespace MareSynchronosServer.RequirementHandlers; namespace MareSynchronosServer.RequirementHandlers;

2
MareSynchronosServer/MareSynchronosServer/Utils/IdBasedUserIdProvider.cs
View File

@@ -1,4 +1,4 @@
using MareSynchronosServer.Hubs; using MareSynchronosShared.Utils;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
namespace MareSynchronosServer.Utils; namespace MareSynchronosServer.Utils;

2
MareSynchronosServer/MareSynchronosServer/Hubs/MareClaimTypes.cs → MareSynchronosServer/MareSynchronosShared/Utils/MareClaimTypes.cs
View File

@@ -1,4 +1,4 @@
namespace MareSynchronosServer.Hubs; namespace MareSynchronosShared.Utils;
public static class MareClaimTypes public static class MareClaimTypes
{ {

6
MareSynchronosServer/MareSynchronosStaticFilesServer/FilesController.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.AspNetCore.Mvc; using MareSynchronosShared.Utils;
using System.Security.Claims; using Microsoft.AspNetCore.Mvc;
namespace MareSynchronosStaticFilesServer; namespace MareSynchronosStaticFilesServer;
@@ -18,7 +18,7 @@ public class FilesController : Controller
[HttpGet("{fileId}")] [HttpGet("{fileId}")]
public async Task<IActionResult> GetFile(string fileId) public async Task<IActionResult> GetFile(string fileId)
{ {
var authedUser = HttpContext.User.Claims.FirstOrDefault(f => string.Equals(f.Type, ClaimTypes.NameIdentifier, StringComparison.Ordinal))?.Value ?? "Unknown"; var authedUser = HttpContext.User.Claims.FirstOrDefault(f => string.Equals(f.Type, MareClaimTypes.Uid, StringComparison.Ordinal))?.Value ?? "Unknown";
_logger.LogInformation($"GetFile:{authedUser}:{fileId}"); _logger.LogInformation($"GetFile:{authedUser}:{fileId}");
var fs = await _cachedFileProvider.GetFileStream(fileId, Request.Headers["Authorization"]); var fs = await _cachedFileProvider.GetFileStream(fileId, Request.Headers["Authorization"]);