suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow cross-site processDocuments() calls in Firefox (Chrome/Safari support coming)

Browse Source
This commit is contained in:
Simon Kornblith 2011-10-02 17:26:08 +00:00
parent 3364a533c5
commit 31bc445e4c
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
chrome/content/zotero/xpcom/utilities_translate.js
View File

@ -227,8 +227,20 @@ Zotero.Utilities.Translate.prototype.processDocuments = function(urls, processor
} }
var translate = this._translate; var translate = this._translate;
var loc = translate.document.location;
translate.incrementAsyncProcesses("Zotero.Utilities.Translate#processDocuments"); translate.incrementAsyncProcesses("Zotero.Utilities.Translate#processDocuments");
var hiddenBrowser = Zotero.HTTP.processDocuments(urls, processor, function() { var hiddenBrowser = Zotero.HTTP.processDocuments(urls, function(doc) {
if(!processor) return;
if(Zotero.isFx && (loc.protocol !== doc.protocol || loc.host !== doc.host)) {
// Cross-site; need to serialize and unserialize
processor(Zotero.Translate.SandboxManager.Fx5DOMWrapper(doc));
} else {
// Not cross-site; no need to wrap
processor(doc);
}
},
function() {
if(done) done(); if(done) done();
var handler = function() { var handler = function() {
try { try {
@ -404,19 +416,16 @@ Zotero.Utilities.Translate.prototype.doPost = function(url, body, onDone, header
* @private * @private
*/ */
Zotero.Utilities.Translate.prototype._convertURL = function(url) { Zotero.Utilities.Translate.prototype._convertURL = function(url) {
const protocolRe = /^(?:(?:http|https|ftp):)/i; const hostPortRe = /^(?:(?:http|https|ftp):)\/\/([^\/]+)/i;
// convert proxy to proper if applicable
if(protocolRe.test(url)) {
if(this._translate.translator && this._translate.translator[0]
&& this._translate.translator[0].properToProxy) {
url = this._translate.translator[0].properToProxy(url);
}
return url;
}
// resolve local URL // resolve local URL
var resolved = ""; var resolved = "";
// convert proxy to proper if applicable
if(hostPortRe.test(url) && this._translate.translator && this._translate.translator[0]
&& this._translate.translator[0].properToProxy) {
resolved = this._translate.translator[0].properToProxy(url);
}
if(Zotero.isFx) { if(Zotero.isFx) {
resolved = Components.classes["@mozilla.org/network/io-service;1"]. resolved = Components.classes["@mozilla.org/network/io-service;1"].
getService(Components.interfaces.nsIIOService). getService(Components.interfaces.nsIIOService).
@ -429,8 +438,17 @@ Zotero.Utilities.Translate.prototype._convertURL = function(url) {
resolved = a.href; resolved = a.href;
} }
if(!protocolRe.test(resolved)) { var m = hostPortRe.exec(resolved);
if(!m) {
throw new Error("Invalid URL supplied for HTTP request: "+url); throw new Error("Invalid URL supplied for HTTP request: "+url);
} else {
var loc = this._translate.document.location;
if(this._translate._currentState !== "translate" && doc
&& (m[0].toLowerCase() !== loc.protocol.toLowerCase()
|| m[1].toLowerCase() !== loc.host.toLowerCase())) {
throw new Error("Attempt to access "+m[0]+"//"+m[1]+" from "+loc.protocol+"//"+loc.host
+" blocked: Cross-site requests are only allowed during translation");
}
} }
return resolved; return resolved;