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

Delta Between Two Patch Sets: lib/requestBlocker.js

Issue 29739603: Issue 6544 - Prevent requests sent by Chrome or Adblock Plus from being blocked (Closed)
Left Patch Set: Also ignore requests sent by Chrome itself Created April 5, 2018, 12:18 a.m.
Right Patch Set: Made logic more verbose Created April 9, 2018, 9:33 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/devtools.js ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 /** @module requestBlocker */ 18 /** @module requestBlocker */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses"); 22 const {Filter, RegExpFilter, BlockingFilter} =
23 const {Subscription} = require("subscriptionClasses"); 23 require("../adblockpluscore/lib/filterClasses");
24 const {defaultMatcher} = require("matcher"); 24 const {Subscription} = require("../adblockpluscore/lib/subscriptionClasses");
25 const {FilterNotifier} = require("filterNotifier"); 25 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
26 const {Prefs} = require("prefs"); 26 const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
27 const {checkWhitelisted, getKey} = require("whitelisting"); 27 const {Prefs} = require("./prefs");
28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); 28 const {checkWhitelisted, getKey} = require("./whitelisting");
29 const {port} = require("messaging"); 29 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("./url");
30 const devtools = require("devtools"); 30 const {port} = require("./messaging");
31 const devtools = require("./devtools");
31 32
32 const extensionProtocol = new URL(browser.extension.getURL("")).protocol; 33 const extensionProtocol = new URL(browser.extension.getURL("")).protocol;
33 34
34 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. 35 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
35 if (!browser.webRequest.ResourceType || 36 if (!browser.webRequest.ResourceType ||
36 !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType)) 37 !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType))
37 { 38 {
38 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; 39 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
39 } 40 }
40 41
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // Ignore requests sent by extensions or by the browser itself: 140 // Ignore requests sent by extensions or by the browser itself:
140 // * Firefox intercepts requests sent by any extensions, indicated with 141 // * Firefox intercepts requests sent by any extensions, indicated with
141 // an "originURL" starting with "moz-extension:". 142 // an "originURL" starting with "moz-extension:".
142 // * Chromium intercepts requests sent by this extension only, indicated 143 // * Chromium intercepts requests sent by this extension only, indicated
143 // on Chromium >=63 with an "initiator" starting with "chrome-extension:". 144 // on Chromium >=63 with an "initiator" starting with "chrome-extension:".
144 // * On Firefox, requests that don't relate to any document or extension are 145 // * On Firefox, requests that don't relate to any document or extension are
145 // indicated with an "originUrl" starting with "chrome:". 146 // indicated with an "originUrl" starting with "chrome:".
146 // * On Chromium >=63, requests that don't relate to any document or extension 147 // * On Chromium >=63, requests that don't relate to any document or extension
147 // have no "initiator". But since on older Chromium versions, no request 148 // have no "initiator". But since on older Chromium versions, no request
148 // has an "initiator", we have to check for the tabId as well. 149 // has an "initiator", we have to check for the tabId as well.
149 if (originUrl ? originUrl.protocol == extensionProtocol || 150 if (originUrl)
150 originUrl.protocol == "chrome:" : details.tabId == -1) 151 {
152 if (originUrl.protocol == extensionProtocol ||
153 originUrl.protocol == "chrome:")
154 return;
155 }
156 else if (details.tabId == -1)
151 return; 157 return;
152 158
153 let page = null; 159 let page = null;
154 let frame = null; 160 let frame = null;
155 if (details.tabId != -1) 161 if (details.tabId != -1)
156 { 162 {
157 page = new ext.Page({id: details.tabId}); 163 page = new ext.Page({id: details.tabId});
158 frame = ext.getFrame( 164 frame = ext.getFrame(
159 details.tabId, 165 details.tabId,
160 // We are looking for the frame that contains the element which 166 // We are looking for the frame that contains the element which
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 274
269 port.on("request.blockedByRTCWrapper", (msg, sender) => 275 port.on("request.blockedByRTCWrapper", (msg, sender) =>
270 { 276 {
271 return ext.webRequest.onBeforeRequest._dispatch( 277 return ext.webRequest.onBeforeRequest._dispatch(
272 new URL(msg.url), 278 new URL(msg.url),
273 "webrtc", 279 "webrtc",
274 sender.page, 280 sender.page,
275 sender.frame 281 sender.frame
276 ).includes(false); 282 ).includes(false);
277 }); 283 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld