calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-04-26 16:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve, clean up encryption

Browse Source
This commit is contained in:
Tyrrrz
2026-02-27 14:57:15 +02:00
parent 21c2398e2a
commit d490fd0a38
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
DiscordChatExporter.Gui/Services/SettingsService.TokenEncryptionConverter.cs
View File

@@ -17,9 +17,9 @@ public partial class SettingsService
Rfc2898DeriveBytes.Pbkdf2( Rfc2898DeriveBytes.Pbkdf2(
Encoding.UTF8.GetBytes(Environment.TryGetMachineId() ?? string.Empty), Encoding.UTF8.GetBytes(Environment.TryGetMachineId() ?? string.Empty),
Encoding.UTF8.GetBytes(ThisAssembly.Project.EncryptionSalt), Encoding.UTF8.GetBytes(ThisAssembly.Project.EncryptionSalt),
iterations: 10_000, 600_000,
HashAlgorithmName.SHA256, HashAlgorithmName.SHA256,
outputLength: 16 16
) )
); );
@@ -31,30 +31,31 @@ public partial class SettingsService
{ {
var value = reader.GetString(); var value = reader.GetString();
// No prefix means the token is stored as plain text, which was // No prefix means the token is stored as plain text, which was the case for older
// the case for older versions of the application. // versions of the application. Load it as is and encrypt it on next save.
// Load it as is and encrypt it on next save.
if ( if (
string.IsNullOrWhiteSpace(value) string.IsNullOrWhiteSpace(value)
|| !value.StartsWith(Prefix, StringComparison.Ordinal) || !value.StartsWith(Prefix, StringComparison.Ordinal)
) )
{
return value; return value;
}
try try
{ {
var data = Convert.FromHexString(value[Prefix.Length..]); var encryptedData = Convert.FromHexString(value[Prefix.Length..]);
var tokenData = new byte[encryptedData.AsSpan(28).Length];
// Layout: nonce (12 bytes) | paddingLength (1 byte) | tag (16 bytes) | cipher // Layout: nonce (12 bytes) | tag (16 bytes) | cipher
var nonce = data.AsSpan(0, 12);
var paddingLength = data[12];
var tag = data.AsSpan(13, 16);
var cipher = data.AsSpan(29);
var decrypted = new byte[cipher.Length];
using var aes = new AesGcm(Key.Value, 16); using var aes = new AesGcm(Key.Value, 16);
aes.Decrypt(nonce, cipher, tag, decrypted); aes.Decrypt(
encryptedData.AsSpan(0, 12),
encryptedData.AsSpan(28),
encryptedData.AsSpan(12, 16),
tokenData
);
return Encoding.UTF8.GetString(decrypted.AsSpan(paddingLength)); return Encoding.UTF8.GetString(tokenData);
} }
catch (Exception ex) catch (Exception ex)
when (ex when (ex
@@ -80,28 +81,22 @@ public partial class SettingsService
return; return;
} }
var paddingLength = RandomNumberGenerator.GetInt32(1, 17);
var tokenData = Encoding.UTF8.GetBytes(value); var tokenData = Encoding.UTF8.GetBytes(value);
var encryptedData = new byte[28 + tokenData.Length];
// Layout: nonce (12 bytes) | paddingLength (1 byte) | tag (16 bytes) | cipher (paddingLength + tokenData.Length)
var data = new byte[29 + paddingLength + tokenData.Length];
// Nonce // Nonce
RandomNumberGenerator.Fill(data.AsSpan(0, 12)); RandomNumberGenerator.Fill(encryptedData.AsSpan(0, 12));
// Padding length
data[12] = (byte)paddingLength;
// Padding
RandomNumberGenerator.Fill(data.AsSpan(29, paddingLength));
// Token data
tokenData.CopyTo(data.AsSpan(29 + paddingLength));
// Layout: nonce (12 bytes) | tag (16 bytes) | cipher
using var aes = new AesGcm(Key.Value, 16); using var aes = new AesGcm(Key.Value, 16);
aes.Encrypt(data.AsSpan(0, 12), data.AsSpan(29), data.AsSpan(29), data.AsSpan(13, 16)); aes.Encrypt(
encryptedData.AsSpan(0, 12),
tokenData,
encryptedData.AsSpan(28),
encryptedData.AsSpan(12, 16)
);
writer.WriteStringValue(Prefix + Convert.ToHexStringLower(data)); writer.WriteStringValue(Prefix + Convert.ToHexStringLower(encryptedData));
} }
} }
} }