Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/requestBlocker.js

Issue 29739603: Issue 6544 - Prevent requests sent by Chrome or Adblock Plus from being blocked (Closed)
Patch Set: Also ignore requests sent by Chrome itself Created April 5, 2018, 12:18 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 11 matching lines...) Expand all
22 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses"); 22 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses");
23 const {Subscription} = require("subscriptionClasses"); 23 const {Subscription} = require("subscriptionClasses");
24 const {defaultMatcher} = require("matcher"); 24 const {defaultMatcher} = require("matcher");
25 const {FilterNotifier} = require("filterNotifier"); 25 const {FilterNotifier} = require("filterNotifier");
26 const {Prefs} = require("prefs"); 26 const {Prefs} = require("prefs");
27 const {checkWhitelisted, getKey} = require("whitelisting"); 27 const {checkWhitelisted, getKey} = require("whitelisting");
28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); 28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url");
29 const {port} = require("messaging"); 29 const {port} = require("messaging");
30 const devtools = require("devtools"); 30 const devtools = require("devtools");
31 31
32 const extensionProtocol = new URL(browser.extension.getURL("")).protocol;
33
32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. 34 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
33 if (!browser.webRequest.ResourceType || 35 if (!browser.webRequest.ResourceType ||
34 !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType)) 36 !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType))
35 { 37 {
36 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; 38 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
37 } 39 }
38 40
39 // Map of content types reported by the browser to the respecitve content types 41 // Map of content types reported by the browser to the respecitve content types
40 // used by Adblock Plus. Other content types are simply mapped to OTHER. 42 // used by Adblock Plus. Other content types are simply mapped to OTHER.
41 let resourceTypes = new Map(function*() 43 let resourceTypes = new Map(function*()
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // Filter out requests from non web protocols. Ideally, we'd explicitly 123 // Filter out requests from non web protocols. Ideally, we'd explicitly
122 // specify the protocols we are interested in (i.e. http://, https://, 124 // specify the protocols we are interested in (i.e. http://, https://,
123 // ws:// and wss://) with the url patterns, given below, when adding this 125 // ws:// and wss://) with the url patterns, given below, when adding this
124 // listener. But unfortunately, Chrome <=57 doesn't support the WebSocket 126 // listener. But unfortunately, Chrome <=57 doesn't support the WebSocket
125 // protocol and is causing an error if it is given. 127 // protocol and is causing an error if it is given.
126 let url = new URL(details.url); 128 let url = new URL(details.url);
127 if (url.protocol != "http:" && url.protocol != "https:" && 129 if (url.protocol != "http:" && url.protocol != "https:" &&
128 url.protocol != "ws:" && url.protocol != "wss:") 130 url.protocol != "ws:" && url.protocol != "wss:")
129 return; 131 return;
130 132
131 let originUrl = null; 133 // Firefox provides us with the full origin URL, while Chromium (>=63)
132 if (details.originUrl) 134 // provides only the protocol + host of the (top-level) document which
133 { 135 // the request originates from through the "initiator" property.
134 originUrl = new URL(details.originUrl); 136 let originUrl = details.originUrl ? new URL(details.originUrl) :
137 details.initiator ? new URL(details.initiator) : null;
135 138
136 // Firefox (only) allows to intercept requests sent by the browser 139 // Ignore requests sent by extensions or by the browser itself:
137 // and other extensions. We don't want to block these. 140 // * Firefox intercepts requests sent by any extensions, indicated with
138 if (originUrl.protocol == "chrome:" || 141 // an "originURL" starting with "moz-extension:".
139 originUrl.protocol == "moz-extension:") 142 // * Chromium intercepts requests sent by this extension only, indicated
140 return; 143 // on Chromium >=63 with an "initiator" starting with "chrome-extension:".
141 } 144 // * On Firefox, requests that don't relate to any document or extension are
142 // Fallback to "initiator" on Chrome >=63. It doesn't include the 145 // indicated with an "originUrl" starting with "chrome:".
143 // path (unlike "originUrl" on Firefox), but is still good enough 146 // * On Chromium >=63, requests that don't relate to any document or extension
144 // (in case the tab/frame is unknown) for the $domain filter option 147 // have no "initiator". But since on older Chromium versions, no request
145 // and most document exception rules which only match the domain part. 148 // has an "initiator", we have to check for the tabId as well.
146 else if (details.initiator) 149 if (originUrl ? originUrl.protocol == extensionProtocol ||
147 originUrl = new URL(details.initiator); 150 originUrl.protocol == "chrome:" : details.tabId == -1)
151 return;
148 152
149 let page = null; 153 let page = null;
150 let frame = null; 154 let frame = null;
151 if (details.tabId != -1) 155 if (details.tabId != -1)
152 { 156 {
153 page = new ext.Page({id: details.tabId}); 157 page = new ext.Page({id: details.tabId});
154 frame = ext.getFrame( 158 frame = ext.getFrame(
155 details.tabId, 159 details.tabId,
156 // We are looking for the frame that contains the element which 160 // We are looking for the frame that contains the element which
157 // has triggered this request. For most requests (e.g. images) we 161 // has triggered this request. For most requests (e.g. images) we
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 268
265 port.on("request.blockedByRTCWrapper", (msg, sender) => 269 port.on("request.blockedByRTCWrapper", (msg, sender) =>
266 { 270 {
267 return ext.webRequest.onBeforeRequest._dispatch( 271 return ext.webRequest.onBeforeRequest._dispatch(
268 new URL(msg.url), 272 new URL(msg.url),
269 "webrtc", 273 "webrtc",
270 sender.page, 274 sender.page,
271 sender.frame 275 sender.frame
272 ).includes(false); 276 ).includes(false);
273 }); 277 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld