mod_tls: Pass the hostname rather than host session to certmanager.create_context...

[prosody.git] / plugins / mod_httpserver.lua

diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index a554be08ede8307bfeee4d733c7a6e004b391199..654aff067ce5d894078f37ac381888312e83e3f7 100644 (file)
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -8,9 +8,11 @@
 
 
 local httpserver = require "net.httpserver";
+local lfs = require "lfs";
 
 local open = io.open;
 local t_concat = table.concat;
+local stat = lfs.attributes;
 
 local http_base = config.get("*", "core", "http_path") or "www_files";
 
@@ -48,7 +50,14 @@ local function preprocess_path(path)
 end
 
 function serve_file(path)
-       local f, err = open(http_base..path, "rb");
+       local full_path = http_base..path;
+       if stat(full_path, "mode") == "directory" then
+               if stat(full_path.."/index.html", "mode") == "file" then
+                       return serve_file(path.."/index.html");
+               end
+               return response_403;
+       end
+       local f, err = open(full_path, "rb");
        if not f then return response_404; end
        local data = f:read("*a");
        f:close();
@@ -76,6 +85,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, handle_file_request, { base = "files" });
+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