Improved protection of (i)frame properties

Fixes #364

lib/iframeProtection.js

@@ -11,43 +11,52 @@
 	else {
 		scope = require.register("./iframeProtection", {});
 	}
-	const {getWrapped} = require("./modifiedAPIFunctions");
 	
 	scope.protect = function protect(window, wrappedWindow, singleCallback, allCallback){
 		
-		[window.HTMLIFrameElement, window.HTMLFrameElement].forEach(function(constructor){
+		["HTMLIFrameElement", "HTMLFrameElement"].forEach(function(constructorName){
-			var oldContentWindowGetter = constructor.prototype.__lookupGetter__("contentWindow");
+			const constructor = window[constructorName];
-			Object.defineProperty(
+			const wrappedConstructor = wrappedWindow[constructorName];
-				getWrapped(constructor.prototype),
+			
-				"contentWindow",
+			const contentWindowDescriptor = Object.getOwnPropertyDescriptor(
-				{
+				constructor.prototype,
-					enumerable: true,
+				"contentWindow"
-					configurable: true,
-					get: exportFunction(function(){
-						var window = oldContentWindowGetter.call(this);
-						if (window){
-							singleCallback(window);
-						}
-						return window;
-					}, window)
-				}
 			);
-			var oldContentDocumentGetter = constructor.prototype.__lookupGetter__("contentDocument");
+			const originalContentWindowGetter = contentWindowDescriptor.get;
-			Object.defineProperty(
+			const contentWindowTemp = {
-				getWrapped(constructor.prototype),
+				get contentWindow(){
-				"contentDocument",
+					var window = originalContentWindowGetter.call(this);
-				{
+					if (window){
-					enumerable: true,
+						singleCallback(window);
-					configurable: true,
+					}
-					get: exportFunction(function(){
+					return window;
-						var document = oldContentDocumentGetter.call(this);
-						if (document){
-							singleCallback(document.defaultView);
-						}
-						return document;
-					}, window)
 				}
+			};
+			contentWindowDescriptor.get = exportFunction(
+				Object.getOwnPropertyDescriptor(contentWindowTemp, "contentWindow").get,
+				window
 			);
+			Object.defineProperty(wrappedConstructor.prototype, "contentWindow", contentWindowDescriptor);
+			
+			const contentDocumentDescriptor = Object.getOwnPropertyDescriptor(
+				constructor.prototype,
+				"contentDocument"
+			);
+			const originalContentDocumentGetter = contentDocumentDescriptor.get;
+			const contentDocumentTemp = {
+				get contentDocument(){
+					var document = originalContentDocumentGetter.call(this);
+					if (document){
+						singleCallback(document.defaultView);
+					}
+					return document;
+				}
+			};
+			contentDocumentDescriptor.get = exportFunction(
+				Object.getOwnPropertyDescriptor(contentDocumentTemp, "contentDocument").get,
+				window
+			);
+			Object.defineProperty(wrappedConstructor.prototype, "contentDocument", contentDocumentDescriptor);
 		});
 		[
 			// useless as length could be obtained before the iframe is created and window.frames === window

releaseNotes.txt

@@ -6,7 +6,7 @@ Version 0.5.11:
 		- 
 	
 	fixes:
-		- 
+		- improved protection of (i)frame properties
 	
 	known issues:
 		- if a data URL is blocked the page action button does not appear

test/detectionTest.js

@@ -200,6 +200,10 @@ addTest("function name", function(log){
 			func: window.__lookupSetter__("name"),
 			expectedName: "set name"
 		},
+		{
+			func: HTMLIFrameElement.prototype.__lookupGetter__("contentDocument"),
+			expectedName: "get contentDocument"
+		},
 	].map(checkName).some(function(b){return b;});
 });
 addTest("property descriptor", function(log){