X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_httpserver.lua;h=654aff067ce5d894078f37ac381888312e83e3f7;hb=14e478867b5e673654430ac8d3fe62bbd94a76d1;hp=7135f479b3ce8d11b87d07b4e63c38c30b3fed16;hpb=e9447b83266bf93e812fc0a357f933100f5a03b1;p=prosody.git

diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index 7135f479..654aff06 100644
--- 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.
@@ -8,13 +8,16 @@
 
 
 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";
 
 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 +26,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";
 };
@@ -47,13 +50,22 @@ 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();
+	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;
@@ -73,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