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

Side by Side Diff: lib/requestBlocker.js

Issue 29705719: Issue 6402 - Split filter hit / request logging out into own API (Closed)
Patch Set: Fixed typo and exposed pageId for logged requests Created Feb. 22, 2018, 3:55 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 | « lib/popupBlocker.js ('k') | lib/whitelisting.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 /** @module requestBlocker */ 18 /** @module requestBlocker */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses"); 22 const {Filter, RegExpFilter, BlockingFilter} = require("filterClasses");
23 const {Subscription} = require("subscriptionClasses"); 23 const {Subscription} = require("subscriptionClasses");
24 const {defaultMatcher} = require("matcher"); 24 const {defaultMatcher} = require("matcher");
25 const {FilterNotifier} = require("filterNotifier"); 25 const {FilterNotifier} = require("filterNotifier");
26 const {Prefs} = require("prefs"); 26 const {Prefs} = require("prefs");
27 const {checkWhitelisted, getKey} = require("whitelisting"); 27 const {checkWhitelisted, getKey} = require("whitelisting");
28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url"); 28 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url");
29 const {port} = require("messaging"); 29 const {port} = require("messaging");
30 const devtools = require("devtools"); 30 const {logRequest} = require("devLogger");
31 31
32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests. 32 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
33 if (!browser.webRequest.ResourceType || 33 if (!browser.webRequest.ResourceType ||
34 !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType)) 34 !("OBJECT_SUBREQUEST" in browser.webRequest.ResourceType))
35 { 35 {
36 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT; 36 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
37 } 37 }
38 38
39 // Map of content types reported by the browser to the respecitve content types 39 // Map of content types reported by the browser to the respecitve content types
40 // used by Adblock Plus. Other content types are simply mapped to OTHER. 40 // used by Adblock Plus. Other content types are simply mapped to OTHER.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 yield "ELEMHIDE"; 74 yield "ELEMHIDE";
75 }()); 75 }());
76 76
77 function onBeforeRequestAsync(page, url, type, docDomain, 77 function onBeforeRequestAsync(page, url, type, docDomain,
78 thirdParty, sitekey, 78 thirdParty, sitekey,
79 specificOnly, filter) 79 specificOnly, filter)
80 { 80 {
81 if (filter) 81 if (filter)
82 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page); 82 FilterNotifier.emit("filter.hitCount", filter, 0, 0, page);
83 83
84 if (devtools) 84 logRequest(
85 { 85 page, url, type, docDomain,
86 devtools.logRequest( 86 thirdParty, sitekey,
87 page, url, type, docDomain, 87 specificOnly, filter
88 thirdParty, sitekey, 88 );
89 specificOnly, filter
90 );
91 }
92 } 89 }
93 90
94 ext.webRequest.onBeforeRequest.addListener((url, type, page, frame) => 91 ext.webRequest.onBeforeRequest.addListener((url, type, page, frame) =>
95 { 92 {
96 let docDomain = null; 93 let docDomain = null;
97 let sitekey = null; 94 let sitekey = null;
98 let specificOnly = false; 95 let specificOnly = false;
99 let thirdParty = false; 96 let thirdParty = false;
100 let urlString = stringifyURL(url); 97 let urlString = stringifyURL(url);
101 98
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 return false; 215 return false;
219 } 216 }
220 217
221 return ext.webRequest.onBeforeRequest._dispatch( 218 return ext.webRequest.onBeforeRequest._dispatch(
222 new URL(msg.url), 219 new URL(msg.url),
223 msg.requestType, 220 msg.requestType,
224 sender.page, 221 sender.page,
225 sender.frame 222 sender.frame
226 ).includes(false); 223 ).includes(false);
227 }); 224 });
OLDNEW
« no previous file with comments | « lib/popupBlocker.js ('k') | lib/whitelisting.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld