Use documentUrl for context purpose when available

Related issue:
- https://github.com/uBlockOrigin/uMatrix-issues/issues/155

documentUrl was currently used on onBeforeRequest but not
for onBeforeSendHeaders.
This commit is contained in:
Raymond Hill 2019-05-20 12:07:02 -04:00
parent dbe6218926
commit 901c325eab
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 11 additions and 6 deletions

View File

@ -10,6 +10,7 @@
"vAPI": false, "vAPI": false,
"µMatrix": false "µMatrix": false
}, },
"laxbreak": true,
"strict": "global", "strict": "global",
"undef": true, "undef": true,
"unused": true, "unused": true,

View File

@ -196,12 +196,16 @@ var onBeforeSendHeadersHandler = function(details) {
// to scope on unknown scheme? Etc. // to scope on unknown scheme? Etc.
// https://github.com/gorhill/httpswitchboard/issues/191 // https://github.com/gorhill/httpswitchboard/issues/191
// https://github.com/gorhill/httpswitchboard/issues/91#issuecomment-37180275 // https://github.com/gorhill/httpswitchboard/issues/91#issuecomment-37180275
let tabId = details.tabId, const tabId = details.tabId;
pageStore = µm.mustPageStoreFromTabId(tabId), const pageStore = µm.mustPageStoreFromTabId(tabId);
srcHn = pageStore.pageHostname, const desHn = µmuri.hostnameFromURI(desURL);
desHn = µmuri.hostnameFromURI(desURL), const requestType = requestTypeNormalizer[details.type] || 'other';
requestType = requestTypeNormalizer[details.type] || 'other', const requestHeaders = details.requestHeaders;
requestHeaders = details.requestHeaders;
// https://github.com/uBlockOrigin/uMatrix-issues/issues/155
// TODO: import all filtering context improvements from uBO.
const srcHn = µmuri.hostnameFromURI(details.documentUrl) ||
pageStore.pageHostname;
// https://github.com/gorhill/httpswitchboard/issues/342 // https://github.com/gorhill/httpswitchboard/issues/342
// Is this hyperlink auditing? // Is this hyperlink auditing?