www

commit 924c537473d96eda96c432fb8c843337ee07a385
parent ee101b5bc028b70e873bcd6abc38a0ea507f3af5
Author: Simon Kornblith <simon@simonster.com>
Date:   Fri,  5 Nov 2010 03:34:20 +0000

perform full same origin check on translator for getTranslatorObject(), rather than checking equality of URIs


Diffstat:
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
21
++++++++++++++++++---

1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -265,10 +265,25 @@ Zotero.Translate.Sandbox = {
 			};
 			safeTranslator.getTranslatorObject = function() {
 				translation._loadTranslator(translation.translator[0]);
-				if(translate._sandboxLocation != translation._sandboxLocation) {
-					throw "Translate: getTranslatorObject() may not be called from web or search "+
-						"translators to web or search translators with different URIs.";
+				
+				if(this.isFx) {
+					// do same origin check
+					var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
+						.getService(Components.interfaces.nsIScriptSecurityManager);
+					var ioService = Components.classes["@mozilla.org/network/io-service;1"] 
+						.getService(Components.interfaces.nsIIOService);
+					
+					var outerSandboxURI = ioService.newURI(typeof translate._sandboxLocation === "object" ?
+						translate._sandboxLocation.location : translate._sandboxLocation, null, null);
+					var innerSandboxURI = ioService.newURI(typeof translation._sandboxLocation === "object" ?
+						translation._sandboxLocation.location : translation._sandboxLocation, null, null);
+					
+					if(!secMan.checkSameOriginURI(outerSandboxURI, innerSandboxURI, false)) {
+						throw "Translate: getTranslatorObject() may not be called from web or search "+
+							"translators to web or search translators from different origins.";
+					}
 				}
+				
 				translation._prepareTranslation();
 				setDefaultHandlers(translate, translation);