Skip to content

Commit f519131

Browse files
committed
fix tests
1 parent 909ddaa commit f519131

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/Antiforgery/src/Internal/DefaultAntiforgeryTokenGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ public bool TryValidateTokenSet(
151151
currentUsername = authenticatedIdentity.Name ?? string.Empty;
152152
}
153153

154-
if (requestToken.ClaimUid?.Equals(claimUidBytes.AsSpan(0, bytesWritten)) != true)
154+
if (!(requestToken.ClaimUid is null && bytesWritten == 0) // both are not defined
155+
&& requestToken.ClaimUid?.Equals(claimUidBytes.AsSpan(0, bytesWritten)) != true)
155156
{
156157
message = Resources.AntiforgeryToken_ClaimUidMismatch;
157158
return false;

src/Antiforgery/test/DefaultAntiforgeryTokenGeneratorTest.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,6 @@ public void TryValidateTokenSet_Success_AuthenticatedUserWithUsername()
548548
var cookieToken = new AntiforgeryToken() { IsCookieToken = true };
549549
var fieldtoken = new AntiforgeryToken()
550550
{
551-
ClaimUid = new BinaryBlob(32),
552551
SecurityToken = cookieToken.SecurityToken,
553552
Username = "THE-USER",
554553
IsCookieToken = false,
@@ -558,9 +557,7 @@ public void TryValidateTokenSet_Success_AuthenticatedUserWithUsername()
558557
var mockClaimUidExtractor = new MockClaimUidExtractor(
559558
(claimsPrincipal, bytes) =>
560559
{
561-
var data = fieldtoken.ClaimUid.GetData();
562-
data.CopyTo(bytes);
563-
return data.Length;
560+
return 0;
564561
});
565562

566563
var mockAdditionalDataProvider = new Mock<IAntiforgeryAdditionalDataProvider>();
@@ -596,12 +593,16 @@ public void TryValidateTokenSet_Success_ClaimsBasedUser()
596593
ClaimUid = new BinaryBlob(256)
597594
};
598595

599-
var mockClaimUidExtractor = new Mock<IClaimUidExtractor>();
600-
mockClaimUidExtractor.Setup(o => o.ExtractClaimUid(It.Is<ClaimsPrincipal>(c => c.Identity == identity)))
601-
.Returns(Convert.ToBase64String(fieldtoken.ClaimUid.GetData()));
596+
var mockClaimUidExtractor = new MockClaimUidExtractor(
597+
(claimsPrincipal, bytes) =>
598+
{
599+
var data = fieldtoken.ClaimUid.GetData();
600+
data.CopyTo(bytes);
601+
return data.Length;
602+
});
602603

603604
var tokenProvider = new DefaultAntiforgeryTokenGenerator(
604-
claimUidExtractor: mockClaimUidExtractor.Object,
605+
claimUidExtractor: mockClaimUidExtractor,
605606
additionalDataProvider: null);
606607

607608
// Act

0 commit comments

Comments
 (0)