From d4ec0ae3cde1dc5dba5a935e8c9926d63fb5a05a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 3 Mar 2016 15:28:07 +0100
Subject: mod_http_files: Fix traceback when serving a non-wildcard path (fixes
#611)
---
plugins/mod_http_files.lua | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'plugins')
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index 6275cca5..097f8346 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -56,6 +56,7 @@ end
local urldecode = require "util.http".urldecode;
function sanitize_path(path)
+ if not path then return end
local out = {};
local c = 0;
@@ -88,10 +89,11 @@ function serve(opts)
local directory_index = opts.directory_index;
local function serve_file(event, path)
local request, response = event.request, event.response;
- path = sanitize_path(path);
- if not path then
+ local sanitized_path = sanitize_path(path);
+ if path and not sanitized_path then
return 400;
end
+ path = sanitized_path;
local orig_path = sanitize_path(request.path);
local full_path = base_path .. (path and "/"..path or ""):gsub("/", path_sep);
local attr = stat(full_path:match("^.*[^\\/]")); -- Strip trailing path separator because Windows
--
cgit v1.2.3
From 6ee217ad112f35b5f2f72a49965ea81bd5a8008b Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 3 Mar 2016 15:30:00 +0100
Subject: mod_http_files: Don't prepend / to path twice, sanitize path does
this already
---
plugins/mod_http_files.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'plugins')
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index 097f8346..fc39628c 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -95,7 +95,7 @@ function serve(opts)
end
path = sanitized_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
if not attr then
return 404;
--
cgit v1.2.3
From 31c0a34728dfc3f72cb7fe2072929c339f3625cf Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 3 Mar 2016 15:31:46 +0100
Subject: mod_http_files: Preserve a trailing / in paths (fixes #639)
---
plugins/mod_http_files.lua | 3 +++
1 file changed, 3 insertions(+)
(limited to 'plugins')
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua
index fc39628c..53b6469b 100644
--- a/plugins/mod_http_files.lua
+++ b/plugins/mod_http_files.lua
@@ -75,6 +75,9 @@ function sanitize_path(path)
out[c] = component;
end
end
+ if path:sub(-1,-1) == "/" then
+ out[c+1] = "";
+ end
return "/"..table.concat(out, "/");
end
--
cgit v1.2.3