mirror of
https://github.com/bitwarden/server
synced 2025-12-10 05:13:48 +00:00
1e2e4b9d4d
* Enhance PolicyRequestModel and SavePolicyRequest with validation for policy data and metadata. * Add integration tests for policy updates to validate handling of invalid data types in PolicyRequestModel and SavePolicyRequest. * Add missing using * Update PolicyRequestModel for null safety by making Data and ValidateAndSerializePolicyData nullable * Add integration tests for public PoliciesController to validate handling of invalid data types in policy updates. * Add PolicyDataValidator class for validating and serializing policy data and metadata based on policy type. * Refactor PolicyRequestModel, SavePolicyRequest, and PolicyUpdateRequestModel to utilize PolicyDataValidator for data validation and serialization, removing redundant methods and improving code clarity. * Update PolicyRequestModel and SavePolicyRequest to initialize Data and Metadata properties with empty dictionaries. * Refactor PolicyDataValidator to remove null checks for input data in validation methods * Rename test methods in SavePolicyRequestTests to reflect handling of empty data and metadata, and remove null assignments in test cases for improved clarity. * Enhance error handling in PolicyDataValidator to include field-specific details in BadRequestException messages. * Enhance PoliciesControllerTests to verify error messages for BadRequest responses by checking for specific field names in the response content. * refactor: Update PolicyRequestModel and SavePolicyRequest to use nullable dictionaries for Data and Metadata properties; enhance validation methods in PolicyDataValidator to handle null cases. * test: Add integration tests for handling policies with null data in PoliciesController * fix: Catch specific JsonException in PolicyDataValidator to improve error handling * test: Add unit tests for PolicyDataValidator to validate and serialize policy data and metadata * test: Update PolicyDataValidatorTests to validate organization data ownership metadata
60 lines
1.9 KiB
C#
60 lines
1.9 KiB
C#
using Bit.Core.AdminConsole.Enums;
|
|
using Bit.Core.AdminConsole.OrganizationFeatures.Policies.Models;
|
|
using Bit.Core.AdminConsole.Utilities;
|
|
using Bit.Core.Exceptions;
|
|
using Xunit;
|
|
|
|
namespace Bit.Core.Test.AdminConsole.Utilities;
|
|
|
|
public class PolicyDataValidatorTests
|
|
{
|
|
[Fact]
|
|
public void ValidateAndSerialize_NullData_ReturnsNull()
|
|
{
|
|
var result = PolicyDataValidator.ValidateAndSerialize(null, PolicyType.MasterPassword);
|
|
|
|
Assert.Null(result);
|
|
}
|
|
|
|
[Fact]
|
|
public void ValidateAndSerialize_ValidData_ReturnsSerializedJson()
|
|
{
|
|
var data = new Dictionary<string, object> { { "minLength", 12 } };
|
|
|
|
var result = PolicyDataValidator.ValidateAndSerialize(data, PolicyType.MasterPassword);
|
|
|
|
Assert.NotNull(result);
|
|
Assert.Contains("\"minLength\":12", result);
|
|
}
|
|
|
|
[Fact]
|
|
public void ValidateAndSerialize_InvalidDataType_ThrowsBadRequestException()
|
|
{
|
|
var data = new Dictionary<string, object> { { "minLength", "not a number" } };
|
|
|
|
var exception = Assert.Throws<BadRequestException>(() =>
|
|
PolicyDataValidator.ValidateAndSerialize(data, PolicyType.MasterPassword));
|
|
|
|
Assert.Contains("Invalid data for MasterPassword policy", exception.Message);
|
|
Assert.Contains("minLength", exception.Message);
|
|
}
|
|
|
|
[Fact]
|
|
public void ValidateAndDeserializeMetadata_NullMetadata_ReturnsEmptyMetadataModel()
|
|
{
|
|
var result = PolicyDataValidator.ValidateAndDeserializeMetadata(null, PolicyType.SingleOrg);
|
|
|
|
Assert.IsType<EmptyMetadataModel>(result);
|
|
}
|
|
|
|
[Fact]
|
|
public void ValidateAndDeserializeMetadata_ValidMetadata_ReturnsModel()
|
|
{
|
|
var metadata = new Dictionary<string, object> { { "defaultUserCollectionName", "collection name" } };
|
|
|
|
var result = PolicyDataValidator.ValidateAndDeserializeMetadata(metadata, PolicyType.OrganizationDataOwnership);
|
|
|
|
Assert.IsType<OrganizationModelOwnershipPolicyModel>(result);
|
|
}
|
|
}
|