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

Side by Side Diff: lib/whitelisting.js

Issue 29354778: Issue 4466 - Remove rsa.js, update core + buildtools (Closed)
Patch Set: Removed signature tests, they are tested in adblockpluscore Created Sept. 23, 2016, 1:51 p.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 | « lib/sha1.js ('k') | metadata.common » ('j') | 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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 let {defaultMatcher} = require("matcher"); 22 let {defaultMatcher} = require("matcher");
23 let {RegExpFilter} = require("filterClasses"); 23 let {RegExpFilter} = require("filterClasses");
24 let {DownloadableSubscription} = require("subscriptionClasses"); 24 let {DownloadableSubscription} = require("subscriptionClasses");
25 let {FilterNotifier} = require("filterNotifier"); 25 let {FilterNotifier} = require("filterNotifier");
26 let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = req uire("url"); 26 let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = req uire("url");
27 let {port} = require("messaging"); 27 let {port} = require("messaging");
28 let devtools = require("devtools"); 28 let devtools = require("devtools");
29 let {verifySignature} = require("rsa");
29 30
30 let sitekeys = new ext.PageMap(); 31 let sitekeys = new ext.PageMap();
31 32
32 function match(page, url, typeMask, docDomain, sitekey) 33 function match(page, url, typeMask, docDomain, sitekey)
33 { 34 {
34 let thirdParty = !!docDomain && isThirdParty(url, docDomain); 35 let thirdParty = !!docDomain && isThirdParty(url, docDomain);
35 let urlString = stringifyURL(url); 36 let urlString = stringifyURL(url);
36 37
37 if (!docDomain) 38 if (!docDomain)
38 docDomain = getDecodedHostname(url); 39 docDomain = getDecodedHostname(url);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 173
173 if (typeof chrome == "object") 174 if (typeof chrome == "object")
174 chrome.webRequest.onHeadersReceived.addListener( 175 chrome.webRequest.onHeadersReceived.addListener(
175 onHeadersReceived, 176 onHeadersReceived,
176 { 177 {
177 urls: ["http://*/*", "https://*/*"], 178 urls: ["http://*/*", "https://*/*"],
178 types: ["main_frame", "sub_frame"] 179 types: ["main_frame", "sub_frame"]
179 }, 180 },
180 ["responseHeaders"] 181 ["responseHeaders"]
181 ); 182 );
OLDNEW
« no previous file with comments | « lib/sha1.js ('k') | metadata.common » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld