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

Side by Side Diff: lib/csp.js

Issue 29680696: [$csp4 adblockpluschrome] Issue 5241 - Add support for Content Security Policy filters (Closed)
Patch Set: Get the parent frame's hostname where possible Created March 15, 2018, 6:17 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 | « dependencies ('k') | lib/devtools.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 // The webRequest API doesn't support WebSocket connection blocking in Microsoft 20 const {defaultMatcher} = require("matcher");
21 // Edge and versions of Chrome before 58. Therefore for those we inject CSP 21 const {BlockingFilter, RegExpFilter} = require("filterClasses");
22 // headers below as a workaround. See https://crbug.com/129353 and 22 const {getDecodedHostname, stringifyURL, isThirdParty} = require("url");
23 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376 / 23 const {checkWhitelisted} = require("whitelisting");
24 if (!browser.webRequest.ResourceType || 24 const {FilterNotifier} = require("filterNotifier");
25 !("WEBSOCKET" in browser.webRequest.ResourceType)) 25 const devtools = require("devtools");
26
27 const {typeMap} = RegExpFilter;
28
29 browser.webRequest.onHeadersReceived.addListener(details =>
26 { 30 {
27 const {defaultMatcher} = require("matcher"); 31 let url = new URL(details.url);
28 const {BlockingFilter, RegExpFilter} = require("filterClasses"); 32 let urlString = stringifyURL(url);
29 const {getDecodedHostname} = require("url");
30 const {checkWhitelisted} = require("whitelisting");
31 33
32 browser.webRequest.onHeadersReceived.addListener(details => 34 let thirdParty = false;
35 let hostname;
36 let parentFrame = details.parentFrameId != -1 &&
37 ext.getFrame(details.tabId, details.parentFrameId);
38 if (parentFrame && parentFrame.url)
33 { 39 {
34 let hostname = getDecodedHostname(new URL(details.url)); 40 hostname = getDecodedHostname(parentFrame.url);
Sebastian Noack 2018/03/15 19:50:53 Please use extractHostFromFrame().
kzar 2018/03/16 12:54:59 Done.
35 let match = defaultMatcher.matchesAny("", RegExpFilter.typeMap.WEBSOCKET, 41 thirdParty = isThirdParty(url, hostname);
36 hostname, false, null, true); 42 }
37 if (match instanceof BlockingFilter && 43 else
38 !checkWhitelisted(new ext.Page({id: details.tabId}), 44 hostname = getDecodedHostname(url);
39 ext.getFrame(details.tabId, details.frameId))) 45
46 let cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, hostname,
47 thirdParty, null, false);
48 if (cspMatch)
49 {
50 let page = new ext.Page({id: details.tabId, url: details.url});
51 let frame = ext.getFrame(details.tabId, details.frameId);
52 if (checkWhitelisted(page, frame, typeMap.DOCUMENT | typeMap.CSP))
53 return;
54
55 // To avoid an extra matchesAny for the common case we assumed no
56 // $genericblock filters applied when searching for a matching $csp filter.
57 // We must now pay the price by first checking for a $genericblock filter
58 // and if necessary that our $csp filter is specific.
59 let specificOnly = checkWhitelisted(page, frame, typeMap.GENERICBLOCK);
60 if (specificOnly)
40 { 61 {
41 details.responseHeaders.push({ 62 cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, hostname,
42 name: "Content-Security-Policy", 63 thirdParty, null, specificOnly);
43 // We're blocking WebSockets here by adding a connect-src restriction 64 if (!(cspMatch instanceof BlockingFilter))
44 // since the Chrome extension API does not allow us to intercept them. 65 return;
45 // https://bugs.chromium.org/p/chromium/issues/detail?id=129353
46 //
47 // We also need the frame-src and object-src restrictions since CSPs
48 // are not inherited from the parent for documents with data: and blob:
49 // URLs, see https://crbug.com/513860.
50 //
51 // We must use the deprecated child-src directive instead of worker-src
52 // since that's not supported yet (as of Chrome 56.)
53 //
54 // "http:" also includes "https:" implictly.
55 // https://www.chromestatus.com/feature/6653486812889088
56 value: "connect-src http:; child-src http:; " +
57 "frame-src http:; object-src http:"
58 });
59 return {responseHeaders: details.responseHeaders};
60 } 66 }
61 }, { 67
62 urls: ["http://*/*", "https://*/*"], 68 FilterNotifier.emit("filter.hitCount", cspMatch, 0, 0, page);
63 // We must also intercept script requests since otherwise Web Workers can 69 devtools.logRequest(page, urlString, "CSP", hostname, thirdParty, null,
64 // be abused to execute scripts for which our Content Security Policy 70 specificOnly, cspMatch);
65 // won't be injected. 71
66 // https://github.com/gorhill/uBO-Extra/issues/19 72 details.responseHeaders.push({
67 types: ["main_frame", "sub_frame", "script"] 73 name: "Content-Security-Policy",
68 }, ["blocking", "responseHeaders"]); 74 value: cspMatch.csp
69 } 75 });
76
77 return {responseHeaders: details.responseHeaders};
78 }
79 }, {
80 urls: ["http://*/*", "https://*/*"],
81 types: ["main_frame", "sub_frame"]
82 }, ["blocking", "responseHeaders"]);
OLDNEW
« no previous file with comments | « dependencies ('k') | lib/devtools.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld