Merge 0.7->trunk

[prosody.git] / plugins / mod_httpserver.lua

diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index 426bbf2c548a1ea54564f09a12b4a670bfc173e0..c55bd20f9b5b56c5c6e1c7ced8f32bc585fd3228 100644 (file)
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -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...?)
@@ -23,7 +24,7 @@ local mime_map = {
        htm = "text/html";
        xml = "text/xml";
        xsl = "text/xml";
-       txt = "plain/text; charset=utf-8";
+       txt = "text/plain; charset=utf-8";
        js = "text/javascript";
        css = "text/css";
 };
@@ -51,9 +52,11 @@ 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
-       module:log("warn", "ext: %s, mime: %s", ext or "(nil)", mime or "(nil)");
        return {
                headers = { ["Content-Type"] = mime; };
                body = data;