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

fix(auth-validator): [PM-22975] Client Version Validator - Minor touchups to baserequest validator.

Browse Source
This commit is contained in:
Patrick Pimentel
2025-11-20 10:30:18 -05:00
parent 1af2fba496
commit 47a26bb204
4 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Core/KeyManagement/Utilities/EncryptionParsing.cs
View File

@@ -10,36 +10,19 @@ public static class EncryptionParsing
/// </summary>
public static EncryptionType GetEncryptionType(string encString)
{
if (string.IsNullOrWhiteSpace(encString))
{
throw new ArgumentException("Encrypted string cannot be null or empty.", nameof(encString));
}
var parts = encString.Split('.');
if (parts.Length == 1)
{
// No header detected; assume AES CBC variants based on number of pieces
var splitParts = encString.Split('|');
if (splitParts.Length == 3)
{
return EncryptionType.AesCbc128_HmacSha256_B64;
}
return EncryptionType.AesCbc256_B64;
throw new ArgumentException("Invalid encryption type string.");
}
// Try parse header as numeric, then as enum name, else fail
if (byte.TryParse(parts[0], out var encryptionTypeNumber))
{
return (EncryptionType)encryptionTypeNumber;
if (Enum.IsDefined(typeof(EncryptionType), encryptionTypeNumber))
{
return (EncryptionType)encryptionTypeNumber;
}
}
if (Enum.TryParse(parts[0], out EncryptionType parsed))
{
return parsed;
}
throw new ArgumentException("Invalid encryption type header.", nameof(encString));
throw new ArgumentException("Invalid encryption type string.");
}
}