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

Delta Between Two Patch Sets: lib/csp.js

Issue 29705719: Issue 6402 - Split filter hit / request logging out into own API (Closed)
Left Patch Set: Addressed Manish's feedback Created May 1, 2018, 10:49 a.m.
Right Patch Set: Addressed Manish's feedback Created May 9, 2018, 5:53 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 | « include.preload.js ('k') | lib/cssInjection.js » ('j') | 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 "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, isThirdParty} = require("./url");
24 isThirdParty, stringifyURL} = require("./url");
25 const {checkWhitelisted} = require("./whitelisting"); 24 const {checkWhitelisted} = require("./whitelisting");
26 const {FilterNotifier} = require("filterNotifier"); 25 const {FilterNotifier} = require("filterNotifier");
27 const {logRequest} = require("./hitLogger"); 26 const {logRequest} = require("./hitLogger");
28 27
29 const {typeMap} = RegExpFilter; 28 const {typeMap} = RegExpFilter;
30 29
31 browser.webRequest.onHeadersReceived.addListener(details => 30 browser.webRequest.onHeadersReceived.addListener(details =>
32 { 31 {
33 let url = new URL(details.url); 32 let url = new URL(details.url);
34 let urlString = stringifyURL(url);
35 let parentFrame = ext.getFrame(details.tabId, details.parentFrameId); 33 let parentFrame = ext.getFrame(details.tabId, details.parentFrameId);
36 let docDomain = extractHostFromFrame(parentFrame) || getDecodedHostname(url); 34 let hostname = extractHostFromFrame(parentFrame) || url.hostname;
kzar 2018/05/01 10:53:09 I renamed this in order to use the Object shorthan
Manish Jethani 2018/05/02 13:25:14 Acknowledged. Maybe rename urlString to url and a
kzar 2018/05/02 15:41:50 I think I prefer it like it is, I find the name ur
Sebastian Noack 2018/05/02 16:11:32 Agreed with kzar (also in favor to avoid wrapping
37 let thirdParty = isThirdParty(url, docDomain); 35 let thirdParty = isThirdParty(url, hostname);
38 36
39 let cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, docDomain, 37 let cspMatch = defaultMatcher.matchesAny(details.url, typeMap.CSP, hostname,
40 thirdParty, null, false); 38 thirdParty, null, false);
41 if (cspMatch) 39 if (cspMatch)
42 { 40 {
43 let page = new ext.Page({id: details.tabId, url: details.url}); 41 let page = new ext.Page({id: details.tabId, url: details.url});
44 let frame = ext.getFrame(details.tabId, details.frameId); 42 let frame = ext.getFrame(details.tabId, details.frameId);
45 43
46 if (checkWhitelisted(page, frame)) 44 if (checkWhitelisted(page, frame))
47 return; 45 return;
48 46
49 // To avoid an extra matchesAny for the common case we assumed no 47 // To avoid an extra matchesAny for the common case we assumed no
50 // $genericblock filters applied when searching for a matching $csp filter. 48 // $genericblock filters applied when searching for a matching $csp filter.
51 // We must now pay the price by first checking for a $genericblock filter 49 // We must now pay the price by first checking for a $genericblock filter
52 // and if necessary that our $csp filter is specific. 50 // and if necessary that our $csp filter is specific.
53 let specificOnly = !!checkWhitelisted(page, frame, null, 51 let specificOnly = !!checkWhitelisted(page, frame, null,
54 typeMap.GENERICBLOCK); 52 typeMap.GENERICBLOCK);
55 if (specificOnly) 53 if (specificOnly)
56 { 54 {
57 cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, docDomain, 55 cspMatch = defaultMatcher.matchesAny(details.url, typeMap.CSP, hostname,
58 thirdParty, null, specificOnly); 56 thirdParty, null, specificOnly);
59 if (!cspMatch) 57 if (!cspMatch)
60 return; 58 return;
61 } 59 }
62 60
63 logRequest( 61 logRequest([details.tabId], {
64 [details.tabId], 62 url: details.url, type: "CSP", docDomain: hostname,
65 {url: urlString, type: "CSP", docDomain, thirdParty, specificOnly}, 63 thirdParty, specificOnly
66 cspMatch 64 }, cspMatch);
67 );
68 FilterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]); 65 FilterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]);
69 66
70 if (cspMatch instanceof WhitelistFilter) 67 if (cspMatch instanceof WhitelistFilter)
71 return; 68 return;
72 69
73 details.responseHeaders.push({ 70 details.responseHeaders.push({
74 name: "Content-Security-Policy", 71 name: "Content-Security-Policy",
75 value: cspMatch.csp 72 value: cspMatch.csp
76 }); 73 });
77 74
78 return {responseHeaders: details.responseHeaders}; 75 return {responseHeaders: details.responseHeaders};
79 } 76 }
80 }, { 77 }, {
81 urls: ["http://*/*", "https://*/*"], 78 urls: ["http://*/*", "https://*/*"],
82 types: ["main_frame", "sub_frame"] 79 types: ["main_frame", "sub_frame"]
83 }, ["blocking", "responseHeaders"]); 80 }, ["blocking", "responseHeaders"]);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld