From 776b127f736a1572eb56d40280f1e11d3fa841b2 Mon Sep 17 00:00:00 2001
From: Kenneth Skovhede <kenneth@hexad.dk>
Date: Mon, 4 Nov 2024 16:03:51 +0100
Subject: [PATCH] Added test to check that URL replacement is done correctly

---
 .../UnitTest/SecretProviderHelperTests.cs     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/Duplicati/UnitTest/SecretProviderHelperTests.cs b/Duplicati/UnitTest/SecretProviderHelperTests.cs
index 54fbdb968..483a36342 100644
--- a/Duplicati/UnitTest/SecretProviderHelperTests.cs
+++ b/Duplicati/UnitTest/SecretProviderHelperTests.cs
@@ -133,6 +133,36 @@ public class SecretProviderHelperTests : BasicSetupHelper
         Assert.AreEqual("test://host?pass=secret2&user=secret1&other=123", argsInternal[0].ToString());
     }
 
+    [Test]
+    [Category("SecretHelper")]
+    public void ReplacesSecretsWithUrlEscaping()
+    {
+        var secretProvider = new MockedSecretProvider();
+        secretProvider.Secrets["key1"] = "secret 1%&+abc";
+
+        var settings = new Dictionary<string, string>
+        {
+            {"key1", "$key1"}
+        };
+
+        var argsSys = new[] {
+            new System.Uri("test://host/?pass=$key1&user=user")
+        };
+
+        var argsInternal = new[] {
+            new Library.Utility.Uri("test://host?pass=$key1&user=user")
+        };
+
+        SecretProviderHelper.ApplySecretProviderAsync(argsSys, argsInternal, settings, null, secretProvider, CancellationToken.None).Await();
+
+        // Check no escaping is done for options
+        Assert.AreEqual("secret 1%&+abc", settings["key1"]);
+
+        // Check escaping is done for the URL
+        Assert.AreEqual("test://host/?pass=secret%201%25%26%2Babc&user=user", argsSys[0].ToString());
+        Assert.AreEqual("test://host?pass=secret%201%25%26%2Babc&user=user", argsInternal[0].ToString());
+    }
+
     [Test]
     [Category("SecretHelper")]
     public void ReplaceSecretsWithExtendedPattern()