Skip to content

add handling to DefaultSubjectTokenValidator for when claims are null #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joe-harvey-rsk merged 1 commit into from
Oct 22, 2026
Merged

add handling to DefaultSubjectTokenValidator for when claims are null #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Rsk.TokenExchange/Validators/DefaultTokenExchangeRequestValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ public async Task<ITokenExchangeValidationResult> Validate(ITokenExchangeRequest
var result = await subjectTokenValidator.Validate(request.SubjectToken, request.SubjectTokenType);

// validate that the requester is an intended audience of the subject token
var audiences = result.Claims.Where(x => x.Type == "aud").ToList();
var clientId = result.Claims.FirstOrDefault(x => x.Type == "client_id");
if (audiences.All(x => x.Value != request.ClientId) && clientId?.Value != request.ClientId)
var audiences = result.Claims?.Where(x => x.Type == "aud").ToList();
var clientId = result.Claims?.FirstOrDefault(x => x.Type == "client_id");
if (audiences != null && audiences.All(x => x.Value != request.ClientId) && clientId?.Value != request.ClientId)
{
return TokenExchangeValidationResult.Failure("Requester must be a recipient of the subject token");
}

return result.IsValid
return result.IsValid
? TokenExchangeValidationResult.Success(result.Claims)
: TokenExchangeValidationResult.Failure("Invalid subject token");
}
Expand Down
17 changes: 17 additions & 0 deletions test/Rsk.TokenExchange.Tests/Validators/DefaultTokenExchangeRequestValidatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,23 @@ public async Task Validate_WhenSubjectTokenIsValidWithInvalidAudience_ExpectFail
result.ErrorDescription.Should().NotBeNullOrWhiteSpace();
}

[Fact]
public async Task Validate_WhenValidateReturnsInvalidAndExpectedClaimsAreNull_ExpectIsValidToBeFalse()
{
const string validClientId = "app1";

mockRequest.Setup(x => x.ClientId).Returns(validClientId);

mockSubjectTokenResponse.Setup(x => x.IsValid).Returns(false);
mockSubjectTokenResponse.Setup(x => x.Claims).Returns((IEnumerable<Claim>)null);

var sut = CreateSut();
var result = await sut.Validate(mockRequest.Object);

result.IsValid.Should().BeFalse();
result.Claims.Should().BeNull();
}

[Fact]
public async Task Validate_WhenSubjectTokenIsValidAndAuthorizedWithCorrectClientId_ExpectSuccessResult()
{
Expand Down
Loading