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