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

Unified Diff: lib/child/contentPolicy.js

Issue 29336233: Issue 3568 - Block pop-ups opened via an intermediate window (Closed)
Patch Set: Fixed small logic flaw Created Feb. 10, 2016, 3:14 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/child/contentPolicy.js
===================================================================
--- a/lib/child/contentPolicy.js
+++ b/lib/child/contentPolicy.js
@@ -303,26 +303,43 @@ var PolicyImplementation =
shouldProcess: function(contentType, contentLocation, requestOrigin, insecNode, mimeType, extra)
{
return Ci.nsIContentPolicy.ACCEPT;
},
//
// nsIObserver interface implementation
//
- observe: function(subject, topic, data, uri, opener)
+ _openers: new WeakMap(),
+
+ observe: function(subject, topic, data, uri)
{
switch (topic)
{
case "content-document-global-created":
{
- if (!opener && subject instanceof Ci.nsIDOMWindow)
- opener = subject.opener;
+ var opener = this._openers.get(subject);
Thomas Greiner 2016/02/11 11:06:23 Detail: Usually, we use `let` over `var` to define
Wladimir Palant 2016/02/11 13:44:45 Done.
+ if (opener && Components.utils.isDeadWrapper(opener))
+ opener = null;
+
if (!opener)
- return;
+ {
+ // We don't know the opener for this window yet, try to find it
+ if (subject instanceof Ci.nsIDOMWindow)
+ opener = subject.opener;
+
+ if (!opener)
+ return;
+
+ // The opener might be an intermediate window, get the real one
+ while (opener.location == "about:blank" && opener.opener)
+ opener = opener.opener;
+
+ this._openers.set(subject, opener);
+ }
if (!uri && subject instanceof Ci.nsIDOMWindow)
uri = subject.location.href;
if (!shouldAllow(opener, opener.document, "POPUP", uri))
{
subject.stop();
Utils.runAsync(() => subject.close());
}
@@ -332,17 +349,17 @@ var PolicyImplementation =
// initiated asynchronously. Wait for that.
Utils.runAsync(() =>
{
let channel = subject.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDocShell)
.QueryInterface(Ci.nsIDocumentLoader)
.documentChannel;
if (channel)
- this.observe(subject, topic, data, channel.URI.spec, opener);
+ this.observe(subject, topic, data, channel.URI.spec);
});
}
break;
}
}
},
//
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld