libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

clearer comments about the path handling behavior

Browse source
This commit is contained in:
Tom Hunkapiller 2015-04-10 20:19:26 -05:00
parent 3ebb19d8a2
commit 2e4374c08d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/node/hooks/express/tests.js
View file

@ -23,7 +23,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
}); });
var rootTestFolder = path.join(npm.root, "..", "/tests/frontend/");
// path.join seems to normalize by default, but we'll just be explicit
var rootTestFolder = path.normalize(path.join(npm.root, "../tests/frontend/"));
var url2FilePath = function(url){ var url2FilePath = function(url){
var subPath = url.substr("/tests/frontend".length); var subPath = url.substr("/tests/frontend".length);
if (subPath == ""){ if (subPath == ""){
@ -34,7 +37,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
var filePath = path.normalize(path.join(rootTestFolder, subPath)); var filePath = path.normalize(path.join(rootTestFolder, subPath));
// make sure we jail the paths to the test folder, otherwise serve index // make sure we jail the paths to the test folder, otherwise serve index
if (filePath.indexOf(rootTestFolder) !== 0) { if (filePath.indexOf(rootTestFolder) !== 0) {
filePath = path.normalize(path.join(rootTestFolder, "index.html")); filePath = path.join(rootTestFolder, "index.html");
} }
return filePath; return filePath;
} }