Add +https directive to urlskip= option

When present, the `+https` directive will force the protocol of the resulting URL to be `https:`. Related feedback: uBlockOrigin/uBlock-issues#3206 (comment)
gorhill · Sep 20, 2024 · 59487b1 · 59487b1
1 parent 4f181b0
commit 59487b1
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
@@ -5424,13 +5424,25 @@ function urlSkip(urlin, steps) {
     try {
         let urlout;
         for ( const step of steps ) {
-            if ( step.startsWith('?') === false ) { return; }
-            urlout = (new URL(urlin)).searchParams.get(step.slice(1));
-            if ( urlout === null ) { return; }
-            if ( urlout.includes(' ') ) {
-                urlout = urlout.replace(/ /g, '%20');
+            // Extract from URL parameter
+            if ( step.startsWith('?') ) {
+                urlout = (new URL(urlin)).searchParams.get(step.slice(1));
+                if ( urlout === null ) { return; }
+                if ( urlout.includes(' ') ) {
+                    urlout = urlout.replace(/ /g, '%20');
+                }
+                urlin = urlout;
+                continue;
             }
-            urlin = urlout;
+            // Enforce https
+            if ( step === '+https' ) {
+                const s = urlin.replace(/^https?:\/\//, '');
+                if ( /^[\w-]:\/\//.test(s) ) { return; }
+                urlin = urlout = `https://${s}`;
+                continue;
+            }
+            // Unknown directive
+            return;
         }
         void new URL(urlout);
         return urlout;