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 - Fixed tests and made versions of the sha obsolete

Browse Source
This commit is contained in:
Patrick Pimentel
2025-12-11 13:07:28 -05:00
parent 865e76f620
commit 50298fbbce
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Enums/EncryptionType.cs
View File

@@ -11,8 +11,11 @@ public enum EncryptionType : byte
XChaCha20Poly1305_B64 = 7,
// asymmetric
[Obsolete("Should probably be removed as it is not known to exist in the real world")]
Rsa2048_OaepSha256_B64 = 3,
Rsa2048_OaepSha1_B64 = 4,
[Obsolete("Should probably be removed as it is not known to exist in the real world")]
Rsa2048_OaepSha256_HmacSha256_B64 = 5,
[Obsolete("Should probably be removed as it is not known to exist in the real world")]
Rsa2048_OaepSha1_HmacSha256_B64 = 6
}

5
test/Common/Constants/TestEncryptionConstants.cs
View File

@@ -4,15 +4,12 @@ public static class TestEncryptionConstants
{
// Simple stubs for different encrypted string versions
[Obsolete]
public const string AES256_CBC_B64_Encstring = "0.stub";
public const string AES128_CBC_HMACSHA256_B64_Encstring = "1.stub";
public const string AES256_CBC_HMAC_EmptySuffix = "2.";
// Intended for use as a V1 encrypted string, accepted by validators
public const string AES256_CBC_HMAC_Encstring = "2.QmFzZTY0UGFydA==|QmFzZTY0UGFydA==|QmFzZTY0UGFydA==";
public const string RSA2048_OAEPSHA256_B64_Encstring = "3.stub";
public const string RSA2048_OAEPSHA1_B64_Encstring = "4.stub";
public const string RSA2048_OAEPSHA256_HMACSHA256_B64_Encstring = "5.stub";
public const string RSA2048_OAEPSHA1_HMACSHA256_B64_Encstring = "6.stub";
public const string XCHACHA20POLY1305_B64_Encstring = "7.stub";
// Public key test placeholder

4
test/Core.Test/KeyManagement/Utilities/EncryptionParsingTests.cs
View File

@@ -25,12 +25,8 @@ public class EncryptionParsingTests
[Theory]
[InlineData(TestEncryptionConstants.AES256_CBC_B64_Encstring, EncryptionType.AesCbc256_B64)]
[InlineData(TestEncryptionConstants.AES128_CBC_HMACSHA256_B64_Encstring, EncryptionType.AesCbc128_HmacSha256_B64)]
[InlineData(TestEncryptionConstants.AES256_CBC_HMAC_Encstring, EncryptionType.AesCbc256_HmacSha256_B64)]
[InlineData(TestEncryptionConstants.RSA2048_OAEPSHA256_B64_Encstring, EncryptionType.Rsa2048_OaepSha256_B64)]
[InlineData(TestEncryptionConstants.RSA2048_OAEPSHA1_B64_Encstring, EncryptionType.Rsa2048_OaepSha1_B64)]
[InlineData(TestEncryptionConstants.RSA2048_OAEPSHA256_HMACSHA256_B64_Encstring, EncryptionType.Rsa2048_OaepSha256_HmacSha256_B64)]
[InlineData(TestEncryptionConstants.RSA2048_OAEPSHA1_HMACSHA256_B64_Encstring, EncryptionType.Rsa2048_OaepSha1_HmacSha256_B64)]
[InlineData(TestEncryptionConstants.V2PrivateKey, EncryptionType.XChaCha20Poly1305_B64)]
[InlineData(TestEncryptionConstants.V2WrappedSigningKey, EncryptionType.XChaCha20Poly1305_B64)]
[InlineData(TestEncryptionConstants.AES256_CBC_HMAC_EmptySuffix, EncryptionType.AesCbc256_HmacSha256_B64)] // empty suffix still valid