From e3f4fe530a1ff25dc641877ec47d40fd774fe036 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 14 Nov 2018 02:50:09 -0500 Subject: Revert "[PALEMOON] Use generic application icon for external applications in about:feeds" This reverts commit c8d90e332f4da50fdaa77eb733481d8be547391c. --- application/palemoon/components/feeds/FeedWriter.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/palemoon/components/feeds/FeedWriter.js b/application/palemoon/components/feeds/FeedWriter.js index cfea150e2..2ae31dffa 100644 --- a/application/palemoon/components/feeds/FeedWriter.js +++ b/application/palemoon/components/feeds/FeedWriter.js @@ -698,7 +698,12 @@ FeedWriter.prototype = { * @returns moz-icon url of the given file as a string */ _getFileIconURL: function FW__getFileIconURL(file) { - return "moz-icon://dummy.exe?size=16"; + var ios = Cc["@mozilla.org/network/io-service;1"]. + getService(Ci.nsIIOService); + var fph = ios.getProtocolHandler("file") + .QueryInterface(Ci.nsIFileProtocolHandler); + var urlSpec = fph.getURLSpecFromFile(file); + return "moz-icon://" + urlSpec + "?size=16"; }, /** -- cgit v1.2.3 From 81c27113a3e5389badf543557eaf25850ba3418b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 14 Nov 2018 02:54:29 -0500 Subject: [PALEMOON] Use generic application icon for external applications in about:feeds --- application/palemoon/components/feeds/FeedWriter.js | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/application/palemoon/components/feeds/FeedWriter.js b/application/palemoon/components/feeds/FeedWriter.js index 2ae31dffa..d704835bb 100644 --- a/application/palemoon/components/feeds/FeedWriter.js +++ b/application/palemoon/components/feeds/FeedWriter.js @@ -691,21 +691,6 @@ FeedWriter.prototype = { return file.leafName; }, - /** - * Get moz-icon url for a file - * @param file - * A nsIFile object for which the moz-icon:// is returned - * @returns moz-icon url of the given file as a string - */ - _getFileIconURL: function FW__getFileIconURL(file) { - var ios = Cc["@mozilla.org/network/io-service;1"]. - getService(Ci.nsIIOService); - var fph = ios.getProtocolHandler("file") - .QueryInterface(Ci.nsIFileProtocolHandler); - var urlSpec = fph.getURLSpecFromFile(file); - return "moz-icon://" + urlSpec + "?size=16"; - }, - /** * Helper method to set the selected application and system default * reader menuitems details from a file object @@ -717,7 +702,10 @@ FeedWriter.prototype = { _initMenuItemWithFile: function(aMenuItem, aFile) { this._contentSandbox.menuitem = aMenuItem; this._contentSandbox.label = this._getFileDisplayName(aFile); - this._contentSandbox.image = this._getFileIconURL(aFile); + // For security reasons, access to moz-icon:file://... URIs is + // no longer allowed (indirect file system access from content). + // We use a dummy application instead to get a generic icon. + this._contentSandbox.image = "moz-icon://dummy.exe?size=16"; var codeStr = "menuitem.setAttribute('label', label); " + "menuitem.setAttribute('image', image);" Cu.evalInSandbox(codeStr, this._contentSandbox); -- cgit v1.2.3