bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-02 00:23:40 +00:00
Code Issues Releases Wiki Activity

fix(auth-validator): [PM-22975] Client Version Validator - Rename function

Browse Source
This commit is contained in:
Patrick Pimentel
2025-12-15 12:00:42 -05:00
parent 06224d9969
commit 6a5518a037
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Identity/IdentityServer/RequestValidators/BaseRequestValidator.cs
View File

@@ -222,7 +222,7 @@ public abstract class BaseRequestValidator<T> where T : class
/// <returns>true if the scheme successfully passed validation, otherwise false.</returns>
private async Task<bool> ValidateClientVersionAsync(T context, CustomValidatorRequestContext validatorContext)
{
var ok = _clientVersionValidator.ValidateAsync(validatorContext.User, validatorContext);
var ok = _clientVersionValidator.Validate(validatorContext.User, validatorContext);
if (ok)
{
return true;

4
src/Identity/IdentityServer/RequestValidators/ClientVersionValidator.cs
View File

@@ -8,7 +8,7 @@ namespace Bit.Identity.IdentityServer.RequestValidators;
public interface IClientVersionValidator
{
bool ValidateAsync(User user, CustomValidatorRequestContext requestContext);
bool Validate(User user, CustomValidatorRequestContext requestContext);
}
/// <summary>
@@ -28,7 +28,7 @@ public class ClientVersionValidator(
private const string _noUserMessage = "No user found while trying to validate client version";
private const string _versionHeaderMissing = "No client version header found, required to prevent encryption errors. Please confirm your client is supplying the header: \"Bitwarden-Client-Version\"";
public bool ValidateAsync(User? user, CustomValidatorRequestContext requestContext)
public bool Validate(User? user, CustomValidatorRequestContext requestContext)
{
// Do this nullish check because the base request validator currently is not
// strict null checking. Once that gets fixed then we can see about making

2
test/Identity.IntegrationTest/Endpoints/IdentityServerSsoTests.cs
View File

@@ -625,7 +625,7 @@ public class IdentityServerSsoTests
// Bypass client version gating to isolate SSO test behavior
factory.SubstituteService<IClientVersionValidator>(svc =>
{
svc.ValidateAsync(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
svc.Validate(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
.Returns(true);
});

2
test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs
View File

@@ -36,7 +36,7 @@ public class IdentityServerTests : IClassFixture<IdentityApplicationFactory>
// Bypass client version gating to isolate SSO test behavior
_factory.SubstituteService<IClientVersionValidator>(svc =>
{
svc.ValidateAsync(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
svc.Validate(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
.Returns(true);
});

6
test/Identity.Test/IdentityServer/BaseRequestValidatorTests.cs
View File

@@ -108,7 +108,7 @@ public class BaseRequestValidatorTests
// Default client version validator behavior: allow to pass unless a test overrides.
_clientVersionValidator
.ValidateAsync(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
.Validate(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
.Returns(true);
}
@@ -1187,7 +1187,7 @@ public class BaseRequestValidatorTests
// Make client version validation succeed but ensure it's invoked
_clientVersionValidator
.ValidateAsync(requestContext.User, requestContext)
.Validate(requestContext.User, requestContext)
.Returns(true);
// Ensure SSO requirement triggers an early stop after version validation to avoid success path setup
@@ -1200,7 +1200,7 @@ public class BaseRequestValidatorTests
// Assert
_clientVersionValidator.Received(1)
.ValidateAsync(requestContext.User, requestContext);
.Validate(requestContext.User, requestContext);
}
/// <summary>

12
test/Identity.Test/IdentityServer/RequestValidators/ClientVersionValidatorTests.cs
View File

@@ -34,7 +34,7 @@ public class ClientVersionValidatorTests
var user = MakeValidV2User();
// Act
var ok = sut.ValidateAsync(user, ctx);
var ok = sut.Validate(user, ctx);
// Assert
Assert.True(ok);
@@ -49,7 +49,7 @@ public class ClientVersionValidatorTests
var user = MakeValidV2User();
// Act
var ok = sut.ValidateAsync(user, ctx);
var ok = sut.Validate(user, ctx);
// Assert
Assert.False(ok);
@@ -67,7 +67,7 @@ public class ClientVersionValidatorTests
User? user = null;
// Act
var ok = sut.ValidateAsync(user, ctx);
var ok = sut.Validate(user, ctx);
// Assert
Assert.False(ok);
@@ -86,7 +86,7 @@ public class ClientVersionValidatorTests
user.PrivateKey = null;
// Act
var ok = sut.ValidateAsync(user, ctx);
var ok = sut.Validate(user, ctx);
// Assert
Assert.True(ok);
@@ -102,7 +102,7 @@ public class ClientVersionValidatorTests
var user = MakeValidV2User();
user.SecurityVersion = null;
// Act
var ok = sut.ValidateAsync(user, ctx);
var ok = sut.Validate(user, ctx);
// Assert
Assert.True(ok);
}
@@ -116,7 +116,7 @@ public class ClientVersionValidatorTests
var user = MakeValidV2User();
// Act
var ok = sut.ValidateAsync(user, ctx);
var ok = sut.Validate(user, ctx);
// Assert
Assert.False(ok);

2
test/IntegrationTestCommon/Factories/IdentityApplicationFactory.cs
View File

@@ -54,7 +54,7 @@ public class IdentityApplicationFactory : WebApplicationFactoryBase<Startup>
// Bypass client version gating to isolate tests from client version behavior
SubstituteService<IClientVersionValidator>(svc =>
{
svc.ValidateAsync(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
svc.Validate(Arg.Any<User>(), Arg.Any<CustomValidatorRequestContext>())
.Returns(true);
});
}