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

Side by Side Diff: lib/whitelisting.js

Issue 29998582: Issue [TBD] - Update adblockpluscore dependency to [TBD] Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Remove matchRequest Created Feb. 5, 2019, 5:15 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
« lib/csp.js ('K') | « lib/requestBlocker.js ('k') | 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
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 whitelisting */ 18 /** @module whitelisting */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); 22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
23 const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); 23 const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
24 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier"); 24 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
25 const {filterStorage} = require("../adblockpluscore/lib/filterStorage"); 25 const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
26 const {isThirdParty} = require("../adblockpluscore/lib/domain");
27 const {extractHostFromFrame} = require("./url"); 26 const {extractHostFromFrame} = require("./url");
28 const {port} = require("./messaging"); 27 const {port} = require("./messaging");
29 const {logWhitelistedDocument} = require("./hitLogger"); 28 const {logWhitelistedDocument} = require("./hitLogger");
30 const {verifySignature} = require("../adblockpluscore/lib/rsa"); 29 const {verifySignature} = require("../adblockpluscore/lib/rsa");
31 30
32 let sitekeys = new ext.PageMap(); 31 let sitekeys = new ext.PageMap();
33 32
34 function match(page, url, typeMask, docDomain, sitekey) 33 function match(page, url, typeMask, docDomain, sitekey)
35 { 34 {
36 let thirdParty = !!docDomain && isThirdParty(url, docDomain);
37
38 if (!docDomain) 35 if (!docDomain)
39 docDomain = url.hostname; 36 docDomain = url.hostname;
40 37
41 let filter = defaultMatcher.matchesAny( 38 let filter = defaultMatcher.matchesAny(url, typeMask, docDomain, sitekey);
42 url.href, typeMask, docDomain, thirdParty, sitekey
43 );
44
45 if (filter && page) 39 if (filter && page)
46 logWhitelistedDocument(page.id, url.href, typeMask, docDomain, filter); 40 logWhitelistedDocument(page.id, url.href, typeMask, docDomain, filter);
47 41
48 return filter; 42 return filter;
49 } 43 }
50 44
51 let checkWhitelisted = 45 let checkWhitelisted =
52 /** 46 /**
53 * Gets the active whitelisting filter for the document associated 47 * Gets the active whitelisting filter for the document associated
54 * with the given page/frame, or null if it's not whitelisted. 48 * with the given page/frame, or null if it's not whitelisted.
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 { 229 {
236 browser.webRequest.onHeadersReceived.addListener( 230 browser.webRequest.onHeadersReceived.addListener(
237 onHeadersReceived, 231 onHeadersReceived,
238 { 232 {
239 urls: ["http://*/*", "https://*/*"], 233 urls: ["http://*/*", "https://*/*"],
240 types: ["main_frame", "sub_frame"] 234 types: ["main_frame", "sub_frame"]
241 }, 235 },
242 ["responseHeaders"] 236 ["responseHeaders"]
243 ); 237 );
244 } 238 }
OLDNEW
« lib/csp.js ('K') | « lib/requestBlocker.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld