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 feedback Created Aug. 8, 2016, 6:16 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 injectJS(f)
Sebastian Noack 2016/08/08 22:09:15 I just noticed that this function is redundant wit
kzar 2016/08/09 12:08:05 Done.
354 {
355 var args = JSON.stringify(Array.prototype.slice.call(arguments, 1));
356 args = args.substring(1, args.length - 1);
357 var codeString = "(" + f.toString() + ")(" + args + ");";
358
359 var script = document.createElement("script");
360 script.async = false;
361 script.textContent = codeString;
362 document.documentElement.appendChild(script);
363 document.documentElement.removeChild(script);
364 }
365
352 function protectStyleSheet(document, style) 366 function protectStyleSheet(document, style)
353 { 367 {
354 var id = Math.random().toString(36).substr(2)
355 style.id = id; 368 style.id = id;
356 369
357 var code = [ 370 var protector = function(id)
358 "(function()", 371 {
359 "{", 372 var style = document.getElementById(id) ||
360 ' var style = document.getElementById("' + id + '") ||', 373 document.documentElement.shadowRoot.getElementById(id);
361 ' document.documentElement.shadowRoot.getElementById("' + id + '");', 374 style.removeAttribute("id");
362 ' style.removeAttribute("id");'
363 ];
364 375
365 var disableables = ["style", "style.sheet"]; 376 var i;
Sebastian Noack 2016/08/08 22:09:15 It seems that you don' reuse the variable i anymor
kzar 2016/08/09 12:08:05 Done.
366 for (var i = 0; i < disableables.length; i++) 377 var disableables = [style, style.sheet];
378 for (i = 0; i < disableables.length; i++)
379 Object.defineProperty(disableables[i], "disabled",
380 {value: false, enumerable: true});
381
382 var methods = ["deleteRule", "removeRule"];
Sebastian Noack 2016/08/08 22:09:15 How about ["deleteRule", "removeRule"].forEach(),
kzar 2016/08/09 12:08:05 Done.
383 methods.forEach(function(method)
384 {
385 var original = CSSStyleSheet.prototype[method];
386 CSSStyleSheet.prototype[method] = function(index)
387 {
388 if (this != style.sheet)
389 original.call(this, index);
390 };
391 });
392 };
393
394 injectJS(protector, id);
395 }
396
397 // Neither Chrome[1] nor Safari allow us to intercept WebSockets, and therefore
398 // some ad networks are misusing them as a way to serve adverts and circumvent
399 // us. As a workaround we wrap WebSocket, preventing blocked WebSocket
400 // connections from being opened.
401 // [1] - https://bugs.chromium.org/p/chromium/issues/detail?id=129353
402 function wrapWebSocket()
403 {
404 if (typeof WebSocket == "undefined")
405 return;
406
407 var eventName = "abpws-" + id;
408
409 document.addEventListener(eventName, function(event)
367 { 410 {
368 code.push(" Object.defineProperty(" + disableables[i] + ', "disabled", ' 411 ext.backgroundPage.sendMessage({
369 + "{value: false, enumerable: true});") ; 412 type: "websocket-request",
413 url: event.detail.url
414 }, function (block)
415 {
416 document.dispatchEvent(
417 new CustomEvent(eventName + "-" + event.detail.url, {detail: block})
418 );
419 });
420 });
421
422 function wrapper(eventName)
423 {
424 // As far as possible we must track everything we use that could be
425 // sabotaged by the website later in order to circumvent us.
426 var RealWebSocket = WebSocket;
427 var closeWebSocket = RealWebSocket.prototype.close;
428 var addEventListener = document.addEventListener.bind(document);
429 var removeEventListener = document.removeEventListener.bind(document);
430 var dispatchEvent = document.dispatchEvent.bind(document);
431 var CustomEvent = window.CustomEvent;
432 var boundCall = Function.prototype.call.bind(Function.prototype.call);
433 var stringToString = String.prototype.toString;
434 // (These two functions are usually the same, but since Safari 9 considers
435 // WebSocket to be an object rather than a function we must track both.)
436 var functionToString = Function.prototype.toString;
437 var WebSocketString = RealWebSocket.toString();
Sebastian Noack 2016/08/08 22:09:15 I suppose this variable should rather be lowercase
kzar 2016/08/09 12:08:05 Done.
438
439 function checkRequest(url, callback)
440 {
441 var incomingEventName = eventName + "-" + url;
442 function listener(event)
443 {
444 callback(event.detail);
445 removeEventListener(incomingEventName, listener);
446 }
447 addEventListener(incomingEventName, listener);
448
449 dispatchEvent(new CustomEvent(eventName, {
450 detail: {url: url}
451 }));
452 }
453
454 function wrappedToString()
455 {
456 if (this === WebSocket)
Sebastian Noack 2016/08/08 22:09:16 As per Mozilla's coding practices, we prefer == ov
kzar 2016/08/09 12:08:04 Sure but here we want to check that `this` points
Sebastian Noack 2016/08/09 14:53:29 I think, if none of the values has a primitive typ
kzar 2016/08/09 16:11:39 Well to tell you the truth I'm not 100% sure if ty
457 return WebSocketString;
458 if (this === wrappedToString)
Sebastian Noack 2016/08/08 22:09:15 This special case is unneccessary if you simply as
kzar 2016/08/09 12:08:04 (I tried it out but found I would get the exceptio
Sebastian Noack 2016/08/09 14:53:29 Even better, why not just |WebSocket = function(..
kzar 2016/08/09 16:11:39 Well nice idea but then WebSocket.toString() gives
459 return boundCall(functionToString, functionToString);
460 return boundCall(functionToString, this);
461 };
462 Function.prototype.toString = wrappedToString;
463
464 WebSocket = function(url, protocols)
465 {
466 // Ensure that `new WebSocket();` throws the correct exception
467 if (!url)
468 return new RealWebSocket();
Sebastian Noack 2016/08/08 22:09:15 You still get a different error when null or undef
kzar 2016/08/09 12:08:05 Hmm good point and we can even just use `websocket
Sebastian Noack 2016/08/09 14:53:29 Even better, nice!
469
470 // First ensure url isn't a URL object, then make sure it's a real String.
471 // This is necessary to prevent circumvention, without breaking anything.
472 url = boundCall(stringToString, url.toString());
Sebastian Noack 2016/08/08 22:09:15 8Why) do you have to call both, stringToString() a
473
474 var websocket = new RealWebSocket(url, protocols);
475
476 checkRequest(url, function(blocked)
477 {
478 if (blocked)
479 boundCall(closeWebSocket, websocket);
480 });
481
482 return websocket;
483 };
484
485 var properties = Object.getOwnPropertyNames(RealWebSocket);
486 for (var i = 0; i < properties.length; i++)
487 {
488 var name = properties[i];
489 var desc = Object.getOwnPropertyDescriptor(RealWebSocket, name);
490 Object.defineProperty(WebSocket, name, desc);
491 }
492
493 RealWebSocket.prototype.constructor = WebSocket;
370 } 494 }
371 495
372 var methods = ["deleteRule", "removeRule"]; 496 injectJS(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 } 497 }
396 498
397 function init(document) 499 function init(document)
398 { 500 {
399 var shadow = null; 501 var shadow = null;
400 var style = null; 502 var style = null;
401 var observer = null; 503 var observer = null;
402 var tracer = null; 504 var tracer = null;
403 505
506 wrapWebSocket();
507
404 function getPropertyFilters(callback) 508 function getPropertyFilters(callback)
405 { 509 {
406 ext.backgroundPage.sendMessage({ 510 ext.backgroundPage.sendMessage({
407 type: "filters.get", 511 type: "filters.get",
408 what: "cssproperties" 512 what: "cssproperties"
409 }, callback); 513 }, callback);
410 } 514 }
411 var propertyFilters = new CSSPropertyFilters(window, getPropertyFilters, 515 var propertyFilters = new CSSPropertyFilters(window, getPropertyFilters,
412 addElemHideSelectors); 516 addElemHideSelectors);
413 517
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 }, true); 668 }, true);
565 669
566 return updateStylesheet; 670 return updateStylesheet;
567 } 671 }
568 672
569 if (document instanceof HTMLDocument) 673 if (document instanceof HTMLDocument)
570 { 674 {
571 checkSitekey(); 675 checkSitekey();
572 window.updateStylesheet = init(document); 676 window.updateStylesheet = init(document);
573 } 677 }
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