Merge 0.7->trunk

[prosody.git] / plugins / mod_httpserver.lua

diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index f1f2150d1f816fb745b516b57573da5d1ebc6d58..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.
@@ -12,11 +12,23 @@ local httpserver = require "net.httpserver";
 local open = io.open;
 local t_concat = table.concat;
 
-local http_base = "www_files";
+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...?)
+local mime_map = {
+       html = "text/html";
+       htm = "text/html";
+       xml = "text/xml";
+       xsl = "text/xml";
+       txt = "text/plain; charset=utf-8";
+       js = "text/javascript";
+       css = "text/css";
+};
+
 local function preprocess_path(path)
        if path:sub(1,1) ~= "/" then
                path = "/"..path;
@@ -36,11 +48,19 @@ local function preprocess_path(path)
 end
 
 function serve_file(path)
-       local f, err = open(http_base..path, "r");
+       local f, err = open(http_base..path, "rb");
        if not f then return response_404; end
        local data = f:read("*a");
        f:close();
-       return data;
+       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 {
+               headers = { ["Content-Type"] = mime; };
+               body = data;
+       };
 end
 
 local function handle_file_request(method, body, request)
@@ -56,6 +76,13 @@ local function handle_default_request(method, body, request)
        return serve_file(path);
 end
 
-local ports = config.get(module.host, "core", "http_ports") or { 5280 };
-httpserver.set_default_handler(handle_default_request);
-httpserver.new_from_config(ports, "files", handle_file_request);
+local function setup()
+       local ports = config.get(module.host, "core", "http_ports") or { 5280 };
+       httpserver.set_default_handler(handle_default_request);
+       httpserver.new_from_config(ports, handle_file_request, { base = "files" });
+end
+if prosody.start_time then -- already started
+       setup();
+else
+       prosody.events.add_handler("server-started", setup);
+end