Encrypt Discord token at rest in settings file (machine-bound) (#1491)

* Initial plan * Add token encryption when saving/loading settings Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Apply suggestion from @Tyrrrz * Apply suggestion from @Tyrrrz * Bind token encryption key to machine identity Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Switch to AES-GCM, hex encoding, and GetBytes/Fill improvements Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Address all review feedback: salt injection, code style, localization formatting Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Address latest review: ThisAssembly.Project, EnvironmentExtensions, inline Lazy, renames, localization wording Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Address latest review: layout comment, cipherSource, else block, MachineName fallback, csproj ordering Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Apply suggestion from @Tyrrrz * Rename GetMachineId→TryGetMachineId, refactor Write to use single array with FillBytes Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Rename cipherSource→cipher in Read(), tokenBytes→tokenData in Write(), update layout comments Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Add cipherSource variable in Write(), update layout comment with size annotation Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Fix CSharpier formatting: inline multiline string assignments and reformat exception filter Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Quote EncryptionSalt argument to handle single quotes in secret value Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Revert double-quote fix on EncryptionSalt argument Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> * Apply suggestion from @Tyrrrz * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-03-16 20:02:42 +00:00 · 2026-02-27 14:01:25 +02:00
parent 2e47c73388
commit eef0fc742d
11 changed files with 177 additions and 10 deletions
--- a/DiscordChatExporter.Gui/Utils/Extensions/EnvironmentExtensions.cs
+++ b/DiscordChatExporter.Gui/Utils/Extensions/EnvironmentExtensions.cs
@@ -0,0 +1,54 @@
+using System;
+using System.IO;
+
+namespace DiscordChatExporter.Gui.Utils.Extensions;
+
+internal static class EnvironmentExtensions
+{
+    extension(Environment)
+    {
+        public static string? TryGetMachineId()
+        {
+            // Windows: stable GUID written during OS installation
+            if (OperatingSystem.IsWindows())
+            {
+                try
+                {
+                    using var regKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(
+                        @"SOFTWARE\Microsoft\Cryptography"
+                    );
+                    if (
+                        regKey?.GetValue("MachineGuid") is string guid
+                        && !string.IsNullOrWhiteSpace(guid)
+                    )
+                        return guid;
+                }
+                catch { }
+            }
+            else
+            {
+                // Unix: /etc/machine-id (set once by systemd at first boot)
+                foreach (var path in new[] { "/etc/machine-id", "/var/lib/dbus/machine-id" })
+                {
+                    try
+                    {
+                        var id = File.ReadAllText(path).Trim();
+                        if (!string.IsNullOrWhiteSpace(id))
+                            return id;
+                    }
+                    catch { }
+                }
+            }
+
+            // Last-resort fallback
+            try
+            {
+                return Environment.MachineName;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}