net.http, util.http: Move definitions of urlencode/decode and formencode/decode to...

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 6287f408fbf32eaa3875aef6c22ebc65f2e18eb2..516afe58314ec3b0ae5d37f44667e3c5428f2f7a 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -7,14 +7,14 @@
 --
 
 local socket = require "socket"
-local mime = require "mime"
+local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
 local httpstream_new = require "util.httpstream".new;
+local util_http = require "util.http";
 
-local server = require "net.server"
+local ssl_available = pcall(require, "ssl");
 
-local connlisteners_get = require "net.connlisteners".get;
-local listener = connlisteners_get("httpclient") or error("No httpclient listener!");
+local server = require "net.server"
 
 local t_insert, t_concat = table.insert, table.concat;
 local pairs, ipairs = pairs, ipairs;
@@ -25,46 +25,53 @@ local log = require "util.logger".init("http");
 
 module "http"
 
-function urlencode(s) return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end)); end
-function urldecode(s) return s and (s:gsub("%%(%x%x)", function (c) return char(tonumber(c,16)); end)); end
+local requests = {}; -- Open requests
 
-local function _formencodepart(s)
-       return s and (s:gsub("%W", function (c)
-               if c ~= " " then
-                       return format("%%%02x", c:byte());
-               else
-                       return "+";
-               end
-       end));
+local listener = { default_port = 80, default_mode = "*a" };
+
+function listener.onconnect(conn)
+       local req = requests[conn];
+       -- Send the request
+       local request_line = { req.method or "GET", " ", req.path, " HTTP/1.1\r\n" };
+       if req.query then
+               t_insert(request_line, 4, "?"..req.query);
+       end
+       
+       conn:write(t_concat(request_line));
+       local t = { [2] = ": ", [4] = "\r\n" };
+       for k, v in pairs(req.headers) do
+               t[1], t[3] = k, v;
+               conn:write(t_concat(t));
+       end
+       conn:write("\r\n");
+       
+       if req.body then
+               conn:write(req.body);
+       end
 end
 
-function formencode(form)
-       local result = {};
-       if form[1] then -- Array of ordered { name, value }
-               for _, field in ipairs(form) do
-                       t_insert(result, _formencodepart(field.name).."=".._formencodepart(field.value));
-               end
-       else -- Unordered map of name -> value
-               for name, value in pairs(form) do
-                       t_insert(result, _formencodepart(name).."=".._formencodepart(value));
-               end
+function listener.onincoming(conn, data)
+       local request = requests[conn];
+
+       if not request then
+               log("warn", "Received response from connection %s with no request attached!", tostring(conn));
+               return;
+       end
+
+       if data and request.reader then
+               request:reader(data);
        end
-       return t_concat(result, "&");
 end
 
-function formdecode(s)
-       if not s:match("=") then return urldecode(s); end
-       local r = {};
-       for k, v in s:gmatch("([^=&]*)=([^&]*)") do
-               k, v = k:gsub("%+", "%%20"), v:gsub("%+", "%%20");
-               k, v = urldecode(k), urldecode(v);
-               t_insert(r, { name = k, value = v });
-               r[k] = v;
+function listener.ondisconnect(conn, err)
+       local request = requests[conn];
+       if request and request.conn then
+               request:reader(nil);
        end
-       return r;
+       requests[conn] = nil;
 end
 
-local function request_reader(request, data, startpos)
+local function request_reader(request, data)
        if not request.parser then
                if not data then return; end
                local function success_cb(r)
@@ -111,7 +118,7 @@ function request(u, ex, callback)
        };
        
        if req.userinfo then
-               headers["Authorization"] = "Basic "..mime.b64(req.userinfo);
+               headers["Authorization"] = "Basic "..b64(req.userinfo);
        end
 
        if ex then
@@ -134,6 +141,9 @@ function request(u, ex, callback)
        req.method, req.headers, req.body = method, headers, body;
        
        local using_https = req.scheme == "https";
+       if using_https and not ssl_available then
+               error("SSL not available, unable to contact https URL");
+       end
        local port = tonumber(req.port) or (using_https and 443 or 80);
        
        -- Connect the socket, and wrap it with net.server
@@ -145,15 +155,19 @@ function request(u, ex, callback)
                return nil, err;
        end
        
-       req.handler, req.conn = server.wrapclient(conn, req.host, port, listener, "*a", using_https and { mode = "client", protocol = "sslv23" });
+       local sslctx = false;
+       if using_https then
+               sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
+       end
+
+       req.handler, req.conn = server.wrapclient(conn, req.host, port, listener, "*a", sslctx);
        req.write = function (...) return req.handler:write(...); end
        
        req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end
        req.reader = request_reader;
        req.state = "status";
 
-       listener.register_request(req.handler, req);
-
+       requests[req.handler] = req;
        return req;
 end
 
@@ -161,10 +175,13 @@ function destroy_request(request)
        if request.conn then
                request.conn = nil;
                request.handler:close()
-               listener.ondisconnect(request.handler, "closed");
        end
 end
 
-_M.urlencode = urlencode;
+local urlencode, urldecode = util_http.urlencode, util_http.urldecode;
+local formencode, formdecode = util_http.formencode, util_http.formdecode;
+
+_M.urlencode, _M.urldecode = urlencode, urldecode;
+_M.formencode, _M.formdecode = formencode, formdecode;
 
 return _M;