nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00
Code Activity

Formatting & Comments

Browse Source
This commit is contained in:
Justin Baur
2022-09-09 14:56:59 -04:00
parent 75c1f70d0c
commit ee76a08fa3
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perf/MicroBenchmarks/Core/EncryptedStringAttributeTests.cs
View File

@ -1,5 +1,5 @@
using BenchmarkDotNet.Attributes;
using Bit.Core.Utilities; using Bit.Core.Utilities;
using BenchmarkDotNet.Attributes;
namespace Bit.MicroBenchmarks.Core; namespace Bit.MicroBenchmarks.Core;

22
src/Core/Utilities/EncryptedStringAttribute.cs
View File

@ -18,18 +18,18 @@ public class EncryptedStringAttribute : ValidationAttribute
{ {
_encryptionTypeMap = new() _encryptionTypeMap = new()
{ {
[EncryptionType.AesCbc256_B64] = 2, [EncryptionType.AesCbc256_B64] = 2, // iv|ct
[EncryptionType.AesCbc128_HmacSha256_B64] = 3, [EncryptionType.AesCbc128_HmacSha256_B64] = 3, // iv|ct|mac
[EncryptionType.AesCbc256_HmacSha256_B64] = 3, [EncryptionType.AesCbc256_HmacSha256_B64] = 3, // iv|ct|mac
[EncryptionType.Rsa2048_OaepSha256_B64] = 1, [EncryptionType.Rsa2048_OaepSha256_B64] = 1, // rsaCt
[EncryptionType.Rsa2048_OaepSha1_B64] = 1, [EncryptionType.Rsa2048_OaepSha1_B64] = 1, // rsaCt
[EncryptionType.Rsa2048_OaepSha256_HmacSha256_B64] = 2, [EncryptionType.Rsa2048_OaepSha256_HmacSha256_B64] = 2, // rsaCt|mac
[EncryptionType.Rsa2048_OaepSha1_HmacSha256_B64] = 2, [EncryptionType.Rsa2048_OaepSha1_HmacSha256_B64] = 2, // rsaCt|mac
}; };
#if DEBUG #if DEBUG
var enumValues = Enum.GetValues<EncryptionType>(); var enumValues = Enum.GetValues<EncryptionType>();
Debug.Assert(enumValues.Length == _encryptionTypeMap.Count, Debug.Assert(enumValues.Length == _encryptionTypeMap.Count,
$"New {nameof(EncryptionType)} enums should be added to the {nameof(_encryptionTypeMap)}"); $"New {nameof(EncryptionType)} enums should be added to the {nameof(_encryptionTypeMap)}");
#endif #endif
} }
@ -75,7 +75,7 @@ public class EncryptedStringAttribute : ValidationAttribute
var pieces = 1; var pieces = 1;
var findIndex = encryptionPiecesChunk.IndexOf('|'); var findIndex = encryptionPiecesChunk.IndexOf('|');
while(findIndex != -1) while (findIndex != -1)
{ {
pieces++; pieces++;
encryptionPiecesChunk = encryptionPiecesChunk[++findIndex..]; encryptionPiecesChunk = encryptionPiecesChunk[++findIndex..];
@ -131,11 +131,13 @@ public class EncryptedStringAttribute : ValidationAttribute
{ {
if (requiredPieces == 1) if (requiredPieces == 1)
{ {
// Only one more part is needed so don't split and check the chunk
if (!IsValidBase64(rest)) if (!IsValidBase64(rest))
{ {
return false; return false;
} }
// Make sure there isn't another split character possibly denoting another chunk
return rest.IndexOf('|') == -1; return rest.IndexOf('|') == -1;
} }
else else
@ -153,6 +155,7 @@ public class EncryptedStringAttribute : ValidationAttribute
} }
} }
// This current piece is valid so we can count down
requiredPieces--; requiredPieces--;
} }
@ -176,6 +179,7 @@ public class EncryptedStringAttribute : ValidationAttribute
} }
finally finally
{ {
// Check if we rented the pool and if so, return it.
if (pooledChunks != null) if (pooledChunks != null)
{ {
ArrayPool<byte>.Shared.Return(pooledChunks); ArrayPool<byte>.Shared.Return(pooledChunks);

4
src/Core/Utilities/SpanExtensions.cs
View File

@ -1,8 +1,8 @@
namespace Bit.Core.Utilities; namespace Bit.Core.Utilities;
public static class SpanExtensions public static class SpanExtensions
{ {
public static bool TrySplitBy(this ReadOnlySpan<char> input, public static bool TrySplitBy(this ReadOnlySpan<char> input,
char splitChar, out ReadOnlySpan<char> chunk, out ReadOnlySpan<char> rest) char splitChar, out ReadOnlySpan<char> chunk, out ReadOnlySpan<char> rest)
{ {
var splitIndex = input.IndexOf(splitChar); var splitIndex = input.IndexOf(splitChar);