Left: | ||
Right: |
OLD | NEW |
---|---|
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, |
22 // headers below as a workaround. See https://crbug.com/129353 and | 22 RegExpFilter, |
23 // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376 / | 23 WhitelistFilter} = require("filterClasses"); |
24 if (!browser.webRequest.ResourceType || | 24 const {getDecodedHostname, stringifyURL} = require("url"); |
25 !("WEBSOCKET" in browser.webRequest.ResourceType)) | 25 const {checkWhitelisted} = require("whitelisting"); |
26 const {FilterNotifier} = require("filterNotifier"); | |
27 const devtools = require("devtools"); | |
28 | |
29 const {typeMap} = RegExpFilter; | |
30 | |
31 browser.webRequest.onHeadersReceived.addListener(details => | |
26 { | 32 { |
27 const {defaultMatcher} = require("matcher"); | 33 // Chrome seems to sometimes give the response type of "xmlhttprequest" |
28 const {BlockingFilter, RegExpFilter} = require("filterClasses"); | 34 // instead of "main_frame", but when it does the tabId is always -1 and |
29 const {getDecodedHostname} = require("url"); | 35 // the URL matches the initiator's URL (once normalised). |
30 const {checkWhitelisted} = require("whitelisting"); | 36 // https://bugs.chromium.org/p/chromium/issues/detail?id=805649 |
37 if (details.type == "xmlhttprequest" && | |
38 (details.tabId > -1 || details.initiator && | |
39 details.url != new URL(details.initiator).toString())) | |
40 { | |
41 return; | |
42 } | |
31 | 43 |
32 browser.webRequest.onHeadersReceived.addListener(details => | 44 // To avoid an extra matchesAny for the common case let's assume no |
45 // $genericblock filters apply when searching for a matching $csp filter, | |
46 // we can double check later if necessary. | |
47 let specificOnly = false; | |
48 | |
49 let url = new URL(details.url); | |
50 let hostname = getDecodedHostname(url); | |
51 let cspMatch = defaultMatcher.matchesAny(details.url, typeMap.CSP, hostname, | |
52 false, null, specificOnly); | |
53 let page = null; | |
54 | |
55 if (cspMatch) | |
33 { | 56 { |
34 let hostname = getDecodedHostname(new URL(details.url)); | 57 if (details.tabId > -1) |
35 let match = defaultMatcher.matchesAny("", RegExpFilter.typeMap.WEBSOCKET, | |
36 hostname, false, null, true); | |
37 if (match instanceof BlockingFilter && | |
38 !checkWhitelisted(new ext.Page({id: details.tabId}), | |
39 ext.getFrame(details.tabId, details.frameId))) | |
40 { | 58 { |
41 details.responseHeaders.push({ | 59 page = new ext.Page({id: details.tabId, url: details.url}); |
42 name: "Content-Security-Policy", | 60 |
43 // We're blocking WebSockets here by adding a connect-src restriction | 61 if (cspMatch instanceof WhitelistFilter) |
44 // since the Chrome extension API does not allow us to intercept them. | 62 { |
45 // https://bugs.chromium.org/p/chromium/issues/detail?id=129353 | 63 if (devtools) |
46 // | 64 { |
47 // We also need the frame-src and object-src restrictions since CSPs | 65 devtools.logWhitelistedDocument(page, details.url, typeMap.CSP, |
48 // are not inherited from the parent for documents with data: and blob: | 66 hostname, cspMatch); |
Sebastian Noack
2018/03/07 17:27:07
This is redundant, checkWhitelisted() is already c
Sebastian Noack
2018/03/13 03:58:13
What is about this comment?
kzar
2018/03/13 18:11:01
Done.
| |
49 // URLs, see https://crbug.com/513860. | 67 } |
50 // | 68 return; |
51 // We must use the deprecated child-src directive instead of worker-src | 69 } |
52 // since that's not supported yet (as of Chrome 56.) | 70 |
53 // | 71 let frame = ext.getFrame(details.tabId, details.frameId); |
54 // "http:" also includes "https:" implictly. | 72 |
Sebastian Noack
2018/03/07 17:27:07
Nit: I think it reads slightly better without a bl
kzar
2018/03/13 18:11:02
Done.
| |
55 // https://www.chromestatus.com/feature/6653486812889088 | 73 if (checkWhitelisted(page, frame, typeMap.DOCUMENT | typeMap.CSP)) |
56 value: "connect-src http:; child-src http:; " + | 74 return; |
57 "frame-src http:; object-src http:" | 75 |
58 }); | 76 // We pay the price now for skipping the specificOnly check earlier, we |
59 return {responseHeaders: details.responseHeaders}; | 77 // must check again for a CSP filter, this time making sure it's specific. |
78 specificOnly = !!checkWhitelisted(page, frame, typeMap.GENERICBLOCK); | |
79 if (specificOnly) | |
80 { | |
81 cspMatch = defaultMatcher.matchesAny(details.url, typeMap.CSP, hostname, | |
82 false, null, specificOnly); | |
83 if (!(cspMatch instanceof BlockingFilter)) | |
84 return; | |
85 } | |
86 | |
87 FilterNotifier.emit("filter.hitCount", cspMatch, 0, 0, page); | |
60 } | 88 } |
61 }, { | 89 // If we don't know the associated tab we'll have to check that if the URL |
62 urls: ["http://*/*", "https://*/*"], | 90 // is whitelisted manually. Things like $sitekey whitelisting and filter hit |
63 // We must also intercept script requests since otherwise Web Workers can | 91 // logging won't work, but it's the best we can do. |
64 // be abused to execute scripts for which our Content Security Policy | 92 else if (cspMatch instanceof WhitelistFilter || |
65 // won't be injected. | 93 defaultMatcher.whitelist.matchesAny(stringifyURL(url), |
66 // https://github.com/gorhill/uBO-Extra/issues/19 | 94 typeMap.DOCUMENT | typeMap.CSP, |
67 types: ["main_frame", "sub_frame", "script"] | 95 hostname)) |
68 }, ["blocking", "responseHeaders"]); | 96 { |
69 } | 97 return; |
98 } | |
99 | |
100 if (devtools) | |
Sebastian Noack
2018/03/07 17:27:07
Is this check still necessary? IIRC, require('devt
Sebastian Noack
2018/03/13 03:58:13
What is about this comment?
kzar
2018/03/13 18:11:01
Done.
| |
101 { | |
102 devtools.logRequest(page, details.url, "CSP", hostname, | |
103 false, null, specificOnly, cspMatch); | |
104 } | |
105 | |
106 details.responseHeaders.push({ | |
107 name: "Content-Security-Policy", | |
108 value: cspMatch.csp | |
109 }); | |
110 | |
111 return {responseHeaders: details.responseHeaders}; | |
112 } | |
113 }, { | |
114 urls: ["http://*/*", "https://*/*"], | |
115 types: ["main_frame", "sub_frame", "xmlhttprequest"] | |
116 }, ["blocking", "responseHeaders"]); | |
OLD | NEW |