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

Side by Side Diff: lib/devtools.js

Issue 29680696: [$csp4 adblockpluschrome] Issue 5241 - Add support for Content Security Policy filters (Closed)
Patch Set: Use extractHostFromFrame and attempt to match $csp exceptions non-recursively Created March 16, 2018, 12:43 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
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 const {RegExpFilter, 20 const {RegExpFilter,
21 WhitelistFilter, 21 WhitelistFilter,
22 ElemHideFilter} = require("filterClasses"); 22 ElemHideFilter} = require("filterClasses");
23 const {SpecialSubscription} = require("subscriptionClasses"); 23 const {SpecialSubscription} = require("subscriptionClasses");
24 const {FilterStorage} = require("filterStorage"); 24 const {FilterStorage} = require("filterStorage");
25 const {defaultMatcher} = require("matcher"); 25 const {defaultMatcher} = require("matcher");
26 const {FilterNotifier} = require("filterNotifier"); 26 const {FilterNotifier} = require("filterNotifier");
27 const {extractHostFromFrame} = require("url"); 27 const {extractHostFromFrame} = require("url");
28 const {port} = require("messaging"); 28 const {port} = require("messaging");
29 29
30 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE", "GENERICBLOCK", "GENERICHIDE"]; 30 const nonRequestTypes = ["DOCUMENT", "ELEMHIDE",
31 "GENERICBLOCK", "GENERICHIDE", "CSP"];
31 32
32 // Mapping of inspected tabs to their devpanel page 33 // Mapping of inspected tabs to their devpanel page
33 // and recorded items. We can't use a PageMap here, 34 // and recorded items. We can't use a PageMap here,
34 // because data must persist after navigation/reload. 35 // because data must persist after navigation/reload.
35 let panels = new Map(); 36 let panels = new Map();
36 37
37 function isActivePanel(panel) 38 function isActivePanel(panel)
38 { 39 {
39 return panel && !panel.reload && !panel.reloading; 40 return panel && !panel.reload && !panel.reloading;
40 } 41 }
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 panels.set(inspectedTabId, {port: newPort, records: []}); 378 panels.set(inspectedTabId, {port: newPort, records: []});
378 }); 379 });
379 380
380 port.on("devtools.traceElemHide", (message, sender) => 381 port.on("devtools.traceElemHide", (message, sender) =>
381 { 382 {
382 logHiddenElements( 383 logHiddenElements(
383 sender.page, message.selectors, message.filters, 384 sender.page, message.selectors, message.filters,
384 extractHostFromFrame(sender.frame) 385 extractHostFromFrame(sender.frame)
385 ); 386 );
386 }); 387 });
OLDNEW

Powered by Google App Engine
This is Rietveld