From 85820c571db2f03efc513b081ab677f5cced0eff Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 14 Sep 2021 10:50:26 +0100 Subject: [PATCH] Add unit tests for allowUpdate settings --- .../editor-client/src/js/ui/palette-editor.js | 6 +- .../@node-red/registry/lib/installer.js | 1 - .../@node-red/registry/lib/installer_spec.js | 150 +++++++++++++++++- 3 files changed, 150 insertions(+), 7 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js index 5171740e9..34d3ba160 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js @@ -333,10 +333,8 @@ RED.palette.editor = (function() { nodeEntry.versionSpan.html(moduleInfo.version+' '+moduleInfo.pending_version).appendTo(nodeEntry.metaRow) nodeEntry.updateButton.text(RED._('palette.editor.updated')).addClass('disabled').css('display', 'inline-block'); } else if (loadedIndex.hasOwnProperty(module)) { - if (updateAllowed - && - semVerCompare(loadedIndex[module].version,moduleInfo.version) > 0 - && + if (updateAllowed && + semVerCompare(loadedIndex[module].version,moduleInfo.version) > 0 && RED.utils.checkModuleAllowed(module,null,updateAllowList,updateDenyList) ) { nodeEntry.updateButton.show(); diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js index b17f0e09b..88846bac4 100644 --- a/packages/node_modules/@node-red/registry/lib/installer.js +++ b/packages/node_modules/@node-red/registry/lib/installer.js @@ -278,7 +278,6 @@ async function installModule(module,version,url) { e = new Error("Module not found"); e.code = 404; } else { - console.log(err); log.warn(log._("server.install.install-failed-long",{name:module})); log.warn("------------------------------------------"); log.warn(output); diff --git a/test/unit/@node-red/registry/lib/installer_spec.js b/test/unit/@node-red/registry/lib/installer_spec.js index 63075ff24..80b96ecfb 100644 --- a/test/unit/@node-red/registry/lib/installer_spec.js +++ b/test/unit/@node-red/registry/lib/installer_spec.js @@ -63,7 +63,9 @@ describe('nodes/registry/installer', function() { if (typeRegistry.getModuleInfo.restore) { typeRegistry.getModuleInfo.restore(); } - + if (typeRegistry.setModulePendingUpdated.restore) { + typeRegistry.setModulePendingUpdated.restore(); + } if (fs.statSync.restore) { fs.statSync.restore(); } @@ -298,8 +300,11 @@ describe('nodes/registry/installer', function() { hooks.add("preInstall", function(event) { return false }) hooks.add("postInstall", function(event) { receivedEvent = event; }) var nodeInfo = {nodes:{module:"foo",types:["a"]}}; + var addModule = sinon.stub(registry,"addModule").callsFake(function(md) { + return Promise.resolve(nodeInfo); + }); - installer.installModule("this_wont_exist","1.2.3").catch(function(err) { + installer.installModule("this_wont_exist","1.2.3").then(function() { exec.run.called.should.be.false(); should.exist(receivedEvent); done(); @@ -316,6 +321,147 @@ describe('nodes/registry/installer', function() { }).catch(done); }); + describe("allowUpdate lists", function() { + it("rejects when update requested with allowUpdate set to false", function(done) { + installer.init({ externalModules: { palette: { allowUpdate: false } } }) + sinon.stub(typeRegistry,"getModuleInfo").callsFake(function() { + return { + user: true, + version: "0.1.1" + } + }); + installer.installModule("this_wont_exist","0.1.2").catch(function(err) { + err.code.should.be.eql('update_not_allowed'); + done(); + }).catch(done); + }) + it("succeeds when update requested with module not on denyUpdateList", function(done) { + installer.init({ externalModules: { palette: { denyUpdateList: ['this_wont_exist'] } } }) + sinon.stub(typeRegistry,"getModuleInfo").callsFake(function() { + return { + user: true, + version: "0.1.1" + } + }); + + var res = { + code: 0, + stdout:"", + stderr:"" + } + var p = Promise.resolve(res); + p.catch((err)=>{}); + execResponse = p; + + var nodeInfo = {nodes:{module:"this_is_allowed",types:["a"]}}; + + var addModule = sinon.stub(registry,"addModule").callsFake(function(md) { + return Promise.resolve(nodeInfo); + }); + sinon.stub(typeRegistry,"setModulePendingUpdated").callsFake(function() { + return Promise.resolve(nodeInfo); + }); + + installer.installModule("this_is_allowed","0.1.2").then(function() { + done(); + }).catch(done); + }) + it("rejects when update requested with module on denyUpdateList", function(done) { + installer.init({ externalModules: { palette: { denyUpdateList: ['this_wont_exist'] } } }) + sinon.stub(typeRegistry,"getModuleInfo").callsFake(function() { + return { + user: true, + version: "0.1.1" + } + }); + + var res = { + code: 0, + stdout:"", + stderr:"" + } + var p = Promise.resolve(res); + p.catch((err)=>{}); + execResponse = p; + + var nodeInfo = {nodes:{module:"this_is_allowed",types:["a"]}}; + + var addModule = sinon.stub(registry,"addModule").callsFake(function(md) { + return Promise.resolve(nodeInfo); + }); + sinon.stub(typeRegistry,"setModulePendingUpdated").callsFake(function() { + return Promise.resolve(nodeInfo); + }); + + installer.installModule("this_wont_exist","0.1.2").catch(function(err) { + err.code.should.be.eql('update_not_allowed'); + done(); + }).catch(done); + }) + it("succeeds when update requested with module on allowUpdateList", function(done) { + installer.init({ externalModules: { palette: { allowUpdateList: ['this_is_allowed'] } } }) + sinon.stub(typeRegistry,"getModuleInfo").callsFake(function() { + return { + user: true, + version: "0.1.1" + } + }); + + var res = { + code: 0, + stdout:"", + stderr:"" + } + var p = Promise.resolve(res); + p.catch((err)=>{}); + execResponse = p; + + var nodeInfo = {nodes:{module:"this_is_allowed",types:["a"]}}; + + var addModule = sinon.stub(registry,"addModule").callsFake(function(md) { + return Promise.resolve(nodeInfo); + }); + sinon.stub(typeRegistry,"setModulePendingUpdated").callsFake(function() { + return Promise.resolve(nodeInfo); + }); + + installer.installModule("this_is_allowed","0.1.2").then(function() { + done(); + }).catch(done); + }) + it("rejects when update requested with module not on allowUpdateList", function(done) { + installer.init({ externalModules: { palette: { allowUpdateList: ['this_is_allowed'] } } }) + sinon.stub(typeRegistry,"getModuleInfo").callsFake(function() { + return { + user: true, + version: "0.1.1" + } + }); + + var res = { + code: 0, + stdout:"", + stderr:"" + } + var p = Promise.resolve(res); + p.catch((err)=>{}); + execResponse = p; + + var nodeInfo = {nodes:{module:"this_wont_exist",types:["a"]}}; + + var addModule = sinon.stub(registry,"addModule").callsFake(function(md) { + return Promise.resolve(nodeInfo); + }); + sinon.stub(typeRegistry,"setModulePendingUpdated").callsFake(function() { + return Promise.resolve(nodeInfo); + }); + + installer.installModule("this_wont_exist","0.1.2").catch(function(err) { + err.code.should.be.eql('update_not_allowed'); + done(); + }).catch(done); + }) + }); }); describe("uninstalls module", function() { it("rejects invalid module names", function(done) {