From 1f6068bc695b8bee56f0a99e4343ff138b1ee188 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Sun, 17 Jun 2018 09:29:53 +0200 Subject: Bug 1398229 - Save-link-as feature should use the loading principal - context menu using nsIContentPolicy.TYPE_SAVE_AS_DOWNLOAD --- application/basilisk/base/content/nsContextMenu.js | 4 +++- application/palemoon/base/content/nsContextMenu.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'application') diff --git a/application/basilisk/base/content/nsContextMenu.js b/application/basilisk/base/content/nsContextMenu.js index 097caf367..31fa4e761 100644 --- a/application/basilisk/base/content/nsContextMenu.js +++ b/application/basilisk/base/content/nsContextMenu.js @@ -1355,7 +1355,9 @@ nsContextMenu.prototype = { // checks after redirects, see bug: 1136055 var channel = NetUtil.newChannel({ uri: makeURI(linkURL), - loadUsingSystemPrincipal: true + loadingPrincipal: this.principal, + contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD, + securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS, }); if (linkDownload) diff --git a/application/palemoon/base/content/nsContextMenu.js b/application/palemoon/base/content/nsContextMenu.js index f389491d3..bd8bf9c85 100644 --- a/application/palemoon/base/content/nsContextMenu.js +++ b/application/palemoon/base/content/nsContextMenu.js @@ -1131,7 +1131,9 @@ nsContextMenu.prototype = { // checks after redirects, see bug: 1136055 var channel = NetUtil.newChannel({ uri: makeURI(linkURL), - loadUsingSystemPrincipal: true + loadingPrincipal: this.principal, + contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD, + securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS, }); if (linkDownload) -- cgit v1.2.3 From 8eb2350e4fb66edf33d13af12023862a9652dd1d Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Sun, 17 Jun 2018 10:32:41 +0200 Subject: Remove a comment in nsContextMenu.js --- application/basilisk/base/content/nsContextMenu.js | 5 ----- application/palemoon/base/content/nsContextMenu.js | 5 ----- 2 files changed, 10 deletions(-) (limited to 'application') diff --git a/application/basilisk/base/content/nsContextMenu.js b/application/basilisk/base/content/nsContextMenu.js index 31fa4e761..589d670ab 100644 --- a/application/basilisk/base/content/nsContextMenu.js +++ b/application/basilisk/base/content/nsContextMenu.js @@ -1348,11 +1348,6 @@ nsContextMenu.prototype = { } // setting up a new channel for 'right click - save link as ...' - // ideally we should use: - // * doc - as the loadingNode, and/or - // * this.principal - as the loadingPrincipal - // for now lets use systemPrincipal to bypass mixedContentBlocker - // checks after redirects, see bug: 1136055 var channel = NetUtil.newChannel({ uri: makeURI(linkURL), loadingPrincipal: this.principal, diff --git a/application/palemoon/base/content/nsContextMenu.js b/application/palemoon/base/content/nsContextMenu.js index bd8bf9c85..2a794c5f2 100644 --- a/application/palemoon/base/content/nsContextMenu.js +++ b/application/palemoon/base/content/nsContextMenu.js @@ -1124,11 +1124,6 @@ nsContextMenu.prototype = { } // setting up a new channel for 'right click - save link as ...' - // ideally we should use: - // * doc - as the loadingNode, and/or - // * this.principal - as the loadingPrincipal - // for now lets use systemPrincipal to bypass mixedContentBlocker - // checks after redirects, see bug: 1136055 var channel = NetUtil.newChannel({ uri: makeURI(linkURL), loadingPrincipal: this.principal, -- cgit v1.2.3 From 3cf5a826006477aec57e428a216d317cec1c9ca0 Mon Sep 17 00:00:00 2001 From: janekptacijarabaci Date: Sun, 17 Jun 2018 13:14:07 +0200 Subject: [PALEMOON] Fix "loadingPrincipal" in nsContextMenu.js --- application/palemoon/base/content/nsContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/palemoon/base/content/nsContextMenu.js b/application/palemoon/base/content/nsContextMenu.js index 2a794c5f2..738868ccb 100644 --- a/application/palemoon/base/content/nsContextMenu.js +++ b/application/palemoon/base/content/nsContextMenu.js @@ -1126,7 +1126,7 @@ nsContextMenu.prototype = { // setting up a new channel for 'right click - save link as ...' var channel = NetUtil.newChannel({ uri: makeURI(linkURL), - loadingPrincipal: this.principal, + loadingPrincipal: this.target.ownerDocument.nodePrincipal, contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD, securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS, }); -- cgit v1.2.3