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

Delta Between Two Patch Sets: lib/popupBlocker.js

Issue 29705719: Issue 6402 - Split filter hit / request logging out into own API (Closed)
Left Patch Set: Rebased Created April 30, 2018, 1:01 p.m.
Right Patch Set: Addressed Manish's feedback Created May 9, 2018, 5:53 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « lib/hitLogger.js ('k') | lib/requestBlocker.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 popupBlocker */ 18 /** @module popupBlocker */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher"); 22 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
23 const {BlockingFilter, 23 const {BlockingFilter,
24 RegExpFilter} = require("../adblockpluscore/lib/filterClasses"); 24 RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
25 const {stringifyURL, isThirdParty, extractHostFromFrame} = require("./url"); 25 const {isThirdParty, extractHostFromFrame} = require("./url");
26 const {checkWhitelisted} = require("./whitelisting"); 26 const {checkWhitelisted} = require("./whitelisting");
27 const {logRequest} = require("./hitLogger"); 27 const {logRequest} = require("./hitLogger");
28 28
29 let loadingPopups = new Map(); 29 let loadingPopups = new Map();
30 30
31 function forgetPopup(tabId) 31 function forgetPopup(tabId)
32 { 32 {
33 loadingPopups.delete(tabId); 33 loadingPopups.delete(tabId);
34 34
35 if (loadingPopups.size == 0) 35 if (loadingPopups.size == 0)
36 { 36 {
37 browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged); 37 browser.webRequest.onBeforeRequest.removeListener(onPopupURLChanged);
38 browser.webNavigation.onCommitted.removeListener(onPopupURLChanged); 38 browser.webNavigation.onCommitted.removeListener(onPopupURLChanged);
39 browser.webNavigation.onCompleted.removeListener(onCompleted); 39 browser.webNavigation.onCompleted.removeListener(onCompleted);
40 browser.tabs.onRemoved.removeListener(forgetPopup); 40 browser.tabs.onRemoved.removeListener(forgetPopup);
41 } 41 }
42 } 42 }
43 43
44 function checkPotentialPopup(tabId, popup) 44 function checkPotentialPopup(tabId, popup)
45 { 45 {
46 let urlObj = new URL(popup.url || "about:blank"); 46 let url = popup.url || "about:blank";
47 let urlString = stringifyURL(urlObj);
48 let documentHost = extractHostFromFrame(popup.sourceFrame); 47 let documentHost = extractHostFromFrame(popup.sourceFrame);
49 let thirdParty = isThirdParty(urlObj, documentHost); 48 let thirdParty = isThirdParty(new URL(url), documentHost);
50 49
51 let specificOnly = !!checkWhitelisted( 50 let specificOnly = !!checkWhitelisted(
52 popup.sourcePage, popup.sourceFrame, null, 51 popup.sourcePage, popup.sourceFrame, null,
53 RegExpFilter.typeMap.GENERICBLOCK 52 RegExpFilter.typeMap.GENERICBLOCK
54 ); 53 );
55 54
56 let filter = defaultMatcher.matchesAny( 55 let filter = defaultMatcher.matchesAny(
57 urlString, RegExpFilter.typeMap.POPUP, 56 url, RegExpFilter.typeMap.POPUP,
58 documentHost, thirdParty, null, specificOnly 57 documentHost, thirdParty, null, specificOnly
59 ); 58 );
60 59
61 if (filter instanceof BlockingFilter) 60 if (filter instanceof BlockingFilter)
62 browser.tabs.remove(tabId); 61 browser.tabs.remove(tabId);
63 62
64 logRequest( 63 logRequest(
65 [popup.sourcePage.id], urlString, "POPUP", 64 [popup.sourcePage.id],
66 documentHost, thirdParty, null, 65 {url, type: "POPUP", docDomain: documentHost, thirdParty, specificOnly},
67 specificOnly, filter 66 filter
68 ); 67 );
69 } 68 }
70 69
71 function onPopupURLChanged(details) 70 function onPopupURLChanged(details)
72 { 71 {
73 // Ignore frames inside the popup window. 72 // Ignore frames inside the popup window.
74 if (details.frameId != 0) 73 if (details.frameId != 0)
75 return; 74 return;
76 75
77 let popup = loadingPopups.get(details.tabId); 76 let popup = loadingPopups.get(details.tabId);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 { 123 {
125 forgetPopup(details.tabId); 124 forgetPopup(details.tabId);
126 } 125 }
127 else 126 else
128 { 127 {
129 popup.sourceFrame = frame; 128 popup.sourceFrame = frame;
130 checkPotentialPopup(details.tabId, popup); 129 checkPotentialPopup(details.tabId, popup);
131 } 130 }
132 }); 131 });
133 } 132 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld