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

Delta Between Two Patch Sets: lib/requestBlocker.js

Issue 29394585: Issue 5027 - Use updated webRequest API for WebSocket blocking (Closed)
Left Patch Set: addresses bad comments, and actually fixes requestBlocker logic Created March 28, 2017, 7:18 p.m.
Right Patch Set: change commit message, add chrome version to include.preload.js comments Created March 29, 2017, 12:04 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/csp.js ('k') | metadata.chrome » ('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-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 FilterNotifier.on("subscription.added", onFilterChange); 146 FilterNotifier.on("subscription.added", onFilterChange);
147 FilterNotifier.on("subscription.removed", onFilterChange); 147 FilterNotifier.on("subscription.removed", onFilterChange);
148 FilterNotifier.on("subscription.updated", onFilterChange); 148 FilterNotifier.on("subscription.updated", onFilterChange);
149 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true)); 149 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
150 FilterNotifier.on("filter.added", onFilterChange); 150 FilterNotifier.on("filter.added", onFilterChange);
151 FilterNotifier.on("filter.removed", onFilterChange); 151 FilterNotifier.on("filter.removed", onFilterChange);
152 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true)); 152 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
153 FilterNotifier.on("load", onFilterChange); 153 FilterNotifier.on("load", onFilterChange);
154 154
155 // On Chrome <58, the webRequest API doesn't intercept WebSocket connections, 155 // Before Chrome 58, the webRequest API didn't intercept WebSocket connections,
156 // see https://crbug.com/129353. 156 // (see https://crbug.com/129353). Hence we patched the WebSocket object as a
157 // 157 // workaround. WebSocket connections detected by this workaround are handled
158 // Hence we patched the WebSocket object as a workaround. WebSocket connections 158 // below.
159 // detected by this workaround are handled below.
160 if (!("WEBSOCKET" in chrome.webRequest.ResourceType)) 159 if (!("WEBSOCKET" in chrome.webRequest.ResourceType))
161 { 160 {
162 port.on("request.websocket", (msg, sender) => 161 port.on("request.websocket", (msg, sender) =>
163 { 162 {
164 return ext.webRequest.onBeforeRequest._dispatch( 163 return ext.webRequest.onBeforeRequest._dispatch(
165 new URL(msg.url), 164 new URL(msg.url),
166 "WEBSOCKET", 165 "WEBSOCKET",
167 sender.page, 166 sender.page,
168 sender.frame 167 sender.frame
169 ).indexOf(false) != -1; 168 ).indexOf(false) != -1;
170 }); 169 });
171 } 170 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld