Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix return the wrong value

Browse Source
This commit is contained in:
Pascal
2021-03-25 13:24:04 +01:00
parent 6871d6952f
commit 3376fecd12
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Pilz.Cryptography/SecureString.cs
View File

@@ -11,20 +11,19 @@ namespace Pilz.Cryptography
public class SecureString public class SecureString
{ {
public static ICrypter DefaultCrypter { get; set; } public static ICrypter DefaultCrypter { get; set; }
[JsonIgnore]
public ICrypter Crypter { get; set; } public ICrypter Crypter { get; set; }
[JsonProperty]
public string EncryptedValue { get; set; } public string EncryptedValue { get; set; }
[JsonIgnore]
public string Value public string Value
{ {
get => GetCrypter().Decrypt(EncryptedValue); get => GetCrypter()?.Decrypt(EncryptedValue);
set => EncryptedValue = GetCrypter().Encrypt(value); set => EncryptedValue = GetCrypter().Encrypt(value);
} }
[JsonConstructor]
private SecureString(JsonConstructorAttribute dummyAttribute)
{
}
public SecureString() : public SecureString() :
this(string.Empty, true) this(string.Empty, true)
{ {
@@ -73,7 +72,7 @@ namespace Pilz.Cryptography
public static implicit operator string(SecureString value) => value?.Value; public static implicit operator string(SecureString value) => value?.Value;
public static implicit operator SecureString(string value) => new SecureString(value, false); public static implicit operator SecureString(string value) => new SecureString(value, false);
public static bool operator ==(SecureString left, SecureString right) => left.EncryptedValue == right.EncryptedValue; public static bool operator ==(SecureString left, SecureString right) => left?.EncryptedValue == right?.EncryptedValue;
public static bool operator !=(SecureString left, SecureString right) => left.EncryptedValue != right.EncryptedValue; public static bool operator !=(SecureString left, SecureString right) => left?.EncryptedValue != right?.EncryptedValue;
} }
} }

9
Pilz.Cryptography/SecureStringJsonConverter.cs
View File

@@ -22,12 +22,13 @@ namespace Pilz.Json.Converters
var idString = serializer.Deserialize<string>(reader); var idString = serializer.Deserialize<string>(reader);
SecureString id; SecureString id;
if (existingValue is object) if (existingValue is SecureString)
{
id = (SecureString)existingValue; id = (SecureString)existingValue;
else
id = new SecureString();
id.EncryptedValue = idString; id.EncryptedValue = idString;
}
else
id = new SecureString(idString, true);
return id; return id;
} }

11
Pilz.Cryptography/SimpleStringCrypter.cs
View File

@@ -35,10 +35,13 @@ namespace Pilz.Cryptography
byte[] bytes = TextEncoding.GetBytes(key); byte[] bytes = TextEncoding.GetBytes(key);
byte[] array = sha1CryptoServiceProvider.ComputeHash(bytes); byte[] array = sha1CryptoServiceProvider.ComputeHash(bytes);
var output = new byte[checked(length - 1 + 1)]; var output = new byte[length];
array.CopyTo(output, 0); var lowerLength = Math.Min(array.Length, output.Length);
return array; for (int i = 0; i < lowerLength; i++)
output[i] = array[i];
return output;
} }
private string EncryptData(string plaintext) private string EncryptData(string plaintext)
@@ -63,7 +66,7 @@ namespace Pilz.Cryptography
public string Encrypt(string plainValue) public string Encrypt(string plainValue)
{ {
return EncryptData(plainValue); return EncryptData(plainValue ?? string.Empty);
} }
public string Decrypt(string encryptedValue) public string Decrypt(string encryptedValue)