From d38b28b57b88e865b580f0d5e33310631f13e62c Mon Sep 17 00:00:00 2001
From: Alisson Lauffer <alissonvitortc@gmail.com>
Date: Sun, 28 Jul 2024 16:23:59 -0300
Subject: [PATCH] LibWeb: Replace "+" in value with a space while decoding
 search params

---
 .../expected/URL/search-params-with-plus-in-value.txt  |  2 ++
 .../input/URL/search-params-with-plus-in-value.html    | 10 ++++++++++
 Userland/Libraries/LibWeb/DOMURL/URLSearchParams.cpp   |  3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 Tests/LibWeb/Text/expected/URL/search-params-with-plus-in-value.txt
 create mode 100644 Tests/LibWeb/Text/input/URL/search-params-with-plus-in-value.html

diff --git a/Tests/LibWeb/Text/expected/URL/search-params-with-plus-in-value.txt b/Tests/LibWeb/Text/expected/URL/search-params-with-plus-in-value.txt
new file mode 100644
index 00000000000..b7b035f004f
--- /dev/null
+++ b/Tests/LibWeb/Text/expected/URL/search-params-with-plus-in-value.txt
@@ -0,0 +1,2 @@
+key 'key'
+value 'value1 value2'
diff --git a/Tests/LibWeb/Text/input/URL/search-params-with-plus-in-value.html b/Tests/LibWeb/Text/input/URL/search-params-with-plus-in-value.html
new file mode 100644
index 00000000000..3f5fa015847
--- /dev/null
+++ b/Tests/LibWeb/Text/input/URL/search-params-with-plus-in-value.html
@@ -0,0 +1,10 @@
+<script src="../include.js"></script>
+<script>
+    test(() => {
+        const params = new URLSearchParams('key=value1+value2');
+        for (const [key, value] of params) {
+            println(`key '${key}'`);
+            println(`value '${value}'`);
+        }
+    });
+</script>
diff --git a/Userland/Libraries/LibWeb/DOMURL/URLSearchParams.cpp b/Userland/Libraries/LibWeb/DOMURL/URLSearchParams.cpp
index cb8452b882d..62e0863a1f9 100644
--- a/Userland/Libraries/LibWeb/DOMURL/URLSearchParams.cpp
+++ b/Userland/Libraries/LibWeb/DOMURL/URLSearchParams.cpp
@@ -113,10 +113,11 @@ ErrorOr<Vector<QueryParam>> url_decode(StringView input)
 
         // 4. Replace any 0x2B (+) in name and value with 0x20 (SP).
         auto space_decoded_name = name.replace("+"sv, " "sv, ReplaceMode::All);
+        auto space_decoded_value = value.replace("+"sv, " "sv, ReplaceMode::All);
 
         // 5. Let nameString and valueString be the result of running UTF-8 decode without BOM on the percent-decoding of name and value, respectively.
         auto name_string = String::from_utf8_with_replacement_character(URL::percent_decode(space_decoded_name));
-        auto value_string = String::from_utf8_with_replacement_character(URL::percent_decode(value));
+        auto value_string = String::from_utf8_with_replacement_character(URL::percent_decode(space_decoded_value));
 
         TRY(output.try_empend(move(name_string), move(value_string)));
     }