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

Unified Diff: include.preload.js

Issue 29347034: Issue 1727 - Prevent circumvention via WebSocket (Closed)
Patch Set: Don't hardcode connection state values Created Aug. 10, 2016, 4:25 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | lib/requestBlocker.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include.preload.js
diff --git a/include.preload.js b/include.preload.js
index 949d039663f9130843b4d8d0a3ddfcb434522066..393c01934723231de0d395e38a903b0b4bbed6c1 100644
--- a/include.preload.js
+++ b/include.preload.js
@@ -17,6 +17,7 @@
var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
var SELECTOR_GROUP_SIZE = 200;
+var id = Math.random().toString(36).substr(2);
var typeMap = {
"img": "IMAGE",
@@ -349,49 +350,121 @@ function reinjectStyleSheetWhenRemoved(document, style)
return observer;
}
+function runInPage(fn, arg)
+{
+ var script = document.createElement("script");
+ script.type = "application/javascript";
+ script.async = false;
+ script.textContent = "(" + fn + ")(" + JSON.stringify(arg) + ");";
+ document.documentElement.appendChild(script);
+ document.documentElement.removeChild(script);
+}
+
function protectStyleSheet(document, style)
{
- var id = Math.random().toString(36).substr(2)
style.id = id;
- var code = [
- "(function()",
- "{",
- ' var style = document.getElementById("' + id + '") ||',
- ' document.documentElement.shadowRoot.getElementById("' + id + '");',
- ' style.removeAttribute("id");'
- ];
+ runInPage(function(id)
+ {
+ var style = document.getElementById(id) ||
+ document.documentElement.shadowRoot.getElementById(id);
+ style.removeAttribute("id");
+
+ var disableables = [style, style.sheet];
+ for (var i = 0; i < disableables.length; i++)
+ Object.defineProperty(disableables[i], "disabled",
+ {value: false, enumerable: true});
+
+ ["deleteRule", "removeRule"].forEach(function(method)
+ {
+ var original = CSSStyleSheet.prototype[method];
+ CSSStyleSheet.prototype[method] = function(index)
+ {
+ if (this != style.sheet)
+ original.call(this, index);
+ };
+ });
+ }, id);
+}
+
+// Neither Chrome[1] nor Safari allow us to intercept WebSockets, and therefore
+// some ad networks are misusing them as a way to serve adverts and circumvent
+// us. As a workaround we wrap WebSocket, preventing blocked WebSocket
+// connections from being opened.
+// [1] - https://bugs.chromium.org/p/chromium/issues/detail?id=129353
+function wrapWebSocket()
+{
+ if (typeof WebSocket == "undefined")
+ return;
+
+ var eventName = "abpws-" + id;
- var disableables = ["style", "style.sheet"];
- for (var i = 0; i < disableables.length; i++)
+ document.addEventListener(eventName, function(event)
{
- code.push(" Object.defineProperty(" + disableables[i] + ', "disabled", '
- + "{value: false, enumerable: true});");
- }
+ ext.backgroundPage.sendMessage({
+ type: "websocket-request",
+ url: event.detail.url
+ }, function (block)
+ {
+ document.dispatchEvent(
+ new CustomEvent(eventName + "-" + event.detail.url, {detail: block})
+ );
+ });
+ });
- var methods = ["deleteRule", "removeRule"];
- for (var j = 0; j < methods.length; j++)
+ runInPage(function(eventName)
{
- var method = methods[j];
- if (method in CSSStyleSheet.prototype)
+ // As far as possible we must track everything we use that could be
+ // sabotaged by the website later in order to circumvent us.
+ var RealWebSocket = WebSocket;
+ var closeWebSocket = Function.prototype.call.bind(RealWebSocket.prototype.close);
+ var addEventListener = document.addEventListener.bind(document);
+ var removeEventListener = document.removeEventListener.bind(document);
+ var dispatchEvent = document.dispatchEvent.bind(document);
+ var CustomEvent = window.CustomEvent;
+
+ function checkRequest(url, callback)
{
- var origin = "CSSStyleSheet.prototype." + method;
- code.push(" var " + method + " = " + origin + ";",
- " " + origin + " = function(index)",
- " {",
- " if (this != style.sheet)",
- " " + method + ".call(this, index);",
- " }");
+ var incomingEventName = eventName + "-" + url;
+ function listener(event)
+ {
+ callback(event.detail);
+ removeEventListener(incomingEventName, listener);
+ }
+ addEventListener(incomingEventName, listener);
+
+ dispatchEvent(new CustomEvent(eventName, {
+ detail: {url: url}
+ }));
}
- }
- code.push("})();");
+ WebSocket = function WrappedWebSocket(url, protocols)
+ {
+ // Throw correct exceptions if the constructor is used improperly.
+ if (!(this instanceof WrappedWebSocket)) return RealWebSocket();
+ if (arguments.length < 1) return new RealWebSocket();
- var script = document.createElement("script");
- script.async = false;
- script.textContent = code.join("\n");
- document.documentElement.appendChild(script);
- document.documentElement.removeChild(script);
+ var websocket = new RealWebSocket(url, protocols);
+
+ checkRequest(websocket.url, function(blocked)
+ {
+ if (blocked)
+ closeWebSocket(websocket);
+ });
+
+ return websocket;
+ }.bind();
+
+ Object.defineProperties(WebSocket, {
+ CONNECTING: {value: RealWebSocket.CONNECTING, enumerable: true},
+ OPEN: {value: RealWebSocket.OPEN, enumerable: true},
+ CLOSING: {value: RealWebSocket.CLOSING, enumerable: true},
+ CLOSED: {value: RealWebSocket.CLOSED, enumerable: true},
+ prototype: {value: RealWebSocket.prototype}
+ });
+
+ RealWebSocket.prototype.constructor = WebSocket;
+ }, eventName);
}
function init(document)
@@ -401,6 +474,8 @@ function init(document)
var observer = null;
var tracer = null;
+ wrapWebSocket();
+
function getPropertyFilters(callback)
{
ext.backgroundPage.sendMessage({
« 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