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

Side by Side Diff: include.preload.js

Issue 29347034: Issue 1727 - Prevent circumvention via WebSocket (Closed)
Patch Set: Addressed further feedback Created Aug. 9, 2016, 12:05 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 | « no previous file | lib/requestBlocker.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-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
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 var MutationObserver = window.MutationObserver || window.WebKitMutationObserver; 18 var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
19 var SELECTOR_GROUP_SIZE = 200; 19 var SELECTOR_GROUP_SIZE = 200;
20 var id = Math.random().toString(36).substr(2);
20 21
21 var typeMap = { 22 var typeMap = {
22 "img": "IMAGE", 23 "img": "IMAGE",
23 "input": "IMAGE", 24 "input": "IMAGE",
24 "picture": "IMAGE", 25 "picture": "IMAGE",
25 "audio": "MEDIA", 26 "audio": "MEDIA",
26 "video": "MEDIA", 27 "video": "MEDIA",
27 "frame": "SUBDOCUMENT", 28 "frame": "SUBDOCUMENT",
28 "iframe": "SUBDOCUMENT", 29 "iframe": "SUBDOCUMENT",
29 "object": "OBJECT", 30 "object": "OBJECT",
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 var observer = new MutationObserver(function() 343 var observer = new MutationObserver(function()
343 { 344 {
344 if (style.parentNode != parentNode) 345 if (style.parentNode != parentNode)
345 parentNode.appendChild(style); 346 parentNode.appendChild(style);
346 }); 347 });
347 348
348 observer.observe(parentNode, {childList: true}); 349 observer.observe(parentNode, {childList: true});
349 return observer; 350 return observer;
350 } 351 }
351 352
353 function runInPage(fn, arg)
354 {
355 var script = document.createElement("script");
356 script.type = "application/javascript";
357 script.async = false;
358
359 // include.youtube.js passes this function is passed a RegExp which
Sebastian Noack 2016/08/09 15:09:37 This reads weird. Typo? In include.youtube.js,
kzar 2016/08/09 16:11:40 Done.
360 // JSON.stringify would convert to "{}".
361 if (!(arg instanceof RegExp))
Sebastian Noack 2016/08/09 14:53:30 It seems this wasn't necessary before. So why is i
Sebastian Noack 2016/08/09 15:09:37 Never mind, I got it, (misinterpreted the conditio
362 arg = JSON.stringify(arg);
363
364 script.textContent = "(" + fn + ")(" + arg + ");";
365 document.documentElement.appendChild(script);
366 document.documentElement.removeChild(script);
367 }
368
352 function protectStyleSheet(document, style) 369 function protectStyleSheet(document, style)
353 { 370 {
354 var id = Math.random().toString(36).substr(2)
355 style.id = id; 371 style.id = id;
356 372
357 var code = [ 373 var protector = function(id)
358 "(function()", 374 {
359 "{", 375 var style = document.getElementById(id) ||
360 ' var style = document.getElementById("' + id + '") ||', 376 document.documentElement.shadowRoot.getElementById(id);
361 ' document.documentElement.shadowRoot.getElementById("' + id + '");', 377 style.removeAttribute("id");
362 ' style.removeAttribute("id");'
363 ];
364 378
365 var disableables = ["style", "style.sheet"]; 379 var disableables = [style, style.sheet];
366 for (var i = 0; i < disableables.length; i++) 380 for (var i = 0; i < disableables.length; i++)
381 Object.defineProperty(disableables[i], "disabled",
382 {value: false, enumerable: true});
383
384 ["deleteRule", "removeRule"].forEach(function(method)
385 {
386 var original = CSSStyleSheet.prototype[method];
387 CSSStyleSheet.prototype[method] = function(index)
388 {
389 if (this != style.sheet)
390 original.call(this, index);
391 };
Sebastian Noack 2016/08/09 15:41:15 Bind those functions as well? Otherwise we can sti
kzar 2016/08/09 16:11:40 Done.
392 });
393 };
394
395 runInPage(protector, id);
396 }
397
398 // Neither Chrome[1] nor Safari allow us to intercept WebSockets, and therefore
399 // some ad networks are misusing them as a way to serve adverts and circumvent
400 // us. As a workaround we wrap WebSocket, preventing blocked WebSocket
401 // connections from being opened.
402 // [1] - https://bugs.chromium.org/p/chromium/issues/detail?id=129353
403 function wrapWebSocket()
404 {
405 if (typeof WebSocket == "undefined")
406 return;
407
408 var eventName = "abpws-" + id;
409
410 document.addEventListener(eventName, function(event)
367 { 411 {
368 code.push(" Object.defineProperty(" + disableables[i] + ', "disabled", ' 412 ext.backgroundPage.sendMessage({
369 + "{value: false, enumerable: true});") ; 413 type: "websocket-request",
414 url: event.detail.url
415 }, function (block)
416 {
417 document.dispatchEvent(
418 new CustomEvent(eventName + "-" + event.detail.url, {detail: block})
419 );
420 });
421 });
422
423 function wrapper(eventName)
Sebastian Noack 2016/08/09 14:53:30 I just noticed that the argument name is the same
Sebastian Noack 2016/08/09 14:53:30 I just noticed a minor inconsistency, while you us
kzar 2016/08/09 16:11:39 Done.
kzar 2016/08/09 16:11:40 I'd rather leave this being called eventName, I th
424 {
425 // As far as possible we must track everything we use that could be
426 // sabotaged by the website later in order to circumvent us.
427 var RealWebSocket = WebSocket;
428 var closeWebSocket = RealWebSocket.prototype.close;
429 var addEventListener = document.addEventListener.bind(document);
430 var removeEventListener = document.removeEventListener.bind(document);
431 var dispatchEvent = document.dispatchEvent.bind(document);
432 var CustomEvent = window.CustomEvent;
433 var boundCall = Function.prototype.call.bind(Function.prototype.call);
434 var functionToString = Function.prototype.toString;
435 // (Safari 9 considers WebSocket to be an object rather than a function.)
436 var webSocketString = RealWebSocket.toString();
437
438 function checkRequest(url, callback)
439 {
440 var incomingEventName = eventName + "-" + url;
441 function listener(event)
442 {
443 callback(event.detail);
444 removeEventListener(incomingEventName, listener);
445 }
446 addEventListener(incomingEventName, listener);
447
448 dispatchEvent(new CustomEvent(eventName, {
449 detail: {url: url}
450 }));
451 }
452
453 function wrappedToString()
454 {
455 if (this === WebSocket)
456 return webSocketString;
457 if (this === wrappedToString)
458 return boundCall(functionToString, functionToString);
459 return boundCall(functionToString, this);
460 };
461 Function.prototype.toString = wrappedToString;
462
463 WebSocket = function(url, protocols)
464 {
465 var websocket = new RealWebSocket(url, protocols);
466
467 checkRequest(websocket.url, function(blocked)
468 {
469 if (blocked)
470 boundCall(closeWebSocket, websocket);
471 });
472
473 return websocket;
474 };
475
476 var properties = Object.getOwnPropertyNames(RealWebSocket);
477 for (var i = 0; i < properties.length; i++)
478 {
479 var name = properties[i];
480 var desc = Object.getOwnPropertyDescriptor(RealWebSocket, name);
481 Object.defineProperty(WebSocket, name, desc);
482 }
483
484 RealWebSocket.prototype.constructor = WebSocket;
370 } 485 }
371 486
372 var methods = ["deleteRule", "removeRule"]; 487 runInPage(wrapper, eventName);
373 for (var j = 0; j < methods.length; j++)
374 {
375 var method = methods[j];
376 if (method in CSSStyleSheet.prototype)
377 {
378 var origin = "CSSStyleSheet.prototype." + method;
379 code.push(" var " + method + " = " + origin + ";",
380 " " + origin + " = function(index)",
381 " {",
382 " if (this != style.sheet)",
383 " " + method + ".call(this, index);",
384 " }");
385 }
386 }
387
388 code.push("})();");
389
390 var script = document.createElement("script");
391 script.async = false;
392 script.textContent = code.join("\n");
393 document.documentElement.appendChild(script);
394 document.documentElement.removeChild(script);
395 } 488 }
396 489
397 function init(document) 490 function init(document)
398 { 491 {
399 var shadow = null; 492 var shadow = null;
400 var style = null; 493 var style = null;
401 var observer = null; 494 var observer = null;
402 var tracer = null; 495 var tracer = null;
403 496
497 wrapWebSocket();
498
404 function getPropertyFilters(callback) 499 function getPropertyFilters(callback)
405 { 500 {
406 ext.backgroundPage.sendMessage({ 501 ext.backgroundPage.sendMessage({
407 type: "filters.get", 502 type: "filters.get",
408 what: "cssproperties" 503 what: "cssproperties"
409 }, callback); 504 }, callback);
410 } 505 }
411 var propertyFilters = new CSSPropertyFilters(window, getPropertyFilters, 506 var propertyFilters = new CSSPropertyFilters(window, getPropertyFilters,
412 addElemHideSelectors); 507 addElemHideSelectors);
413 508
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 }, true); 659 }, true);
565 660
566 return updateStylesheet; 661 return updateStylesheet;
567 } 662 }
568 663
569 if (document instanceof HTMLDocument) 664 if (document instanceof HTMLDocument)
570 { 665 {
571 checkSitekey(); 666 checkSitekey();
572 window.updateStylesheet = init(document); 667 window.updateStylesheet = init(document);
573 } 668 }
OLDNEW
« no previous file with comments | « no previous file | lib/requestBlocker.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld