+
+
+
+
+
+
diff --git a/src/js/messaging.js b/src/js/messaging.js
index d35a1347e..7cb5380f2 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -1884,7 +1884,11 @@ const onMessage = function(request, sender, callback) {
listPromises.push(
io.get(assetKey, { dontCache: true }).then(details => {
listNames.push(assetKey);
- return { name: assetKey, text: details.content };
+ return {
+ name: assetKey,
+ text: details.content,
+ trustedSource: assetKey.startsWith('ublock-'),
+ };
})
);
}
diff --git a/src/js/static-dnr-filtering.js b/src/js/static-dnr-filtering.js
index d3e7732a6..636390065 100644
--- a/src/js/static-dnr-filtering.js
+++ b/src/js/static-dnr-filtering.js
@@ -284,6 +284,7 @@ function addToDNR(context, list) {
toDNR: true,
nativeCssHas: env.includes('native_css_has'),
badTypes: [ sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE ],
+ trustedSource: list.trustedSource || undefined,
});
const compiler = staticNetFilteringEngine.createCompiler();
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
index f4769c2c2..f084180ff 100644
--- a/src/js/static-net-filtering.js
+++ b/src/js/static-net-filtering.js
@@ -28,6 +28,7 @@ import BidiTrieContainer from './biditrie.js';
import { CompiledListReader } from './static-filtering-io.js';
import { FilteringContext } from './filtering-context.js';
import HNTrieContainer from './hntrie.js';
+import { urlSkip } from './urlskip.js';
/******************************************************************************/
@@ -4679,6 +4680,25 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
dnrAddRuleError(rule, `Incompatible with DNR: uritransform=${rule.__modifierValue}`);
break;
}
+ case 'urlskip': {
+ let urlFilter = rule.condition?.urlFilter;
+ if ( urlFilter === undefined ) { break; }
+ let anchor = 0b000;
+ if ( urlFilter.startsWith('||') ) {
+ anchor |= 0b100;
+ urlFilter = urlFilter.slice(2);
+ } else if ( urlFilter.startsWith('|') ) {
+ anchor |= 0b10;
+ urlFilter = urlFilter.slice(1);
+ }
+ if ( urlFilter.endsWith('|') ) {
+ anchor |= 0b001;
+ urlFilter = urlFilter.slice(0, -1);
+ }
+ rule.condition.urlFilter = undefined;
+ rule.condition.regexFilter = restrFromGenericPattern(urlFilter, anchor);
+ break;
+ }
default:
dnrAddRuleError(rule, `Unsupported modifier ${rule.__modifierType}`);
break;
@@ -5391,57 +5411,6 @@ StaticNetFilteringEngine.prototype.transformRequest = function(fctxt, out = [])
return out;
};
-/**
- * @trustedOption urlskip
- *
- * @description
- * Extract a URL from another URL according to one or more transformation steps,
- * thereby skipping over intermediate network request(s) to remote servers.
- * Requires a trusted source.
- *
- * @param steps
- * A serie of space-separated directives representing the transformation steps
- * to perform to extract the final URL to which a network request should be
- * redirected.
- *
- * Supported directives:
- *
- * `?name`: extract the value of parameter `name` as the current string.
- *
- * `&i`: extract the name of the parameter at position `i` as the current
- * string. The position is 1-based.
- *
- * `/.../`: extract the first capture group of a regex as the current string.
- *
- * `+https`: prepend the current string with `https://`.
- *
- * `-base64`: decode the current string as a base64-encoded string.
- *
- * `-safebase64`: decode the current string as a safe base64-encoded string.
- *
- * `-uricomponent`: decode the current string as a URI encoded string.
- *
- * `-blocked`: allow the redirection of blocked requests. By default, blocked
- * requests can't by urlskip'ed.
- *
- * At any given step, the currently extracted string may not necessarily be
- * a valid URL, and more transformation steps may be needed to obtain a valid
- * URL once all the steps are applied.
- *
- * An unsupported step or a failed step will abort the transformation and no
- * redirection will be performed.
- *
- * The final step is expected to yield a valid URL. If the result is not a
- * valid URL, no redirection will be performed.
- *
- * @example
- * ||example.com/path/to/tracker$urlskip=?url
- * ||example.com/path/to/tracker$urlskip=?url ?to
- * ||pixiv.net/jump.php?$urlskip=&1
- * ||podtrac.com/pts/redirect.mp3/$urlskip=/\/redirect\.mp3\/(.*?\.mp3\b)/ +https
- *
- * */
-
StaticNetFilteringEngine.prototype.urlSkip = function(
fctxt,
blocked,
@@ -5458,7 +5427,7 @@ StaticNetFilteringEngine.prototype.urlSkip = function(
const urlin = fctxt.url;
const value = directive.value;
const steps = value.includes(' ') && value.split(/ +/) || [ value ];
- const urlout = urlSkip(directive, urlin, blocked, steps);
+ const urlout = urlSkip(urlin, blocked, steps, directive);
if ( urlout === undefined ) { continue; }
if ( urlout === urlin ) { continue; }
fctxt.redirectURL = urlout;
@@ -5469,91 +5438,6 @@ StaticNetFilteringEngine.prototype.urlSkip = function(
return out;
};
-function urlSkip(directive, url, blocked, steps) {
- try {
- let redirectBlocked = false;
- let urlout = url;
- for ( const step of steps ) {
- const urlin = urlout;
- const c0 = step.charCodeAt(0);
- // Extract from URL parameter name at position i
- if ( c0 === 0x26 ) { // &
- const i = (parseInt(step.slice(1)) || 0) - 1;
- if ( i < 0 ) { return; }
- const url = new URL(urlin);
- if ( i >= url.searchParams.size ) { return; }
- const params = Array.from(url.searchParams.keys());
- urlout = decodeURIComponent(params[i]);
- continue;
- }
- // Enforce https
- if ( c0 === 0x2B && step === '+https' ) {
- const s = urlin.replace(/^https?:\/\//, '');
- if ( /^[\w-]:\/\//.test(s) ) { return; }
- urlout = `https://${s}`;
- continue;
- }
- // Decode
- if ( c0 === 0x2D ) {
- // Base64
- if ( step === '-base64' ) {
- urlout = self.atob(urlin);
- continue;
- }
- // Safe Base64
- if ( step === '-safebase64' ) {
- urlout = urlin.replace(/[-_]/g, safeBase64Replacer);
- urlout = self.atob(urlout);
- continue;
- }
- // URI component
- if ( step === '-uricomponent' ) {
- urlout = self.decodeURIComponent(urlin);
- continue;
- }
- // Enable skip of blocked requests
- if ( step === '-blocked' ) {
- redirectBlocked = true;
- continue;
- }
- }
- // Regex extraction from first capture group
- if ( c0 === 0x2F ) { // /
- if ( directive.cache === null ) {
- directive.cache = new RegExp(step.slice(1, -1));
- }
- const match = directive.cache.exec(urlin);
- if ( match === null ) { return; }
- if ( match.length <= 1 ) { return; }
- urlout = match[1];
- continue;
- }
- // Extract from URL parameter
- if ( c0 === 0x3F ) { // ?
- urlout = (new URL(urlin)).searchParams.get(step.slice(1));
- if ( urlout === null ) { return; }
- if ( urlout.includes(' ') ) {
- urlout = urlout.replace(/ /g, '%20');
- }
- continue;
- }
- // Unknown directive
- return;
- }
- const urlfinal = new URL(urlout);
- if ( urlfinal.protocol !== 'https:' ) {
- if ( urlfinal.protocol !== 'http:' ) { return; }
- urlout = urlout.replace('http', 'https');
- }
- if ( blocked && redirectBlocked !== true ) { return; }
- return urlout;
- } catch(x) {
- }
-}
-
-const safeBase64Map = { '-': '+', '_': '/' };
-const safeBase64Replacer = s => safeBase64Map[s];
-
/******************************************************************************/
// https://github.com/uBlockOrigin/uBlock-issues/issues/1626
diff --git a/src/js/urlskip.js b/src/js/urlskip.js
new file mode 100644
index 000000000..e4182bbc4
--- /dev/null
+++ b/src/js/urlskip.js
@@ -0,0 +1,157 @@
+/*******************************************************************************
+
+ uBlock Origin - a comprehensive, efficient content blocker
+ Copyright (C) 2022-present Raymond Hill
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see {http://www.gnu.org/licenses/}.
+
+ Home: https://github.com/gorhill/uBlock
+*/
+
+const safeBase64Map = { '-': '+', '_': '/' };
+const safeBase64Replacer = s => safeBase64Map[s];
+
+/**
+ * @trustedOption urlskip
+ *
+ * @description
+ * Extract a URL from another URL according to one or more transformation steps,
+ * thereby skipping over intermediate network request(s) to remote servers.
+ * Requires a trusted source.
+ *
+ * @param steps
+ * A serie of space-separated directives representing the transformation steps
+ * to perform to extract the final URL to which a network request should be
+ * redirected.
+ *
+ * Supported directives:
+ *
+ * `?name`: extract the value of parameter `name` as the current string.
+ *
+ * `&i`: extract the name of the parameter at position `i` as the current
+ * string. The position is 1-based.
+ *
+ * `/.../`: extract the first capture group of a regex as the current string.
+ *
+ * `+https`: prepend the current string with `https://`.
+ *
+ * `-base64`: decode the current string as a base64-encoded string.
+ *
+ * `-safebase64`: decode the current string as a safe base64-encoded string.
+ *
+ * `-uricomponent`: decode the current string as a URI encoded string.
+ *
+ * `-blocked`: allow the redirection of blocked requests. By default, blocked
+ * requests can't by urlskip'ed.
+ *
+ * At any given step, the currently extracted string may not necessarily be
+ * a valid URL, and more transformation steps may be needed to obtain a valid
+ * URL once all the steps are applied.
+ *
+ * An unsupported step or a failed step will abort the transformation and no
+ * redirection will be performed.
+ *
+ * The final step is expected to yield a valid URL. If the result is not a
+ * valid URL, no redirection will be performed.
+ *
+ * @example
+ * ||example.com/path/to/tracker$urlskip=?url
+ * ||example.com/path/to/tracker$urlskip=?url ?to
+ * ||pixiv.net/jump.php?$urlskip=&1
+ * ||podtrac.com/pts/redirect.mp3/$urlskip=/\/redirect\.mp3\/(.*?\.mp3\b)/ +https
+ *
+ * */
+
+export function urlSkip(url, blocked, steps, directive = {}) {
+ try {
+ let redirectBlocked = false;
+ let urlout = url;
+ for ( const step of steps ) {
+ const urlin = urlout;
+ const c0 = step.charCodeAt(0);
+ // Extract from URL parameter name at position i
+ if ( c0 === 0x26 ) { // &
+ const i = (parseInt(step.slice(1)) || 0) - 1;
+ if ( i < 0 ) { return; }
+ const url = new URL(urlin);
+ if ( i >= url.searchParams.size ) { return; }
+ const params = Array.from(url.searchParams.keys());
+ urlout = decodeURIComponent(params[i]);
+ continue;
+ }
+ // Enforce https
+ if ( c0 === 0x2B && step === '+https' ) {
+ const s = urlin.replace(/^https?:\/\//, '');
+ if ( /^[\w-]:\/\//.test(s) ) { return; }
+ urlout = `https://${s}`;
+ continue;
+ }
+ // Decode
+ if ( c0 === 0x2D ) {
+ // Base64
+ if ( step === '-base64' ) {
+ urlout = self.atob(urlin);
+ continue;
+ }
+ // Safe Base64
+ if ( step === '-safebase64' ) {
+ urlout = urlin.replace(/[-_]/g, safeBase64Replacer);
+ urlout = self.atob(urlout);
+ continue;
+ }
+ // URI component
+ if ( step === '-uricomponent' ) {
+ urlout = self.decodeURIComponent(urlin);
+ continue;
+ }
+ // Enable skip of blocked requests
+ if ( step === '-blocked' ) {
+ redirectBlocked = true;
+ continue;
+ }
+ }
+ // Regex extraction from first capture group
+ if ( c0 === 0x2F ) { // /
+ const re = directive.cache ?? new RegExp(step.slice(1, -1));
+ if ( directive.cache === null ) {
+ directive.cache = re;
+ }
+ const match = re.exec(urlin);
+ if ( match === null ) { return; }
+ if ( match.length <= 1 ) { return; }
+ urlout = match[1];
+ continue;
+ }
+ // Extract from URL parameter
+ if ( c0 === 0x3F ) { // ?
+ urlout = (new URL(urlin)).searchParams.get(step.slice(1));
+ if ( urlout === null ) { return; }
+ if ( urlout.includes(' ') ) {
+ urlout = urlout.replace(/ /g, '%20');
+ }
+ continue;
+ }
+ // Unknown directive
+ return;
+ }
+ const urlfinal = new URL(urlout);
+ if ( urlfinal.protocol !== 'https:' ) {
+ if ( urlfinal.protocol !== 'http:' ) { return; }
+ urlout = urlout.replace('http', 'https');
+ }
+ if ( blocked && redirectBlocked !== true ) { return; }
+ return urlout;
+ } catch(x) {
+ }
+}
diff --git a/tools/make-mv3.sh b/tools/make-mv3.sh
index 287a7b08b..5c812ec21 100755
--- a/tools/make-mv3.sh
+++ b/tools/make-mv3.sh
@@ -76,6 +76,7 @@ cp "$UBO_DIR"/src/css/fa-icons.css "$DES"/css/
cp "$UBO_DIR"/src/js/dom.js "$DES"/js/
cp "$UBO_DIR"/src/js/fa-icons.js "$DES"/js/
cp "$UBO_DIR"/src/js/i18n.js "$DES"/js/
+cp "$UBO_DIR"/src/js/urlskip.js "$DES"/js/
cp "$UBO_DIR"/src/lib/punycode.js "$DES"/js/
cp -R "$UBO_DIR/src/img/flags-of-the-world" "$DES"/img
diff --git a/tools/make-nodejs.sh b/tools/make-nodejs.sh
index 87e96ddad..ed8db6cbb 100755
--- a/tools/make-nodejs.sh
+++ b/tools/make-nodejs.sh
@@ -22,6 +22,7 @@ cp src/js/static-net-filtering.js $DES/js
cp src/js/static-filtering-io.js $DES/js
cp src/js/tasks.js $DES/js
cp src/js/text-utils.js $DES/js
+cp src/js/urlskip.js $DES/js
cp src/js/uri-utils.js $DES/js
cp src/js/url-net-filtering.js $DES/js