X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fhttpserver.lua;h=6ebfcb769293e19c02786bc50b4a185a7dfb3713;hb=eab3aefe2866df8985dbf97a6922a7cbfc5cb64b;hp=b9ac7971a629c07225f24a5547e7e5b616dc4af6;hpb=aaeae2efeea1819f657bb8afcee1855e056562b7;p=prosody.git

diff --git a/net/httpserver.lua b/net/httpserver.lua
index b9ac7971..6ebfcb76 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local socket = require "socket"
 local server = require "net.server"
@@ -9,10 +17,9 @@ local listener;
 
 local t_insert, t_concat = table.insert, table.concat;
 local s_match, s_gmatch = string.match, string.gmatch;
-local tonumber, tostring, pairs = tonumber, tostring, pairs;
+local tonumber, tostring, pairs, ipairs, type = tonumber, tostring, pairs, ipairs, type;
 
-local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
-local urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end
+local urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end
 
 local log = require "util.logger".init("httpserver");
 
@@ -29,41 +36,38 @@ end
 local function send_response(request, response)
 	-- Write status line
 	local resp;
-	if response.body then
-		log("debug", "Sending response to %s: %s", request.id, response.body);
-		resp = { "HTTP/1.0 ", response.status or "200 OK", "\r\n"};
+	if response.body or response.headers then
+		local body = response.body and tostring(response.body);
+		log("debug", "Sending response to %s", request.id);
+		resp = { "HTTP/1.0 "..(response.status or "200 OK").."\r\n" };
 		local h = response.headers;
 		if h then
 			for k, v in pairs(h) do
-				t_insert(resp, k);
-				t_insert(resp, ": ");
-				t_insert(resp, v);
-				t_insert(resp, "\r\n");
+				t_insert(resp, k..": "..v.."\r\n");
 			end
 		end
-		if response.body and not (h and h["Content-Length"]) then
-			t_insert(resp, "Content-Length: ");
-			t_insert(resp, #response.body);
-			t_insert(resp, "\r\n");
+		if body and not (h and h["Content-Length"]) then
+			t_insert(resp, "Content-Length: "..#body.."\r\n");
 		end
 		t_insert(resp, "\r\n");
 		
-		if response.body and request.method ~= "HEAD" then
-			t_insert(resp, response.body);
+		if body and request.method ~= "HEAD" then
+			t_insert(resp, body);
 		end
+		request.write(t_concat(resp));
 	else
 		-- Response we have is just a string (the body)
-		log("debug", "Sending response to %s: %s", request.id, response);
+		log("debug", "Sending 200 response to %s", request.id or "<none>");
 		
-		resp = { "HTTP/1.0 200 OK\r\n" };
-		t_insert(resp, "Connection: close\r\n");
-		t_insert(resp, "Content-Length: ");
-		t_insert(resp, #response);
-		t_insert(resp, "\r\n\r\n");
+		local resp = "HTTP/1.0 200 OK\r\n"
+			.. "Connection: close\r\n"
+			.. "Content-Type: text/html\r\n"
+			.. "Content-Length: "..#response.."\r\n"
+			.. "\r\n"
+			.. response;
 		
-		t_insert(resp, response);
+		request.write(resp);
 	end
-	request.write(t_concat(resp));
 	if not request.stayopen then
 		request:destroy();
 	end
@@ -81,9 +85,6 @@ local function call_callback(request, err)
 		end
 		
 		callback = (request.server and request.server.handlers[base]) or default_handler;
-		if callback == default_handler then
-			log("debug", "Default callback for this request (base: "..tostring(base)..")")
-		end
 	end
 	if callback then
 		if err then
@@ -96,10 +97,10 @@ local function call_callback(request, err)
 		
 		local response = callback(request.method, request.body and t_concat(request.body), request);
 		if response then
-			if response == true then
+			if response == true and not request.destroyed then
 				-- Keep connection open, we will reply later
-				log("warn", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
-			else
+				log("debug", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
+			elseif response ~= true then
 				-- Assume response
 				send_response(request, response);
 				destroy_request(request);
@@ -141,22 +142,29 @@ local function request_reader(request, data, startpos)
 	elseif request.state == "headers" then
 		log("debug", "Reading headers...")
 		local pos = startpos;
-		local headers = request.headers or {};
+		local headers, headers_complete = request.headers;
+		if not headers then
+			headers = {};
+			request.headers = headers;
+		end
+		
 		for line in data:gmatch("(.-)\r\n") do
 			startpos = (startpos or 1) + #line + 2;
 			local k, v = line:match("(%S+): (.+)");
 			if k and v then
 				headers[k:lower()] = v;
---				log("debug", "Header: "..k:lower().." = "..v);
+				--log("debug", "Header: '"..k:lower().."' = '"..v.."'");
 			elseif #line == 0 then
-				request.headers = headers;
+				headers_complete = true;
 				break;
 			else
 				log("debug", "Unhandled header line: "..line);
 			end
 		end
 		
-		if not expectbody(request) then 
+		if not headers_complete then return; end
+		
+		if not expectbody(request) then
 			call_callback(request);
 			return;
 		end
@@ -170,14 +178,17 @@ local function request_reader(request, data, startpos)
 		log("debug", "Reading request line...")
 		local method, path, http, linelen = data:match("^(%S+) (%S+) HTTP/(%S+)\r\n()", startpos);
 		if not method then
-			return call_callback(request, "invalid-status-line");
+			log("warn", "Invalid HTTP status line, telling callback then closing");
+			local ret = call_callback(request, "invalid-status-line");
+			request:destroy();
+			return ret;
 		end
 		
 		request.method, request.path, request.httpversion = method, path, http;
 		
 		request.url = url_parse(request.path);
 		
-		log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler.serverport());
+		log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler:serverport());
 		
 		if request.onlystatus then
 			if not call_callback(request) then
@@ -195,17 +206,17 @@ end
 
 -- The default handler for requests
 default_handler = function (method, body, request)
-	log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler.serverport());
-	return { status = "404 Not Found", 
+	log("debug", method.." request for "..tostring(request.path) .. " on port "..request.handler:serverport());
+	return { status = "404 Not Found",
 			headers = { ["Content-Type"] = "text/html" },
 			body = "<html><head><title>Page Not Found</title></head><body>Not here :(</body></html>" };
 end
 
 
 function new_request(handler)
-	return { handler = handler, conn = handler.socket, 
-			write = handler.write, state = "request", 
-			server = http_servers[handler.serverport()],
+	return { handler = handler, conn = handler.socket,
+			write = function (...) return handler:write(...); end, state = "request",
+			server = http_servers[handler:serverport()],
 			send = send_response,
 			destroy = destroy_request,
 			id = tostring{}:match("%x+$")
@@ -223,9 +234,9 @@ function destroy_request(request)
 		else
 			log("debug", "Request has no destroy callback");
 		end
-		request.handler.close()
+		request.handler:close()
 		if request.conn then
-			listener.disconnect(request.conn, "closed");
+			listener.ondisconnect(request.handler, "closed");
 		end
 	end
 end
@@ -243,6 +254,43 @@ function new(params)
 	end
 end
 
+function set_default_handler(handler)
+	default_handler = handler;
+end
+
+function new_from_config(ports, handle_request, default_options)
+	if type(handle_request) == "string" then -- COMPAT with old plugins
+		log("warn", "Old syntax of httpserver.new_from_config being used to register %s", handle_request);
+		handle_request, default_options = default_options, { base = handle_request };
+	end
+	for _, options in ipairs(ports) do
+		local port = default_options.port or 5280;
+		local base = default_options.base;
+		local ssl = default_options.ssl or false;
+		local interface = default_options.interface;
+		if type(options) == "number" then
+			port = options;
+		elseif type(options) == "table" then
+			port = options.port or port;
+			base = options.path or base;
+			ssl = options.ssl or ssl;
+			interface = options.interface or interface;
+		elseif type(options) == "string" then
+			base = options;
+		end
+		
+		if ssl then
+			ssl.mode = "server";
+			ssl.protocol = "sslv23";
+			ssl.options = "no_sslv2";
+		end
+		
+		new{ port = port, interface = interface, 
+			base = base, handler = handle_request, 
+			ssl = ssl, type = (ssl and "ssl") or "tcp" };
+	end
+end
+
 _M.request_reader = request_reader;
 _M.send_response = send_response;
 _M.urlencode = urlencode;