From c3919da2c290ec8155d55ef0203028bea97e8822 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 28 May 2019 11:09:11 -0400 Subject: [PATCH] Add more cases for documentUrl to be safely used as root context Related issue: - https://github.com/uBlockOrigin/uMatrix-issues/issues/155 --- src/js/traffic.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/js/traffic.js b/src/js/traffic.js index ac1099a..c3376ad 100644 --- a/src/js/traffic.js +++ b/src/js/traffic.js @@ -205,9 +205,11 @@ var onBeforeSendHeadersHandler = function(details) { // https://github.com/uBlockOrigin/uMatrix-issues/issues/155 // https://github.com/uBlockOrigin/uMatrix-issues/issues/159 // TODO: import all filtering context improvements from uBO. - const srcHn = tabId >= 0 - ? pageStore.pageHostname - : µmuri.hostnameFromURI(details.documentUrl) || pageStore.pageHostname; + const srcHn = tabId < 0 || + details.parentFrameId < 0 || + details.parentFrameId === 0 && details.type === 'sub_frame' + ? µmuri.hostnameFromURI(details.documentUrl) || pageStore.pageHostname + : pageStore.pageHostname; // https://github.com/gorhill/httpswitchboard/issues/342 // Is this hyperlink auditing?