@browserless.io/browserless 2.20.2 → 2.21.1

package/extensions/ublock/js/background.js

@@ -59,15 +59,15 @@ const hiddenSettingsDefault = {
     cnameIgnore1stParty: true,
     cnameIgnoreExceptions: true,
     cnameIgnoreRootDocument: true,
-    cnameMaxTTL: 120,
     cnameReplayFullURL: false,
-    cnameUncloakProxied: false,
     consoleLogLevel: 'unset',
     debugAssetsJson: false,
     debugScriptlets: false,
     debugScriptletInjector: false,
     differentialUpdate: true,
     disableWebAssembly: false,
+    dnsCacheTTL: 600,
+    dnsResolveEnabled: true,
     extensionUpdateForceReload: false,
     filterAuthorMode: false,
     loggerPopupType: 'popup',
@@ -306,6 +306,7 @@ const µBlock = {  // jshint ignore:line
         this.realm = '';
         this.setMethod(details.method);
         this.setURL(details.url);
+        this.setIPAddress(details.ip);
         this.aliasURL = details.aliasURL || undefined;
         this.redirectURL = undefined;
         this.filter = undefined;
@@ -346,7 +347,7 @@ const µBlock = {  // jshint ignore:line
             this.setDocOrigin(origin).setTabOrigin(origin);
             return this;
         }
-        const origin = (this.itype & this.FRAME_ANY) !== 0
+        const origin = this.isDocument()
             ? originFromURI(this.url)
             : this.tabOrigin;
         this.setDocOrigin(origin).setTabOrigin(origin);

package/extensions/ublock/js/benchmarks.js

@@ -19,26 +19,22 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
-/******************************************************************************/
-
-import cosmeticFilteringEngine from './cosmetic-filtering.js';
-import io from './assets.js';
-import scriptletFilteringEngine from './scriptlet-filtering.js';
-import staticNetFilteringEngine from './static-net-filtering.js';
-import µb from './background.js';
-import webRequest from './traffic.js';
-import { FilteringContext } from './filtering-context.js';
-import { LineIterator } from './text-utils.js';
-import { sessionFirewall } from './filtering-engines.js';
-
 import {
     domainFromHostname,
     entityFromDomain,
     hostnameFromURI,
 } from './uri-utils.js';
 
+import { FilteringContext } from './filtering-context.js';
+import { LineIterator } from './text-utils.js';
+import cosmeticFilteringEngine from './cosmetic-filtering.js';
+import io from './assets.js';
+import scriptletFilteringEngine from './scriptlet-filtering.js';
+import { sessionFirewall } from './filtering-engines.js';
+import { default as sfne } from './static-net-filtering.js';
+import webRequest from './traffic.js';
+import µb from './background.js';
+
 /******************************************************************************/
 
 // The requests.json.gz file can be downloaded from:
@@ -134,8 +130,6 @@ const loadBenchmarkDataset = (( ) => {
 
 /******************************************************************************/
 
-// action: 1=test
-
 export async function benchmarkStaticNetFiltering(options = {}) {
     const { target, redirectEngine } = options;
 
@@ -155,13 +149,13 @@ export async function benchmarkStaticNetFiltering(options = {}) {
         fctxt.setURL(request.url);
         fctxt.setDocOriginFromURL(request.frameUrl);
         fctxt.setType(request.cpt);
-        const r = staticNetFilteringEngine.matchRequest(fctxt);
+        const r = sfne.matchRequest(fctxt);
         console.info(`Result=${r}:`);
         console.info(`\ttype=${fctxt.type}`);
         console.info(`\turl=${fctxt.url}`);
         console.info(`\tdocOrigin=${fctxt.getDocOrigin()}`);
         if ( r !== 0 ) {
-            console.info(staticNetFilteringEngine.toLogData());
+            console.info(sfne.toLogData());
         }
         return;
     }
@@ -178,39 +172,45 @@ export async function benchmarkStaticNetFiltering(options = {}) {
     for ( let i = 0; i < requests.length; i++ ) {
         const request = requests[i];
         fctxt.setURL(request.url);
+        if ( fctxt.getIPAddress() === '' ) {
+            fctxt.setIPAddress('93.184.215.14\n2606:2800:21f:cb07:6820:80da:af6b:8b2c');
+        }
         fctxt.setDocOriginFromURL(request.frameUrl);
         fctxt.setType(request.cpt);
-        staticNetFilteringEngine.redirectURL = undefined;
-        const r = staticNetFilteringEngine.matchRequest(fctxt);
+        sfne.redirectURL = undefined;
+        const r = sfne.matchRequest(fctxt);
         matchCount += 1;
         if ( r === 1 ) { blockCount += 1; }
         else if ( r === 2 ) { allowCount += 1; }
         if ( r !== 1 ) {
-            if ( staticNetFilteringEngine.transformRequest(fctxt) ) {
+            if ( sfne.transformRequest(fctxt) ) {
                 redirectCount += 1;
             }
-            if ( fctxt.redirectURL !== undefined && staticNetFilteringEngine.hasQuery(fctxt) ) {
-                if ( staticNetFilteringEngine.filterQuery(fctxt, 'removeparam') ) {
+            if ( fctxt.redirectURL !== undefined && sfne.hasQuery(fctxt) ) {
+                if ( sfne.filterQuery(fctxt, 'removeparam') ) {
                     removeparamCount += 1;
                 }
             }
             if ( fctxt.type === 'main_frame' || fctxt.type === 'sub_frame' ) {
-                if ( staticNetFilteringEngine.matchAndFetchModifiers(fctxt, 'csp') ) {
+                if ( sfne.matchAndFetchModifiers(fctxt, 'csp') ) {
                     cspCount += 1;
                 }
-                if ( staticNetFilteringEngine.matchAndFetchModifiers(fctxt, 'permissions') ) {
+                if ( sfne.matchAndFetchModifiers(fctxt, 'permissions') ) {
                     permissionsCount += 1;
                 }
             }
-            staticNetFilteringEngine.matchHeaders(fctxt, []);
-            if ( staticNetFilteringEngine.matchAndFetchModifiers(fctxt, 'replace') ) {
+            sfne.matchHeaders(fctxt, []);
+            if ( sfne.matchAndFetchModifiers(fctxt, 'replace') ) {
                 replaceCount += 1;
             }
         } else if ( redirectEngine !== undefined ) {
-            if ( staticNetFilteringEngine.redirectRequest(redirectEngine, fctxt) ) {
+            if ( sfne.redirectRequest(redirectEngine, fctxt) ) {
                 redirectCount += 1;
             }
         }
+        if ( fctxt.type === 'main_frame' ) {
+            sfne.matchAndFetchModifiers(fctxt, 'urlskip');
+        }
     }
     const t1 = performance.now();
     const dur = t1 - t0;
@@ -254,7 +254,7 @@ export async function tokenHistogramsfunction() {
         fctxt.setURL(request.url);
         fctxt.setDocOriginFromURL(request.frameUrl);
         fctxt.setType(request.cpt);
-        const r = staticNetFilteringEngine.matchRequest(fctxt);
+        const r = sfne.matchRequest(fctxt);
         for ( let [ keyword ] of request.url.toLowerCase().matchAll(reTokens) ) {
             const token = keyword.slice(0, 7);
             if ( r === 0 ) {

package/extensions/ublock/js/codemirror/ubo-static-filtering.js

@@ -189,6 +189,7 @@ const uBOStaticFilteringMode = (( ) => {
             mode.lastNetOptionType = nodeType;
             return 'def';
         case sfp.NODE_TYPE_NET_OPTION_ASSIGN:
+        case sfp.NODE_TYPE_NET_OPTION_QUOTE:
             return 'def';
         case sfp.NODE_TYPE_NET_OPTION_VALUE:
             if ( mode.astWalker.canGoDown() ) { break; }

package/extensions/ublock/js/contextmenu.js

@@ -19,12 +19,8 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
-/******************************************************************************/
-
-import µb from './background.js';
 import { i18n$ } from './i18n.js';
+import µb from './background.js';
 
 /******************************************************************************/
 
@@ -55,18 +51,23 @@ const onBlockElement = function(details, tab) {
     let src = details.frameUrl || details.srcUrl || details.linkUrl || '';
 
     if ( !tagName ) {
-        if ( typeof details.frameUrl === 'string' ) {
+        if ( typeof details.frameUrl === 'string' && details.frameId !== 0 ) {
             tagName = 'iframe';
+            src = details.srcUrl;
         } else if ( typeof details.srcUrl === 'string' ) {
             if ( details.mediaType === 'image' ) {
                 tagName = 'img';
+                src = details.srcUrl;
             } else if ( details.mediaType === 'video' ) {
                 tagName = 'video';
+                src = details.srcUrl;
             } else if ( details.mediaType === 'audio' ) {
                 tagName = 'audio';
+                src = details.srcUrl;
             }
         } else if ( typeof details.linkUrl === 'string' ) {
             tagName = 'a';
+            src = details.linkUrl;
         }
     }
 
@@ -200,27 +201,25 @@ let currentBits = 0;
 
 const update = function(tabId = undefined) {
     let newBits = 0;
-    if (
-        µb.userSettings.contextMenuEnabled &&
-        µb.userFiltersAreEnabled() &&
-        tabId !== undefined
-    ) {
-        const pageStore = µb.pageStoreFromTabId(tabId);
-        if ( pageStore && pageStore.getNetFilteringSwitch() ) {
-            if ( pageStore.shouldApplySpecificCosmeticFilters(0) ) {
-                newBits |= BLOCK_ELEMENT_BIT;
-            } else {
-                newBits |= BLOCK_RESOURCE_BIT;
+    if ( µb.userSettings.contextMenuEnabled ) {
+        const pageStore = tabId && µb.pageStoreFromTabId(tabId) || null;
+        if ( pageStore?.getNetFilteringSwitch() ) {
+            if ( µb.userFiltersAreEnabled() ) {
+                if ( pageStore.shouldApplySpecificCosmeticFilters(0) ) {
+                    newBits |= BLOCK_ELEMENT_BIT;
+                } else {
+                    newBits |= BLOCK_RESOURCE_BIT;
+                }
             }
             if ( pageStore.largeMediaCount !== 0 ) {
                 newBits |= TEMP_ALLOW_LARGE_MEDIA_BIT;
             }
         }
-        newBits |= SUBSCRIBE_TO_LIST_BIT;
-    }
-    if ( µb.hiddenSettings.filterAuthorMode ) {
-        newBits |= VIEW_SOURCE_BIT;
+        if ( µb.hiddenSettings.filterAuthorMode ) {
+            newBits |= VIEW_SOURCE_BIT;
+        }
     }
+    newBits |= SUBSCRIBE_TO_LIST_BIT;
     if ( newBits === currentBits ) { return; }
     currentBits = newBits;
     const usedEntries = [];

package/extensions/ublock/js/devtools.js

@@ -21,8 +21,7 @@
 
 /* global CodeMirror, uBlockDashboard */
 
-'use strict';
-
+import * as s14e from './s14e-serializer.js';
 import { dom, qs$ } from './dom.js';
 
 /******************************************************************************/
@@ -81,6 +80,100 @@ function log(text) {
     cmEditor.replaceRange(text.trim() + '\n\n', { line: 0, ch: 0 });
 }
 
+/******************************************************************************/
+
+function toDNRText(raw) {
+    const result = s14e.deserialize(raw);
+    if ( typeof result === 'string' ) { return result; }
+    const { network } = result;
+    const replacer = (k, v) => {
+        if ( k.startsWith('__') ) { return; }
+        if ( Array.isArray(v) ) {
+            return v.sort();
+        }
+        if ( v instanceof Object ) {
+            const sorted = {};
+            for ( const kk of Object.keys(v).sort() ) {
+                sorted[kk] = v[kk];
+            }
+            return sorted;
+        }
+        return v;
+    };
+    const isUnsupported = rule =>
+        rule._error !== undefined;
+    const isRegex = rule =>
+        rule.condition !== undefined &&
+        rule.condition.regexFilter !== undefined;
+    const isRedirect = rule =>
+        rule.action !== undefined &&
+        rule.action.type === 'redirect' &&
+        rule.action.redirect.extensionPath !== undefined;
+    const isCsp = rule =>
+        rule.action !== undefined &&
+        rule.action.type === 'modifyHeaders';
+    const isRemoveparam = rule =>
+        rule.action !== undefined &&
+        rule.action.type === 'redirect' &&
+        rule.action.redirect.transform !== undefined;
+    const { ruleset } = network;
+    const good = ruleset.filter(rule =>
+        isUnsupported(rule) === false &&
+        isRegex(rule) === false &&
+        isRedirect(rule) === false &&
+        isCsp(rule) === false &&
+        isRemoveparam(rule) === false
+    );
+    const unsupported = ruleset.filter(rule =>
+        isUnsupported(rule)
+    );
+    const regexes = ruleset.filter(rule =>
+        isUnsupported(rule) === false &&
+        isRegex(rule) &&
+        isRedirect(rule) === false &&
+        isCsp(rule) === false &&
+        isRemoveparam(rule) === false
+    );
+    const redirects = ruleset.filter(rule =>
+        isUnsupported(rule) === false &&
+        isRedirect(rule)
+    );
+    const headers = ruleset.filter(rule =>
+        isUnsupported(rule) === false &&
+        isCsp(rule)
+    );
+    const removeparams = ruleset.filter(rule =>
+        isUnsupported(rule) === false &&
+        isRemoveparam(rule)
+    );
+    const out = [
+        `dnrRulesetFromRawLists(${JSON.stringify(result.listNames, null, 2)})`,
+        `Run time: ${result.runtime} ms`,
+        `Filters count: ${network.filterCount}`,
+        `Accepted filter count: ${network.acceptedFilterCount}`,
+        `Rejected filter count: ${network.rejectedFilterCount}`,
+        `Un-DNR-able filter count: ${unsupported.length}`,
+        `Resulting DNR rule count: ${ruleset.length}`,
+    ];
+    out.push(`+ Good filters (${good.length}): ${JSON.stringify(good, replacer, 2)}`);
+    out.push(`+ Regex-based filters (${regexes.length}): ${JSON.stringify(regexes, replacer, 2)}`);
+    out.push(`+ 'redirect=' filters (${redirects.length}): ${JSON.stringify(redirects, replacer, 2)}`);
+    out.push(`+ 'csp=' filters (${headers.length}): ${JSON.stringify(headers, replacer, 2)}`);
+    out.push(`+ 'removeparam=' filters (${removeparams.length}): ${JSON.stringify(removeparams, replacer, 2)}`);
+    out.push(`+ Unsupported filters (${unsupported.length}): ${JSON.stringify(unsupported, replacer, 2)}`);
+    out.push(`+ generichide exclusions (${network.generichideExclusions.length}): ${JSON.stringify(network.generichideExclusions, replacer, 2)}`);
+    if ( result.specificCosmetic ) {
+        out.push(`+ Cosmetic filters: ${result.specificCosmetic.size}`);
+        for ( const details of result.specificCosmetic ) {
+            out.push(`    ${JSON.stringify(details)}`);
+        }
+    } else {
+        out.push('  Cosmetic filters: 0');
+    }
+    return out.join('\n');
+}
+
+
 /******************************************************************************/
 
 dom.on('#console-clear', 'click', ( ) => {
@@ -148,7 +241,7 @@ dom.on('#snfe-todnr', 'click', ev => {
     vAPI.messaging.send('devTools', {
         what: 'snfeToDNR',
     }).then(result => {
-        log(result);
+        log(toDNRText(result));
         dom.attr(button, 'disabled', null);
     });
 });
@@ -212,3 +305,44 @@ vAPI.messaging.send('dashboard', {
 });
 
 /******************************************************************************/
+
+async function snfeQuery(lineNo, query) {
+    const doc = cmEditor.getDoc();
+    const lineHandle = doc.getLineHandle(lineNo)
+    const result = await vAPI.messaging.send('devTools', {
+        what: 'snfeQuery',
+        query
+    });
+    if ( typeof result !== 'string' ) { return; }
+    cmEditor.startOperation();
+    const nextLineNo = doc.getLineNumber(lineHandle) + 1;
+    doc.replaceRange(`${result}\n`, { line: nextLineNo, ch: 0 });
+    cmEditor.endOperation();
+}
+
+cmEditor.on('beforeChange', (cm, details) => {
+    if ( details.origin !== '+input' ) { return; }
+    if ( details.text.length !== 2 ) { return; }
+    if ( details.text[1] !== '' ) { return; }
+    const lineNo = details.from.line;
+    const line = cm.getLine(lineNo);
+    if ( details.from.ch !== line.length ) { return; }
+    if ( line.startsWith('snfe?') === false ) { return; }
+    const fields = line.slice(5).split(/\s+/);
+    const query = {};
+    for ( const field of fields ) {
+        if ( /[/.]/.test(field) ) {
+            if ( query.url === undefined ) {
+                query.url = field;
+            } else if ( query.from === undefined ) {
+                query.from = field;
+            }
+        } else if ( query.type === undefined ) {
+            query.type = field;
+        }
+    }
+    if ( query.url === undefined ) { return; }
+    snfeQuery(lineNo, query);
+});
+
+/******************************************************************************/

package/extensions/ublock/js/filtering-context.js

@@ -19,13 +19,9 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
-/******************************************************************************/
-
 import {
-    hostnameFromURI,
     domainFromHostname,
+    hostnameFromURI,
     originFromURI,
 } from './uri-utils.js';
 
@@ -56,7 +52,7 @@ export const    XMLHTTPREQUEST = 1 << 13;
 export const       INLINE_FONT = 1 << 14;
 export const     INLINE_SCRIPT = 1 << 15;
 export const             OTHER = 1 << 16;
-export const         FRAME_ANY = MAIN_FRAME | SUB_FRAME;
+export const         FRAME_ANY = MAIN_FRAME | SUB_FRAME | OBJECT;
 export const          FONT_ANY = FONT | INLINE_FONT;
 export const        INLINE_ANY = INLINE_FONT | INLINE_SCRIPT;
 export const          PING_ANY = BEACON | CSP_REPORT | PING;
@@ -126,6 +122,8 @@ const methodBitToStrMap = new Map([
     [ METHOD_PUT, 'put' ],
 ]);
 
+const reIPv4 = /^\d+\.\d+\.\d+\.\d+$/;
+
 /******************************************************************************/
 
 export const FilteringContext = class {
@@ -142,6 +140,7 @@ export const FilteringContext = class {
         this.aliasURL = undefined;
         this.hostname = undefined;
         this.domain = undefined;
+        this.ipaddress = undefined;
         this.docId = -1;
         this.frameId = -1;
         this.docOrigin = undefined;
@@ -164,6 +163,9 @@ export const FilteringContext = class {
         this.stype = a;
     }
 
+    isRootDocument() {
+        return (this.itype & MAIN_FRAME) !== 0;
+    }
     isDocument() {
         return (this.itype & FRAME_ANY) !== 0;
     }
@@ -179,6 +181,7 @@ export const FilteringContext = class {
         this.url = other.url;
         this.hostname = other.hostname;
         this.domain = other.domain;
+        this.ipaddress = other.ipaddress;
         this.docId = other.docId;
         this.frameId = other.frameId;
         this.docOrigin = other.docOrigin;
@@ -216,7 +219,7 @@ export const FilteringContext = class {
 
     setURL(a) {
         if ( a !== this.url ) {
-            this.hostname = this.domain = undefined;
+            this.hostname = this.domain = this.ipaddress = undefined;
             this.url = a;
         }
         return this;
@@ -249,6 +252,28 @@ export const FilteringContext = class {
         return this;
     }
 
+    getIPAddress() {
+        if ( this.ipaddress !== undefined ) {
+            return this.ipaddress;
+        }
+        const ipaddr = this.getHostname();
+        const c0 = ipaddr.charCodeAt(0);
+        if ( c0 === 0x5B /* [ */ ) {
+            return (this.ipaddress = ipaddr.slice(1, -1));
+        } else if ( c0 <= 0x39 && c0 >= 0x30 ) {
+            if ( reIPv4.test(ipaddr) ) {
+                return (this.ipaddress = ipaddr);
+            }
+        }
+        return (this.ipaddress = '');
+    }
+
+    // Must always be called *after* setURL()
+    setIPAddress(ipaddr) {
+        this.ipaddress = ipaddr || undefined;
+        return this;
+    }
+
     getDocOrigin() {
         if ( this.docOrigin === undefined ) {
             this.docOrigin = this.tabOrigin;
@@ -418,42 +443,72 @@ export const FilteringContext = class {
     static getMethodName(a) {
         return methodBitToStrMap.get(a) || '';
     }
-};
-
-/******************************************************************************/
 
-FilteringContext.prototype.BEACON = FilteringContext.BEACON = BEACON;
-FilteringContext.prototype.CSP_REPORT = FilteringContext.CSP_REPORT = CSP_REPORT;
-FilteringContext.prototype.FONT = FilteringContext.FONT = FONT;
-FilteringContext.prototype.IMAGE = FilteringContext.IMAGE = IMAGE;
-FilteringContext.prototype.IMAGESET = FilteringContext.IMAGESET = IMAGESET;
-FilteringContext.prototype.MAIN_FRAME = FilteringContext.MAIN_FRAME = MAIN_FRAME;
-FilteringContext.prototype.MEDIA = FilteringContext.MEDIA = MEDIA;
-FilteringContext.prototype.OBJECT = FilteringContext.OBJECT = OBJECT;
-FilteringContext.prototype.OBJECT_SUBREQUEST = FilteringContext.OBJECT_SUBREQUEST = OBJECT_SUBREQUEST;
-FilteringContext.prototype.PING = FilteringContext.PING = PING;
-FilteringContext.prototype.SCRIPT = FilteringContext.SCRIPT = SCRIPT;
-FilteringContext.prototype.STYLESHEET = FilteringContext.STYLESHEET = STYLESHEET;
-FilteringContext.prototype.SUB_FRAME = FilteringContext.SUB_FRAME = SUB_FRAME;
-FilteringContext.prototype.WEBSOCKET = FilteringContext.WEBSOCKET = WEBSOCKET;
-FilteringContext.prototype.XMLHTTPREQUEST = FilteringContext.XMLHTTPREQUEST = XMLHTTPREQUEST;
-FilteringContext.prototype.INLINE_FONT = FilteringContext.INLINE_FONT = INLINE_FONT;
-FilteringContext.prototype.INLINE_SCRIPT = FilteringContext.INLINE_SCRIPT = INLINE_SCRIPT;
-FilteringContext.prototype.OTHER = FilteringContext.OTHER = OTHER;
-FilteringContext.prototype.FRAME_ANY = FilteringContext.FRAME_ANY = FRAME_ANY;
-FilteringContext.prototype.FONT_ANY = FilteringContext.FONT_ANY = FONT_ANY;
-FilteringContext.prototype.INLINE_ANY = FilteringContext.INLINE_ANY = INLINE_ANY;
-FilteringContext.prototype.PING_ANY = FilteringContext.PING_ANY = PING_ANY;
-FilteringContext.prototype.SCRIPT_ANY = FilteringContext.SCRIPT_ANY = SCRIPT_ANY;
-
-FilteringContext.prototype.METHOD_NONE = FilteringContext.METHOD_NONE = METHOD_NONE;
-FilteringContext.prototype.METHOD_CONNECT = FilteringContext.METHOD_CONNECT = METHOD_CONNECT;
-FilteringContext.prototype.METHOD_DELETE = FilteringContext.METHOD_DELETE = METHOD_DELETE;
-FilteringContext.prototype.METHOD_GET = FilteringContext.METHOD_GET = METHOD_GET;
-FilteringContext.prototype.METHOD_HEAD = FilteringContext.METHOD_HEAD = METHOD_HEAD;
-FilteringContext.prototype.METHOD_OPTIONS = FilteringContext.METHOD_OPTIONS = METHOD_OPTIONS;
-FilteringContext.prototype.METHOD_PATCH = FilteringContext.METHOD_PATCH = METHOD_PATCH;
-FilteringContext.prototype.METHOD_POST = FilteringContext.METHOD_POST = METHOD_POST;
-FilteringContext.prototype.METHOD_PUT = FilteringContext.METHOD_PUT = METHOD_PUT;
+    BEACON = BEACON;
+    CSP_REPORT = CSP_REPORT;
+    FONT = FONT;
+    IMAGE = IMAGE;
+    IMAGESET = IMAGESET;
+    MAIN_FRAME = MAIN_FRAME;
+    MEDIA = MEDIA;
+    OBJECT = OBJECT;
+    OBJECT_SUBREQUEST = OBJECT_SUBREQUEST;
+    PING = PING;
+    SCRIPT = SCRIPT;
+    STYLESHEET = STYLESHEET;
+    SUB_FRAME = SUB_FRAME;
+    WEBSOCKET = WEBSOCKET;
+    XMLHTTPREQUEST = XMLHTTPREQUEST;
+    INLINE_FONT = INLINE_FONT;
+    INLINE_SCRIPT = INLINE_SCRIPT;
+    OTHER = OTHER;
+    FRAME_ANY = FRAME_ANY;
+    FONT_ANY = FONT_ANY;
+    INLINE_ANY = INLINE_ANY;
+    PING_ANY = PING_ANY;
+    SCRIPT_ANY = SCRIPT_ANY;
+    METHOD_NONE = METHOD_NONE;
+    METHOD_CONNECT = METHOD_CONNECT;
+    METHOD_DELETE = METHOD_DELETE;
+    METHOD_GET = METHOD_GET;
+    METHOD_HEAD = METHOD_HEAD;
+    METHOD_OPTIONS = METHOD_OPTIONS;
+    METHOD_PATCH = METHOD_PATCH;
+    METHOD_POST = METHOD_POST;
+    METHOD_PUT = METHOD_PUT;
+
+    static BEACON = BEACON;
+    static CSP_REPORT = CSP_REPORT;
+    static FONT = FONT;
+    static IMAGE = IMAGE;
+    static IMAGESET = IMAGESET;
+    static MAIN_FRAME = MAIN_FRAME;
+    static MEDIA = MEDIA;
+    static OBJECT = OBJECT;
+    static OBJECT_SUBREQUEST = OBJECT_SUBREQUEST;
+    static PING = PING;
+    static SCRIPT = SCRIPT;
+    static STYLESHEET = STYLESHEET;
+    static SUB_FRAME = SUB_FRAME;
+    static WEBSOCKET = WEBSOCKET;
+    static XMLHTTPREQUEST = XMLHTTPREQUEST;
+    static INLINE_FONT = INLINE_FONT;
+    static INLINE_SCRIPT = INLINE_SCRIPT;
+    static OTHER = OTHER;
+    static FRAME_ANY = FRAME_ANY;
+    static FONT_ANY = FONT_ANY;
+    static INLINE_ANY = INLINE_ANY;
+    static PING_ANY = PING_ANY;
+    static SCRIPT_ANY = SCRIPT_ANY;
+    static METHOD_NONE = METHOD_NONE;
+    static METHOD_CONNECT = METHOD_CONNECT;
+    static METHOD_DELETE = METHOD_DELETE;
+    static METHOD_GET = METHOD_GET;
+    static METHOD_HEAD = METHOD_HEAD;
+    static METHOD_OPTIONS = METHOD_OPTIONS;
+    static METHOD_PATCH = METHOD_PATCH;
+    static METHOD_POST = METHOD_POST;
+    static METHOD_PUT = METHOD_PUT;
+};
 
 /******************************************************************************/

package/extensions/ublock/js/logger-ui.js

@@ -331,7 +331,7 @@ const processLoggerEntries = function(response) {
             parsed.type === 'main_frame' &&
             parsed.aliased === false && (
                 parsed.filter === undefined ||
-                parsed.filter.modifier !== true
+                parsed.filter.modifier !== true && parsed.filter.source !== 'redirect'
             )
         ) {
             const separator = createLogSeparator(parsed, unboxed.url);