mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix calling search translators from web translators with different sandboxes

Browse source
This commit is contained in:
Simon Kornblith 2010-11-21 02:52:50 +00:00
parent 87363fbe2e
commit 62d2af7d4c
1 changed files with 31 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

66
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -86,18 +86,6 @@ Zotero.Translate.Sandbox = {
// just return the item array // just return the item array
if(translate._libraryID === false || translate._parentTranslator) { if(translate._libraryID === false || translate._parentTranslator) {
translate.newItems.push(item); translate.newItems.push(item);
// if a parent sandbox exists, use complete() function from that sandbox
if(translate._parentTranslator) {
if(Zotero.isFx4) {
// XOWs would break this otherwise
item.complete = function() { translate._parentTranslator.Sandbox._itemDone(translate._parentTranslator, item) };
} else {
// SecurityManager vetos the Fx4 in Fx3.6 code for reasons I don't understand
item.complete = translate._parentTranslator._sandboxManager.sandbox.Zotero.Item.prototype.complete;
}
Zotero.debug("Translate: Calling itemDone from parent sandbox", 4);
}
translate._runHandler("itemDone", item); translate._runHandler("itemDone", item);
return; return;
} }
@ -162,26 +150,22 @@ Zotero.Translate.Sandbox = {
// for security reasons, safeTranslator wraps the translator object. // for security reasons, safeTranslator wraps the translator object.
// note that setLocation() is not allowed // note that setLocation() is not allowed
var safeTranslator = new Object(); var safeTranslator = new Object();
safeTranslator.setSearch = function(arg) { return translation.setSearch(arg) }; safeTranslator.setSearch = function(arg) {
if(Zotero.isFx4) arg = JSON.parse(JSON.stringify(arg));
return translation.setSearch(arg);
};
safeTranslator.setDocument = function(arg) { return translation.setDocument(arg) }; safeTranslator.setDocument = function(arg) { return translation.setDocument(arg) };
safeTranslator.setHandler = function(arg1, arg2) { safeTranslator.setHandler = function(arg1, arg2) {
translation.setHandler(arg1, translation.setHandler(arg1,
function(obj, item) { function(obj, item) {
try { try {
if(Zotero.isFx4 && (this instanceof Zotero.Translate.Web || this instanceof Zotero.Translate.Search)) { // necessary to get around object wrappers
// item is wrapped in an XPCCrossOriginWrapper that we can't get rid of if(Zotero.isFx && arg1 == "itemDone"
// except by making a deep copy. seems to be due to && (translate instanceof Zotero.Translate.Web
// https://bugzilla.mozilla.org/show_bug.cgi?id=580128 || translate instanceof Zotero.Translate.Search)) {
// hear that? that's the sound of me banging my head against the wall. item = translate._sandboxManager.sandbox.Zotero._transferItem(JSON.stringify(item));
// if there is no better way to do this soon, i am going to need a
// brain transplant...
var unwrappedItem = JSON.parse(JSON.stringify(item));
unwrappedItem.complete = item.complete;
} else {
var unwrappedItem = item;
} }
arg2(obj, item);
arg2(obj, unwrappedItem);
} catch(e) { } catch(e) {
translate.complete(false, e); translate.complete(false, e);
} }
@ -198,7 +182,7 @@ Zotero.Translate.Sandbox = {
safeTranslator.getTranslatorObject = function() { safeTranslator.getTranslatorObject = function() {
translation._loadTranslator(translation.translator[0]); translation._loadTranslator(translation.translator[0]);
if(this.isFx) { if(Zotero.isFx) {
// do same origin check // do same origin check
var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"] var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
.getService(Components.interfaces.nsIScriptSecurityManager); .getService(Components.interfaces.nsIScriptSecurityManager);
@ -209,8 +193,12 @@ Zotero.Translate.Sandbox = {
translate._sandboxLocation.location : translate._sandboxLocation, null, null); translate._sandboxLocation.location : translate._sandboxLocation, null, null);
var innerSandboxURI = ioService.newURI(typeof translation._sandboxLocation === "object" ? var innerSandboxURI = ioService.newURI(typeof translation._sandboxLocation === "object" ?
translation._sandboxLocation.location : translation._sandboxLocation, null, null); translation._sandboxLocation.location : translation._sandboxLocation, null, null);
Zotero.debug(outerSandboxURI.spec);
Zotero.debug(innerSandboxURI.spec);
if(!secMan.checkSameOriginURI(outerSandboxURI, innerSandboxURI, false)) { try {
secMan.checkSameOriginURI(outerSandboxURI, innerSandboxURI, false);
} catch(e) {
throw "Translate: getTranslatorObject() may not be called from web or search "+ throw "Translate: getTranslatorObject() may not be called from web or search "+
"translators to web or search translators from different origins."; "translators to web or search translators from different origins.";
} }
@ -799,7 +787,12 @@ Zotero.Translate.Base.prototype = {
"Zotero.getXML = function() {"+ "Zotero.getXML = function() {"+
"var xml = Zotero._getXML();"+ "var xml = Zotero._getXML();"+
"if(typeof xml == 'string') return new XML(xml);"+ "if(typeof xml == 'string') return new XML(xml);"+
"}" "};"+
"Zotero._transferItem = function(itemString) {"+
"var item = JSON.parse(itemString);"+
"item.complete = Zotero.Item.prototype.complete;"+
"return item;"+
"};"
); );
this._sandboxManager.importObject(this.Sandbox, this); this._sandboxManager.importObject(this.Sandbox, this);
@ -1070,17 +1063,19 @@ Zotero.Translate.Import.prototype._loadTranslator = function(translator) {
err = e; err = e;
} }
} else { } else {
if(this._string) { if(this.location) {
if(!Zotero.Translate.IO.Read) {
throw "Translate: reading from files is not supported in this build of Zotero. Use setString() to perform import.";
}
try { try {
this._io = new Zotero.Translate.IO.String(this._string, this.path ? this.path : "", dataMode); this._io = new Zotero.Translate.IO.Read(this.location, dataMode);
} catch(e) { } catch(e) {
err = e; err = e;
} }
} else if(this.location && !Zotero.Translate.IO.Read) {
throw "Translate: reading from files is not supported in this build of Zotero. Use setString() to perform import.";
} else { } else {
try { try {
this._io = new Zotero.Translate.IO.Read(this.location, dataMode); this._io = new Zotero.Translate.IO.String(this._string, this.path ? this.path : "", dataMode);
} catch(e) { } catch(e) {
err = e; err = e;
} }
@ -1088,7 +1083,8 @@ Zotero.Translate.Import.prototype._loadTranslator = function(translator) {
} }
if(err) { if(err) {
Zotero.debug("Translate: Preparing IO for "+translator.label+" failed: "+err); Zotero.debug("Translate: Preparing IO for "+translator.label+" failed: ");
Zotero.debug(err);
return false; return false;
} }