mirror of
https://github.com/bitwarden/server
synced 2025-12-25 12:43:14 +00:00
[PM-8220] New Device Verification (#5084)
* feat(BaseRequestValidator): Add global setting for new device verification. Refactor BaseRequestValidator enabling better self-documenting code and better single responsibility principle for validators. Updated DeviceValidator to handle new device verification, behind a feature flag. Moved IDeviceValidator interface to separate file. Updated CustomRequestValidator to act as the conduit by which *Validators communicate authentication context between themselves and the RequestValidators. Adding new test for DeviceValidator class. Updated tests for BaseRequestValidator as some functionality was moved to the DeviceValidator class.
This commit is contained in:
@@ -89,8 +89,7 @@ public class CustomTokenRequestValidator : BaseRequestValidator<CustomTokenReque
|
||||
}
|
||||
return;
|
||||
}
|
||||
await ValidateAsync(context, context.Result.ValidatedRequest,
|
||||
new CustomValidatorRequestContext { KnownDevice = true });
|
||||
await ValidateAsync(context, context.Result.ValidatedRequest, new CustomValidatorRequestContext { });
|
||||
}
|
||||
|
||||
protected async override Task<bool> ValidateContextAsync(CustomTokenRequestValidationContext context,
|
||||
@@ -162,6 +161,7 @@ public class CustomTokenRequestValidator : BaseRequestValidator<CustomTokenReque
|
||||
return context.Result.ValidatedRequest.Subject;
|
||||
}
|
||||
|
||||
[Obsolete("Consider using SetGrantValidationErrorResult instead.")]
|
||||
protected override void SetTwoFactorResult(CustomTokenRequestValidationContext context,
|
||||
Dictionary<string, object> customResponse)
|
||||
{
|
||||
@@ -172,16 +172,18 @@ public class CustomTokenRequestValidator : BaseRequestValidator<CustomTokenReque
|
||||
context.Result.CustomResponse = customResponse;
|
||||
}
|
||||
|
||||
[Obsolete("Consider using SetGrantValidationErrorResult instead.")]
|
||||
protected override void SetSsoResult(CustomTokenRequestValidationContext context,
|
||||
Dictionary<string, object> customResponse)
|
||||
{
|
||||
Debug.Assert(context.Result is not null);
|
||||
context.Result.Error = "invalid_grant";
|
||||
context.Result.ErrorDescription = "Single Sign on required.";
|
||||
context.Result.ErrorDescription = "Sso authentication required.";
|
||||
context.Result.IsError = true;
|
||||
context.Result.CustomResponse = customResponse;
|
||||
}
|
||||
|
||||
[Obsolete("Consider using SetGrantValidationErrorResult instead.")]
|
||||
protected override void SetErrorResult(CustomTokenRequestValidationContext context,
|
||||
Dictionary<string, object> customResponse)
|
||||
{
|
||||
@@ -190,4 +192,14 @@ public class CustomTokenRequestValidator : BaseRequestValidator<CustomTokenReque
|
||||
context.Result.IsError = true;
|
||||
context.Result.CustomResponse = customResponse;
|
||||
}
|
||||
|
||||
protected override void SetValidationErrorResult(
|
||||
CustomTokenRequestValidationContext context, CustomValidatorRequestContext requestContext)
|
||||
{
|
||||
Debug.Assert(context.Result is not null);
|
||||
context.Result.Error = requestContext.ValidationErrorResult.Error;
|
||||
context.Result.IsError = requestContext.ValidationErrorResult.IsError;
|
||||
context.Result.ErrorDescription = requestContext.ValidationErrorResult.ErrorDescription;
|
||||
context.Result.CustomResponse = requestContext.CustomResponse;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user