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

fx-compat: Update custom protocol handler

Browse source
This commit is contained in:
Dan Stillman 2020-08-02 19:52:41 -04:00
parent 94c7e0674d
commit 66a60eea64
1 changed files with 54 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

109
components/zotero-protocol-handler.js
View file

@ -34,8 +34,8 @@ const ZOTERO_PROTOCOL_NAME = "Zotero Chrome Extension Protocol";
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/NetUtil.jsm");
Components.utils.import("resource://gre/modules/osfile.jsm") Components.utils.import("resource://gre/modules/osfile.jsm")
const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
const Cc = Components.classes; const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -131,11 +131,11 @@ function ZoteroProtocolHandler() {
var DataExtension = { var DataExtension = {
loadAsChrome: false, loadAsChrome: false,
newChannel: function (uri) { newChannel: function (uri, loadInfo) {
return new AsyncChannel(uri, function* () { return new AsyncChannel(uri, loadInfo, function* () {
this.contentType = 'text/plain'; this.contentType = 'text/plain';
path = uri.spec.match(/zotero:\/\/[^/]+(.*)/)[1]; var path = uri.spec.match(/zotero:\/\/[^/]+(.*)/)[1];
try { try {
return Zotero.Utilities.Internal.getAsyncInputStream( return Zotero.Utilities.Internal.getAsyncInputStream(
@ -158,8 +158,8 @@ function ZoteroProtocolHandler() {
var ReportExtension = { var ReportExtension = {
loadAsChrome: false, loadAsChrome: false,
newChannel: function (uri) { newChannel: function (uri, loadInfo) {
return new AsyncChannel(uri, function* () { return new AsyncChannel(uri, loadInfo, function* () {
var userLibraryID = Zotero.Libraries.userLibraryID; var userLibraryID = Zotero.Libraries.userLibraryID;
var path = uri.pathQueryRef; var path = uri.pathQueryRef;
@ -539,8 +539,8 @@ function ZoteroProtocolHandler() {
var TimelineExtension = { var TimelineExtension = {
loadAsChrome: true, loadAsChrome: true,
newChannel: function (uri) { newChannel: function (uri, loadInfo) {
return new AsyncChannel(uri, function* () { return new AsyncChannel(uri, loadInfo, function* () {
var userLibraryID = Zotero.Libraries.userLibraryID; var userLibraryID = Zotero.Libraries.userLibraryID;
var path = uri.spec.match(/zotero:\/\/[^/]+(.*)/)[1]; var path = uri.spec.match(/zotero:\/\/[^/]+(.*)/)[1];
@ -929,8 +929,8 @@ function ZoteroProtocolHandler() {
var DebugExtension = { var DebugExtension = {
loadAsChrome: false, loadAsChrome: false,
newChannel: function (uri) { newChannel: function (uri, loadInfo) {
return new AsyncChannel(uri, function* () { return new AsyncChannel(uri, loadInfo, function* () {
this.contentType = "text/plain"; this.contentType = "text/plain";
try { try {
@ -1225,21 +1225,27 @@ function ZoteroProtocolHandler() {
* Implements nsIProtocolHandler * Implements nsIProtocolHandler
*/ */
ZoteroProtocolHandler.prototype = { ZoteroProtocolHandler.prototype = {
scheme: ZOTERO_SCHEME, get scheme() {
return PROTOCOL_SCHEME;
defaultPort : -1, },
get protocolFlags() {
protocolFlags : /*Components.interfaces.nsIProtocolHandler.URI_NORELATIVE |
Components.interfaces.nsIProtocolHandler.URI_NORELATIVE |
Components.interfaces.nsIProtocolHandler.URI_NOAUTH | Components.interfaces.nsIProtocolHandler.URI_NOAUTH |
// DEBUG: This should be URI_IS_LOCAL_FILE, and MUST be if any // DEBUG: This should be URI_IS_LOCAL_FILE, and MUST be if any
// extensions that modify data are added // extensions that modify data are added
// - https://www.zotero.org/trac/ticket/1156 // - https://www.zotero.org/trac/ticket/1156
// //
Components.interfaces.nsIProtocolHandler.URI_IS_LOCAL_FILE, Components.interfaces.nsIProtocolHandler.URI_IS_LOCAL_FILE,
//Components.interfaces.nsIProtocolHandler.URI_LOADABLE_BY_ANYONE, //Components.interfaces.nsIProtocolHandler.URI_LOADABLE_BY_ANYONE,*/
allowPort : function(port, scheme) { return Ci.nsIProtocolHandler.URI_NORELATIVE
| Ci.nsIProtocolHandler.URI_IS_LOCAL_RESOURCE
| Ci.nsIProtocolHandler.URI_DANGEROUS_TO_LOAD;
},
get defaultPort() {
return -1;
},
allowPort: function allowPort() {
return false; return false;
}, },
@ -1276,37 +1282,23 @@ ZoteroProtocolHandler.prototype = {
.finalize(); .finalize();
}, },
newChannel : function(uri) { newChannel: function (uri, loadInfo) {
var chromeService = Components.classes["@mozilla.org/network/protocol;1?name=chrome"]
.getService(Components.interfaces.nsIProtocolHandler);
var newChannel = null;
try { try {
let ext = this.getExtension(uri); let ext = this.getExtension(uri);
if (!ext) {
// Return cancelled channel for unknown paths // Return cancelled channel for unknown paths
// if (!ext) {
// These can be in the form zotero://example.com/... -- maybe for "//example.com" URLs? return this._getCancelledChannel();
var chromeURI = chromeService.newURI(DUMMY_CHROME_URL, null, null);
var extChannel = chromeService.newChannel(chromeURI);
var chromeRequest = extChannel.QueryInterface(Components.interfaces.nsIRequest);
chromeRequest.cancel(0x804b0002); // BINDING_ABORTED
return extChannel;
} }
if (!this._principal && ext.loadAsChrome) { if (!this._principal && ext.loadAsChrome) {
this._principal = Services.scriptSecurityManager.getSystemPrincipal(); this._principal = Services.scriptSecurityManager.getSystemPrincipal();
} }
var extChannel = ext.newChannel(uri); var extChannel = ext.newChannel(uri, loadInfo);
// Extension returned null, so cancel request // Extension returned null, so cancel request
if (!extChannel) { if (!extChannel) {
var chromeURI = chromeService.newURI(DUMMY_CHROME_URL, null, null); return this._getCancelledChannel();
var extChannel = chromeService.newChannel(chromeURI);
var chromeRequest = extChannel.QueryInterface(Components.interfaces.nsIRequest);
chromeRequest.cancel(0x804b0002); // BINDING_ABORTED
} }
// Apply cached principal to extension channel // Apply cached principal to extension channel
@ -1314,7 +1306,7 @@ ZoteroProtocolHandler.prototype = {
extChannel.owner = this._principal; extChannel.owner = this._principal;
} }
if(!extChannel.originalURI) extChannel.originalURI = uri; //if(!extChannel.originalURI) extChannel.originalURI = uri;
return extChannel; return extChannel;
} }
@ -1324,13 +1316,24 @@ ZoteroProtocolHandler.prototype = {
throw Components.results.NS_ERROR_FAILURE; throw Components.results.NS_ERROR_FAILURE;
} }
return newChannel; return null;
},
_getCancelledChannel: function () {
var channel = NetUtil.newChannel({
uri: DUMMY_CHROME_URL,
loadUsingSystemPrincipal: true,
})
var req = channel.QueryInterface(Components.interfaces.nsIRequest);
req.cancel(0x804b0002); // BINDING_ABORTED
return channel;
}, },
contractID: ZOTERO_PROTOCOL_CONTRACTID, contractID: ZOTERO_PROTOCOL_CONTRACTID,
classDescription: ZOTERO_PROTOCOL_NAME, classDescription: ZOTERO_PROTOCOL_NAME,
classID: ZOTERO_PROTOCOL_CID, classID: ZOTERO_PROTOCOL_CID,
QueryInterface: ChromeUtils.generateQI([Components.interfaces.nsIProtocolHandler]) //QueryInterface: ChromeUtils.generateQI([Components.interfaces.nsIProtocolHandler])
QueryInterface: ChromeUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIProtocolHandler]),
}; };
@ -1338,7 +1341,10 @@ ZoteroProtocolHandler.prototype = {
* nsIChannel implementation that takes a promise-yielding generator that returns a * nsIChannel implementation that takes a promise-yielding generator that returns a
* string, nsIAsyncInputStream, or file * string, nsIAsyncInputStream, or file
*/ */
function AsyncChannel(uri, gen) { function AsyncChannel(uri, loadInfo, gen) {
this.URI = this.originalURI = uri;
this.loadInfo = loadInfo;
this._generator = gen; this._generator = gen;
this._isPending = true; this._isPending = true;
@ -1355,6 +1361,7 @@ function AsyncChannel(uri, gen) {
this.URI = uri; this.URI = uri;
this.originalURI = uri; this.originalURI = uri;
this.owner = null; this.owner = null;
this.notificationCallbacks = null; this.notificationCallbacks = null;
this.securityInfo = null; this.securityInfo = null;
} }
@ -1385,7 +1392,7 @@ AsyncChannel.prototype = {
//Zotero.debug("Stopping request"); //Zotero.debug("Stopping request");
streamListener.onStopRequest(channel, status); streamListener.onStopRequest(channel, status);
channel._isPending = false; channel._isPending = false;
if (status == 0) { if (status === Cr.NS_OK) {
resolve(); resolve();
} }
else { else {
@ -1507,26 +1514,18 @@ AsyncChannel.prototype = {
}, },
// nsIWritablePropertyBag // nsIWritablePropertyBag
setProperty: function (prop, val) { /*setProperty: function (prop, val) {
this[prop] = val; this[prop] = val;
}, },
deleteProperty: function (prop) { deleteProperty: function (prop) {
delete this[prop]; delete this[prop];
}, },*/
QueryInterface: ChromeUtils.generateQI([Ci.nsIChannel, Ci.nsIRequest]),
QueryInterface: function (iid) { /*pdf.js wants this
if (iid.equals(Components.interfaces.nsISupports) || iid.equals(Components.interfaces.nsIWritablePropertyBag)) {*/
|| iid.equals(Components.interfaces.nsIRequest)
|| iid.equals(Components.interfaces.nsIChannel)
// pdf.js wants this
|| iid.equals(Components.interfaces.nsIWritablePropertyBag)) {
return this;
}
throw Components.results.NS_ERROR_NO_INTERFACE;
}
}; };