From 43b0429c289788f6e2c129808093ae427db651b6 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 18 Dec 2020 14:51:46 +0000 Subject: [PATCH] clean up relative path checking --- services/clsi/app/js/ResourceStateManager.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/clsi/app/js/ResourceStateManager.js b/services/clsi/app/js/ResourceStateManager.js index 42e06d3a24..cd7f164a49 100644 --- a/services/clsi/app/js/ResourceStateManager.js +++ b/services/clsi/app/js/ResourceStateManager.js @@ -98,13 +98,12 @@ module.exports = ResourceStateManager = { checkResourceFiles(resources, allFiles, basePath, callback) { // check the paths are all relative to current directory let file - for (file of resources || []) { - if (file && file.path) { - const dirs = file.path.split('/') - if (dirs.indexOf('..') !== -1) { - return callback(new Error('relative path in resource file list')) - } - } + const containsRelativePath = (resource) => { + const dirs = resource.path.split('/') + return dirs.indexOf('..') !== -1 + } + if (resources.some(containsRelativePath)) { + return callback(new Error('relative path in resource file list')) } // check if any of the input files are not present in list of files const seenFile = {}