mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2016-03-03 16:05:34 +01:00
commit 3140ed3d62
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/mod_http_files.lua
View file

@ -56,6 +56,7 @@ end
local urldecode = require "util.http".urldecode; local urldecode = require "util.http".urldecode;
function sanitize_path(path) function sanitize_path(path)
if not path then return end
local out = {}; local out = {};
local c = 0; local c = 0;
@ -74,6 +75,9 @@ function sanitize_path(path)
out[c] = component; out[c] = component;
end end
end end
if path:sub(-1,-1) == "/" then
out[c+1] = "";
end
return "/"..table.concat(out, "/"); return "/"..table.concat(out, "/");
end end
@ -88,12 +92,13 @@ function serve(opts)
local directory_index = opts.directory_index; local directory_index = opts.directory_index;
local function serve_file(event, path) local function serve_file(event, path)
local request, response = event.request, event.response; local request, response = event.request, event.response;
path = sanitize_path(path); local sanitized_path = sanitize_path(path);
if not path then if path and not sanitized_path then
return 400; return 400;
end end
path = sanitized_path;
local orig_path = sanitize_path(request.path); local orig_path = sanitize_path(request.path);
local full_path = base_path .. (path and "/"..path or ""):gsub("/", path_sep); local full_path = base_path .. (path or ""):gsub("/", path_sep);
local attr = stat(full_path:match("^.*[^\\/]")); -- Strip trailing path separator because Windows local attr = stat(full_path:match("^.*[^\\/]")); -- Strip trailing path separator because Windows
if not attr then if not attr then
return 404; return 404;