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

Side by Side Diff: lib/whitelisting.js

Issue 29737602: Issue 4580 - Make filter/request logging use plain tabIds, prepare for multi-tab requests (Closed)
Patch Set: Created April 2, 2018, 12:27 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/stats.js ('K') | « lib/stats.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("matcher"); 22 const {defaultMatcher} = require("matcher");
23 const {Filter, RegExpFilter} = require("filterClasses"); 23 const {Filter, RegExpFilter} = require("filterClasses");
24 const {FilterNotifier} = require("filterNotifier"); 24 const {FilterNotifier} = require("filterNotifier");
25 const {FilterStorage} = require("filterStorage"); 25 const {FilterStorage} = require("filterStorage");
26 const {stringifyURL, getDecodedHostname, 26 const {stringifyURL, getDecodedHostname,
27 extractHostFromFrame, isThirdParty} = require("url"); 27 extractHostFromFrame, isThirdParty} = require("url");
28 const {port} = require("messaging"); 28 const {port} = require("messaging");
29 const devtools = require("devtools"); 29 const {logWhitelistedDocument} = require("devtools");
30 const {verifySignature} = require("rsa"); 30 const {verifySignature} = require("rsa");
31 31
32 let sitekeys = new ext.PageMap(); 32 let sitekeys = new ext.PageMap();
33 33
34 function match(page, url, typeMask, docDomain, sitekey) 34 function match(page, url, typeMask, docDomain, sitekey)
35 { 35 {
36 let thirdParty = !!docDomain && isThirdParty(url, docDomain); 36 let thirdParty = !!docDomain && isThirdParty(url, docDomain);
37 let urlString = stringifyURL(url); 37 let urlString = stringifyURL(url);
38 38
39 if (!docDomain) 39 if (!docDomain)
40 docDomain = getDecodedHostname(url); 40 docDomain = getDecodedHostname(url);
41 41
42 let filter = defaultMatcher.whitelist.matchesAny( 42 let filter = defaultMatcher.whitelist.matchesAny(
43 urlString, typeMask, docDomain, thirdParty, sitekey 43 urlString, typeMask, docDomain, thirdParty, sitekey
44 ); 44 );
45 45
46 if (filter && devtools) 46 if (filter)
47 { 47 logWhitelistedDocument(page.id, urlString, typeMask, docDomain, filter);
48 devtools.logWhitelistedDocument(
49 page, urlString, typeMask, docDomain, filter
50 );
51 }
52 48
53 return filter; 49 return filter;
54 } 50 }
55 51
56 let checkWhitelisted = 52 let checkWhitelisted =
57 /** 53 /**
58 * Gets the active whitelisting filter for the document associated 54 * Gets the active whitelisting filter for the document associated
59 * with the given page/frame, or null if it's not whitelisted. 55 * with the given page/frame, or null if it's not whitelisted.
60 * 56 *
61 * @param {Page} page 57 * @param {Page} page
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 { 221 {
226 browser.webRequest.onHeadersReceived.addListener( 222 browser.webRequest.onHeadersReceived.addListener(
227 onHeadersReceived, 223 onHeadersReceived,
228 { 224 {
229 urls: ["http://*/*", "https://*/*"], 225 urls: ["http://*/*", "https://*/*"],
230 types: ["main_frame", "sub_frame"] 226 types: ["main_frame", "sub_frame"]
231 }, 227 },
232 ["responseHeaders"] 228 ["responseHeaders"]
233 ); 229 );
234 } 230 }
OLDNEW
« lib/stats.js ('K') | « lib/stats.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld