From abc32d62705ad894b5355f2be050b40022553915 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Nov 2020 14:07:57 -0500 Subject: [PATCH 1/3] fix(deps): update dependency nodebb-theme-persona to v10.2.85 (#8928) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c43195f359..03700a76ed 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-spam-be-gone": "0.7.6", "nodebb-rewards-essentials": "0.1.4", "nodebb-theme-lavender": "5.0.14", - "nodebb-theme-persona": "10.2.84", + "nodebb-theme-persona": "10.2.85", "nodebb-theme-slick": "1.3.3", "nodebb-theme-vanilla": "11.3.4", "nodebb-widget-essentials": "4.1.2", From 4ca62dc45bde04a9a7c12f04b017463337108ed7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Nov 2020 14:15:57 -0500 Subject: [PATCH 2/3] fix: improper handling of scheme-relative URLs in topic thumb logic --- src/topics/thumb.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/topics/thumb.js b/src/topics/thumb.js index 1423e3382e..b948a34631 100644 --- a/src/topics/thumb.js +++ b/src/topics/thumb.js @@ -23,6 +23,11 @@ module.exports = function (Topics) { const pipeToFileAsync = util.promisify(pipeToFile); Topics.resizeAndUploadThumb = async function (data) { + // Handle protocol-relative URLs + if (data.thumb.startsWith('//')) { + data.thumb = `${nconf.get('secure') ? 'https' : 'http'}:${data.thumb}`; + } + // Only continue if passed in thumbnail exists and is a URL. A system path means an upload is not necessary. if (!data.thumb || !validator.isURL(data.thumb)) { return; From 5dd3b03125d643112b8d2b5ccc600f9cba0f330c Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 23 Nov 2020 14:18:49 -0500 Subject: [PATCH 3/3] fix: a derp --- src/topics/thumb.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topics/thumb.js b/src/topics/thumb.js index b948a34631..15574779e6 100644 --- a/src/topics/thumb.js +++ b/src/topics/thumb.js @@ -24,7 +24,7 @@ module.exports = function (Topics) { Topics.resizeAndUploadThumb = async function (data) { // Handle protocol-relative URLs - if (data.thumb.startsWith('//')) { + if (data.thumb && data.thumb.startsWith('//')) { data.thumb = `${nconf.get('secure') ? 'https' : 'http'}:${data.thumb}`; }