aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-01-01 21:32:23 +0000
committerMatthew Wild <mwild1@gmail.com>2010-01-01 21:32:23 +0000
commit3f619ace4b549d613bdd19d13a6f8e81226aaa29 (patch)
tree259d51afb040ecc472f8c11a4a4be63279204b6d /plugins
parent525f5856f25edf5511e6e383e4e97b461855aad9 (diff)
downloadprosody-3f619ace4b549d613bdd19d13a6f8e81226aaa29.tar.gz
prosody-3f619ace4b549d613bdd19d13a6f8e81226aaa29.zip
mod_httpserver: Rudimentary directory detection, return forbidden instead of causing a traceback (since commit 0325f241a26c)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_httpserver.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index 1cdcc787..07c7f315 100644
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -15,6 +15,7 @@ local t_concat = table.concat;
local http_base = config.get("*", "core", "http_path") or "www_files";
local response_400 = { status = "400 Bad Request", body = "<h1>Bad Request</h1>Sorry, we didn't understand your request :(" };
+local response_403 = { status = "403 Forbidden", body = "<h1>Forbidden</h1>You don't have permission to view the contents of this directory :(" };
local response_404 = { status = "404 Not Found", body = "<h1>Page Not Found</h1>Sorry, we couldn't find what you were looking for :(" };
-- TODO: Should we read this from /etc/mime.types if it exists? (startup time...?)
@@ -51,6 +52,9 @@ function serve_file(path)
if not f then return response_404; end
local data = f:read("*a");
f:close();
+ if not data then
+ return response_403;
+ end
local ext = path:match("%.([^.]*)$");
local mime = mime_map[ext]; -- Content-Type should be nil when not known
return {