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

Side by Side Diff: lib/csp.js

Issue 29705719: Issue 6402 - Split filter hit / request logging out into own API (Closed)
Patch Set: Rebased Created April 30, 2018, 1:01 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 | « include.preload.js ('k') | lib/cssInjection.js » ('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-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 "use strict"; 18 "use strict";
19 19
20 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); 20 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
21 const {RegExpFilter, WhitelistFilter} = 21 const {RegExpFilter, WhitelistFilter} =
22 require("../adblockpluscore/lib/filterClasses"); 22 require("../adblockpluscore/lib/filterClasses");
23 const {extractHostFromFrame, getDecodedHostname, 23 const {extractHostFromFrame, getDecodedHostname,
24 isThirdParty, stringifyURL} = require("./url"); 24 isThirdParty, stringifyURL} = require("./url");
25 const {checkWhitelisted} = require("./whitelisting"); 25 const {checkWhitelisted} = require("./whitelisting");
26 const {FilterNotifier} = require("filterNotifier"); 26 const {FilterNotifier} = require("filterNotifier");
27 const devtools = require("./devtools"); 27 const {logRequest} = require("./hitLogger");
28 28
29 const {typeMap} = RegExpFilter; 29 const {typeMap} = RegExpFilter;
30 30
31 browser.webRequest.onHeadersReceived.addListener(details => 31 browser.webRequest.onHeadersReceived.addListener(details =>
32 { 32 {
33 let url = new URL(details.url); 33 let url = new URL(details.url);
34 let urlString = stringifyURL(url); 34 let urlString = stringifyURL(url);
35 let parentFrame = ext.getFrame(details.tabId, details.parentFrameId); 35 let parentFrame = ext.getFrame(details.tabId, details.parentFrameId);
36 let hostname = extractHostFromFrame(parentFrame) || getDecodedHostname(url); 36 let hostname = extractHostFromFrame(parentFrame) || getDecodedHostname(url);
37 let thirdParty = isThirdParty(url, hostname); 37 let thirdParty = isThirdParty(url, hostname);
(...skipping 15 matching lines...) Expand all
53 let specificOnly = !!checkWhitelisted(page, frame, null, 53 let specificOnly = !!checkWhitelisted(page, frame, null,
54 typeMap.GENERICBLOCK); 54 typeMap.GENERICBLOCK);
55 if (specificOnly) 55 if (specificOnly)
56 { 56 {
57 cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, hostname, 57 cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, hostname,
58 thirdParty, null, specificOnly); 58 thirdParty, null, specificOnly);
59 if (!cspMatch) 59 if (!cspMatch)
60 return; 60 return;
61 } 61 }
62 62
63 devtools.logRequest([details.tabId], urlString, "CSP", hostname, 63 logRequest([details.tabId], urlString, "CSP", hostname, thirdParty, null,
64 thirdParty, null, specificOnly, cspMatch); 64 specificOnly, cspMatch);
65 FilterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]); 65 FilterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]);
66 66
67 if (cspMatch instanceof WhitelistFilter) 67 if (cspMatch instanceof WhitelistFilter)
68 return; 68 return;
69 69
70 details.responseHeaders.push({ 70 details.responseHeaders.push({
71 name: "Content-Security-Policy", 71 name: "Content-Security-Policy",
72 value: cspMatch.csp 72 value: cspMatch.csp
73 }); 73 });
74 74
75 return {responseHeaders: details.responseHeaders}; 75 return {responseHeaders: details.responseHeaders};
76 } 76 }
77 }, { 77 }, {
78 urls: ["http://*/*", "https://*/*"], 78 urls: ["http://*/*", "https://*/*"],
79 types: ["main_frame", "sub_frame"] 79 types: ["main_frame", "sub_frame"]
80 }, ["blocking", "responseHeaders"]); 80 }, ["blocking", "responseHeaders"]);
OLDNEW
« no previous file with comments | « include.preload.js ('k') | lib/cssInjection.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld