Side by Side Diff: lib/csp.js
Issue 29374674:
Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Patch Set: Update adblockpluscore dependency
Created March 15, 2017, 11:43 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« lib/compat.js ('k')
|
lib/devtools.js » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 36 // | 36 // |
| 37 // We also need the frame-src and object-src restrictions since CSPs are | 37 // We also need the frame-src and object-src restrictions since CSPs are |
| 38 // not inherited from the parent for documents with data: and blob: URLs. | 38 // not inherited from the parent for documents with data: and blob: URLs. |
| 39 // https://bugs.chromium.org/p/chromium/issues/detail?id=513860 | 39 // https://bugs.chromium.org/p/chromium/issues/detail?id=513860 |
| 40 // | 40 // |
| 41 // We must use the deprecated child-src directive instead of worker-src | 41 // We must use the deprecated child-src directive instead of worker-src |
| 42 // since that's not supported yet (as of Chrome 56.) | 42 // since that's not supported yet (as of Chrome 56.) |
| 43 // | 43 // |
| 44 // "http:" also includes "https:" implictly. | 44 // "http:" also includes "https:" implictly. |
| 45 // https://www.chromestatus.com/feature/6653486812889088 | 45 // https://www.chromestatus.com/feature/6653486812889088 |
| 46 value: "connect-src http:; child-src http:; frame-src http:; object-src ht tp:" | 46 value: "connect-src http:; child-src http:; " + |
| 47 "frame-src http:; object-src http:" | |
| 47 }); | 48 }); |
| 48 return {responseHeaders: details.responseHeaders}; | 49 return {responseHeaders: details.responseHeaders}; |
| 49 } | 50 } |
| 50 }, { | 51 }, { |
| 51 urls: ["http://*/*", "https://*/*"], | 52 urls: ["http://*/*", "https://*/*"], |
| 52 // We must also intercept script requests since otherwise Web Workers can | 53 // We must also intercept script requests since otherwise Web Workers can |
| 53 // be abused to execute scripts for which our Content Security Policy | 54 // be abused to execute scripts for which our Content Security Policy |
| 54 // won't be injected. | 55 // won't be injected. |
| 55 // https://github.com/gorhill/uBO-Extra/issues/19 | 56 // https://github.com/gorhill/uBO-Extra/issues/19 |
| 56 types: ["main_frame", "sub_frame", "script"] | 57 types: ["main_frame", "sub_frame", "script"] |
| 57 }, ["blocking", "responseHeaders"]); | 58 }, ["blocking", "responseHeaders"]); |
| OLD | NEW |
« no previous file with comments
|
« lib/compat.js ('k')
|
lib/devtools.js » ('j')
|
no next file with comments »
