Преглед изворни кода

clean up relative path checking

Brian Gough пре 5 година
родитељ
комит
43b0429c28
1 измењених фајлова са 6 додато и 7 уклоњено
  1. 6 7
      services/clsi/app/js/ResourceStateManager.js

+ 6 - 7
services/clsi/app/js/ResourceStateManager.js

@@ -98,13 +98,12 @@ module.exports = ResourceStateManager = {
   checkResourceFiles(resources, allFiles, basePath, callback) {
   checkResourceFiles(resources, allFiles, basePath, callback) {
     // check the paths are all relative to current directory
     // check the paths are all relative to current directory
     let file
     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
     // check if any of the input files are not present in list of files
     const seenFile = {}
     const seenFile = {}