CalvinBackup/notesnook-sync-server_customPrivateV1
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook-sync-server.git synced 2026-02-12 11:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

identity: add client id checks in grant validators

Browse Source
This commit is contained in:
Abdullah Atta
2025-10-14 21:50:57 +05:00
parent 8db33889b6
commit 75a4462fd1
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Streetwriters.Identity/Validation/MFAGrantValidator.cs
View File

@@ -75,8 +75,8 @@ namespace Streetwriters.Identity.Validation
var tokenValidationResult = await TokenValidator.ValidateAccessTokenAsync(tokenResult.Token, Config.MFA_GRANT_TYPE_SCOPE);
if (tokenValidationResult.IsError) return;
var client = Clients.FindClientById(tokenValidationResult.Claims.GetClaimValue("client_id"));
if (client == null)
var client = Clients.FindClientById(context.Request.ClientId);
if (client == null || context.Request.ClientId != tokenValidationResult.Claims.GetClaimValue("client_id"))
{
context.Result = new GrantValidationResult(TokenRequestErrors.InvalidClient);
return;

13
Streetwriters.Identity/Validation/MFAPasswordGrantValidator.cs
View File

@@ -63,13 +63,11 @@ namespace Streetwriters.Identity.Validation
var tokenResult = BearerTokenValidator.ValidateAuthorizationHeader(httpContext);
if (!tokenResult.TokenFound) return;
var tokenValidationResult = await TokenValidator.ValidateAccessTokenAsync(tokenResult.Token, Config.MFA_PASSWORD_GRANT_TYPE_SCOPE);
if (tokenValidationResult.IsError) return;
var client = Clients.FindClientById(tokenValidationResult.Claims.GetClaimValue("client_id"));
if (client == null)
var client = Clients.FindClientById(context.Request.ClientId);
if (client == null || context.Request.ClientId != tokenValidationResult.Claims.GetClaimValue("client_id"))
{
context.Result = new GrantValidationResult(TokenRequestErrors.InvalidClient);
return;
@@ -80,16 +78,15 @@ namespace Streetwriters.Identity.Validation
if (string.IsNullOrEmpty(userId)) return;
var user = await UserManager.FindByIdAsync(userId);
if (user == null) return;
context.Result.Error = "unauthorized";
context.Result.ErrorDescription = "Password is incorrect.";
if (string.IsNullOrEmpty(password)) return;
var user = await UserManager.FindByIdAsync(userId);
if (user == null) return;
var result = await SignInManager.CheckPasswordSignInAsync(user, password, true);
if (result.IsLockedOut)
{
var timeLeft = user.LockoutEnd - DateTimeOffset.Now;