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

fix token generation

Browse Source
This commit is contained in:
rootdarkarchon
2023-01-11 13:29:49 +01:00
parent c97d03cb72
commit 617bc6afc8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MareSynchronosServer/MareSynchronosShared/Utils/ServerTokenGenerator.cs
View File

@@ -1,4 +1,5 @@
using MareSynchronosShared.Services; using MareSynchronosShared.Services;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
using System.IdentityModel.Tokens.Jwt; using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims; using System.Security.Claims;
@@ -9,6 +10,8 @@ namespace MareSynchronosShared.Utils;
public class ServerTokenGenerator public class ServerTokenGenerator
{ {
private readonly IConfigurationService<MareConfigurationAuthBase> _configuration; private readonly IConfigurationService<MareConfigurationAuthBase> _configuration;
private readonly ILogger<ServerTokenGenerator> _logger;
private Dictionary<string, string> _tokenDictionary { get; set; } = new(StringComparer.Ordinal); private Dictionary<string, string> _tokenDictionary { get; set; } = new(StringComparer.Ordinal);
public string Token public string Token
{ {
@@ -24,9 +27,10 @@ public class ServerTokenGenerator
} }
} }
public ServerTokenGenerator(IConfigurationService<MareConfigurationAuthBase> configuration) public ServerTokenGenerator(IConfigurationService<MareConfigurationAuthBase> configuration, ILogger<ServerTokenGenerator> logger)
{ {
_configuration = configuration; _configuration = configuration;
_logger = logger;
} }
private string GenerateToken() private string GenerateToken()
@@ -39,7 +43,7 @@ public class ServerTokenGenerator
Subject = new ClaimsIdentity(new List<Claim>() Subject = new ClaimsIdentity(new List<Claim>()
{ {
new Claim(MareClaimTypes.Uid, _configuration.GetValue<string>(nameof(MareConfigurationBase.ShardName))), new Claim(MareClaimTypes.Uid, _configuration.GetValue<string>(nameof(MareConfigurationBase.ShardName))),
new Claim(MareClaimTypes.Internal, true.ToString()) new Claim(MareClaimTypes.Internal, "true")
}), }),
SigningCredentials = new SigningCredentials(authSigningKey, SecurityAlgorithms.HmacSha256Signature) SigningCredentials = new SigningCredentials(authSigningKey, SecurityAlgorithms.HmacSha256Signature)
}; };
@@ -49,6 +53,8 @@ public class ServerTokenGenerator
_tokenDictionary[signingKey] = rawData; _tokenDictionary[signingKey] = rawData;
_logger.LogInformation("Generated Token: {data}", rawData);
return rawData; return rawData;
} }
} }