From 6ff7d4e9a6f86d7a544adb029de5df9afc48b4c6 Mon Sep 17 00:00:00 2001 From: Tom Hunkapiller Date: Wed, 15 Apr 2015 14:30:53 -0500 Subject: [PATCH] revert to old path handling, but strip out "..". fixes #2614 --- src/node/utils/Minify.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 3b0be38c2..ee8f5f455 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -143,8 +143,11 @@ function minify(req, res, next) // No relative paths, especially if they may go up the file hierarchy. filename = path.normalize(path.join(ROOT_DIR, filename)); + filename = filename.replace(/\.\./g, '') + if (filename.indexOf(ROOT_DIR) == 0) { filename = filename.slice(ROOT_DIR.length); + filename = filename.replace(/\\/g, '/') } else { res.writeHead(404, {}); res.end(); @@ -165,6 +168,7 @@ function minify(req, res, next) var plugin = plugins.plugins[library]; var pluginPath = plugin.package.realPath; filename = path.relative(ROOT_DIR, pluginPath + libraryPath); + filename = filename.replace(/\\/g, '/'); // windows path fix } else if (LIBRARY_WHITELIST.indexOf(library) != -1) { // Go straight into node_modules // Avoid `require.resolve()`, since 'mustache' and 'mustache/index.js'