MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 08:12:37 +01:00
Code Issues Releases Wiki Activity

modules/web_root: Relax trailing slash requirement in conf item string.

Browse source
This commit is contained in:
Jason Volk 2019-08-03 15:45:49 -07:00
parent 5fe01260b8
commit 9bdb84523c
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/web_root.cc
View file

@ -108,14 +108,24 @@ init_files()
return;
}
for(const auto &file : fs::ls_r(path))
for(const auto &absolute : fs::ls_r(path))
{
const auto name
// fs::ls_r() gives us full absolute paths on the system, but we need
// to locate resources relative to webroot. The system path below
// the configured webroot is stripped here.
auto relative
{
lstrip(file, path)
lstrip(absolute, path)
};
files.emplace(std::string(name), file);
// The configured webroot is a directory string entered by the admin, it
// may or may not contain a trailing slash. This the strip above may have
// left a leading slash on this name; which is bad.
relative = lstrip(relative, '/');
// Add the mapping of the relative resource path to the absolute path
// on the system.
files.emplace(relative, absolute);
}
if(files.empty())