Merge pull request #3403 from shamazmazum/fix-reduce-tracking-mode

source/changelog.lisp

@@ -99,7 +99,10 @@ elements are scaled accordingly.")
 (define-version "3.11.7"
   (:nsection :title "Bug fixes"
     (:ul
-     (:li "Fix query handling when invoking command" (:nxref :command 'set-url) "."))))
+     (:li "Fix query handling when invoking command" (:nxref :command 'set-url) ".")
+     (:li "Fix incorrect redirection when "
+          (:nxref :class-name 'nyxt/mode/reduce-tracking:reduce-tracking-mode)
+          " is enabled."))))
 
 (define-version "3.11.6"
   (:nsection :title "Bug fixes"

source/mode/reduce-tracking.lisp

@@ -59,12 +59,19 @@ still being less noticeable in the crowd.")
 (defun strip-tracking-parameters (request-data)
   (let ((mode (find-submode 'reduce-tracking-mode)))
     (when (and mode (not (uiop:emptyp (quri:uri-query (url request-data)))))
-      (setf (quri:uri-query-params (url request-data))
+      ;; Some symbols like : or / are only percent-encoded when they
+      ;; have a special meaning. It is not uncommon to have a link like
+      ;; https://example.com/foo?query=bar&redirect=https://foobar.com
+      ;; The URL in `redirect` part must not be percent encoded.
+      ;; For this purpose we do not alter percent encoding here.
+      (setf (quri:uri-query-params (url request-data) :percent-encode nil)
             (remove-if (rcurry #'member (query-tracking-parameters mode)
                                           :test #'string-equal)
-                       (quri:url-decode-params (quri:uri-query (url request-data)) :lenient t)
-                       :key #'first)))
-    request-data))
+                       (quri:url-decode-params (quri:uri-query (url request-data))
+                                               :lenient t
+                                               :percent-decode nil)
+                       :key #'first))))
+  request-data)
 
 (defmethod enable ((mode reduce-tracking-mode) &key)
   (setf (old-timezone mode) (uiop:getenv "TZ")

tests/offline/mode/reduce-tracking.lisp

@@ -4,9 +4,16 @@
 (in-package :nyxt/tests)
 
 (define-test toggle-reduce-tracking-mode ()
-  (let ((buffer (make-instance 'network-and-modable-buffer)))
+  (let ((buffer (make-instance 'network-and-modable-buffer))
+        (url-pre (quri:uri "https://example.com/query?foo=bar&twclid=1&redirect=https://example.org/foo&s_cid=123"))
+        (url-post (quri:uri "https://example.com/query?foo=bar&redirect=https://example.org/foo")))
     (with-current-buffer buffer
       (assert-true (enable-modes* 'nyxt/mode/reduce-tracking:reduce-tracking-mode
                                   buffer))
+      (assert-equality #'quri:uri=
+                       url-post
+                       (url (nhooks:run-hook (request-resource-hook buffer)
+                                             (make-instance 'request-data
+                                                            :url url-pre))))
       (assert-true (disable-modes* 'nyxt/mode/reduce-tracking:reduce-tracking-mode
                                    buffer)))))