nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

Improve Speed of EncryptedStringAttribute (#3785)

Browse Source 
* Improve Speed of EncryptedStringAttribute

- Use Base64.IsValid
- Use SearchValues

* Fix Tests

* Remove SearchValues Change

* Format
This commit is contained in:
Justin Baur
2024-02-20 13:07:54 -05:00
committed by GitHub
parent 80a3979be1
commit a661ffdb3d
2 changed files with 4 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
using System.Buffers;
using System.Buffers.Text;
using System.ComponentModel.DataAnnotations;
using Bit.Core.Enums;
@ -88,7 +88,7 @@ public class EncryptedStringAttribute : ValidationAttribute
}
// Simply cast the number to the enum, this could be a value that doesn't actually have a backing enum
// entry but that is alright we will use it to look in the dictionary and non-valid
// entry but that is alright we will use it to look in the dictionary and non-valid
// numbers will be filtered out there.
encryptionType = (EncryptionType)encryptionTypeNumber;
@ -110,7 +110,7 @@ public class EncryptedStringAttribute : ValidationAttribute
if (requiredPieces == 1)
{
// Only one more part is needed so don't split and check the chunk
if (!IsValidBase64(rest))
if (rest.IsEmpty || !Base64.IsValid(rest))
{
return false;
}
@ -127,7 +127,7 @@ public class EncryptedStringAttribute : ValidationAttribute
}
// Is the required chunk valid base 64?
if (!IsValidBase64(chunk))
if (chunk.IsEmpty || !Base64.IsValid(chunk))
{
return false;
}
@ -140,37 +140,4 @@ public class EncryptedStringAttribute : ValidationAttribute
// No more parts are required, so check there are no extra parts
return rest.IndexOf('|') == -1;
}
private static bool IsValidBase64(ReadOnlySpan<char> input)
{
const int StackLimit = 256;
byte[]? pooledChunks = null;
var upperLimitLength = CalculateBase64ByteLengthUpperLimit(input.Length);
// Ref: https://vcsjones.dev/stackalloc/
var byteBuffer = upperLimitLength > StackLimit
? (pooledChunks = ArrayPool<byte>.Shared.Rent(upperLimitLength))
: stackalloc byte[StackLimit];
try
{
var successful = Convert.TryFromBase64Chars(input, byteBuffer, out var bytesWritten);
return successful && bytesWritten > 0;
}
finally
{
// Check if we rented the pool and if so, return it.
if (pooledChunks != null)
{
ArrayPool<byte>.Shared.Return(pooledChunks, true);
}
}
}
internal static int CalculateBase64ByteLengthUpperLimit(int charLength)
{
return 3 * (charLength / 4);
}
}