nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-23 04:21:05 -05:00
Code

encryption type header checking

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-06 22:55:36 -04:00
parent 2d7cb1321b
commit 02d8913a77
3 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Core/Enums/EncryptionType.cs Normal file
View File

@ -0,0 +1,10 @@
namespace Bit.Core.Enums
{
public enum EncryptionType : byte
{
AesCbc256_B64 = 0,
AesCbc128_HmacSha256_B64 = 1,
AesCbc256_HmacSha256_B64 = 2,
RsaOaep_Sha256_B64 = 3
}
}

9
src/Core/Enums/ShareStatusType.cs
View File

@ -1,9 +0,0 @@
namespace Bit.Core.Enums
{
public enum ShareStatusType : byte
{
Pending = 0,
Accepted = 1,
Rejected = 2
}
}

47
src/Core/Utilities/EncryptedValueAttribute.cs
View File

@ -27,12 +27,51 @@ namespace Bit.Core.Utilities
return false; return false;
} }
var encStringPieces = encString.Split('|'); var headerPieces = encString.Split('.');
if(encStringPieces.Length != 2 && encStringPieces.Length != 3) string[] encStringPieces = null;
var encType = Enums.EncryptionType.AesCbc256_B64;
if(headerPieces.Length == 1)
{
encStringPieces = headerPieces[0].Split('|');
// encType stays AesCbc256_B64
}
else if(headerPieces.Length == 2)
{
encStringPieces = headerPieces[1].Split('|');
if(!Enum.TryParse(headerPieces[0], out encType))
{ {
return false; return false;
} }
}
switch(encType)
{
case Enums.EncryptionType.AesCbc256_B64:
if(encStringPieces.Length != 2)
{
return false;
}
break;
case Enums.EncryptionType.AesCbc128_HmacSha256_B64:
case Enums.EncryptionType.AesCbc256_HmacSha256_B64:
if(encStringPieces.Length != 3)
{
return false;
}
break;
case Enums.EncryptionType.RsaOaep_Sha256_B64:
if(encStringPieces.Length != 1)
{
return false;
}
break;
default:
return false;
}
if(encType != Enums.EncryptionType.RsaOaep_Sha256_B64)
{
var iv = Convert.FromBase64String(encStringPieces[0]); var iv = Convert.FromBase64String(encStringPieces[0]);
var ct = Convert.FromBase64String(encStringPieces[1]); var ct = Convert.FromBase64String(encStringPieces[1]);
@ -40,8 +79,10 @@ namespace Bit.Core.Utilities
{ {
return false; return false;
} }
}
if(encStringPieces.Length == 3) if(encType == Enums.EncryptionType.AesCbc128_HmacSha256_B64 ||
encType == Enums.EncryptionType.AesCbc256_HmacSha256_B64)
{ {
var mac = Convert.FromBase64String(encStringPieces[2]); var mac = Convert.FromBase64String(encStringPieces[2]);
if(mac.Length < 1) if(mac.Length < 1)