net.server_event: Define id property for connection objects, to aid logging

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index b9ac7971a629c07225f24a5547e7e5b616dc4af6..ddb4475c2dc8d7e5d486e0b0a34d3f0bd2f2324d 100644 (file)
--- 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");
 
@@ -30,7 +37,8 @@ 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);
+               local body = 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
@@ -41,19 +49,19 @@ local function send_response(request, response)
                                t_insert(resp, "\r\n");
                        end
                end
-               if response.body and not (h and h["Content-Length"]) then
+               if not (h and h["Content-Length"]) then
                        t_insert(resp, "Content-Length: ");
-                       t_insert(resp, #response.body);
+                       t_insert(resp, #body);
                        t_insert(resp, "\r\n");
                end
                t_insert(resp, "\r\n");
                
-               if response.body and request.method ~= "HEAD" then
-                       t_insert(resp, response.body);
+               if request.method ~= "HEAD" then
+                       t_insert(resp, body);
                end
        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");
@@ -81,9 +89,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 +101,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);
@@ -225,7 +230,7 @@ function destroy_request(request)
                end
                request.handler.close()
                if request.conn then
-                       listener.disconnect(request.conn, "closed");
+                       listener.disconnect(request.handler, "closed");
                end
        end
 end
@@ -243,6 +248,42 @@ 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";
+               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;