--
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 server = require "net.server"
-local connlisteners_get = require "net.connlisteners".get;
-local listener = connlisteners_get("httpclient") or error("No httpclient listener!");
-
local t_insert, t_concat = table.insert, table.concat;
local pairs, ipairs = pairs, ipairs;
local tonumber, tostring, xpcall, select, debug_traceback, char, format =
module "http"
-function urlencode(s) return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end)); end
+local requests = {}; -- Open requests
+
+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 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
+end
+
+function listener.ondisconnect(conn, err)
+ local request = requests[conn];
+ if request and request.conn then
+ request:reader(nil);
+ end
+ requests[conn] = nil;
+end
+
+function urlencode(s) return s and (s:gsub("[^a-zA-Z0-9.~_-]", 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 function _formencodepart(s)
function formencode(form)
local result = {};
- for _, field in ipairs(form) do
- t_insert(result, _formencodepart(field.name).."=".._formencodepart(field.value));
+ 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
end
return t_concat(result, "&");
end
local function success_cb(r)
if request.callback then
for k,v in pairs(r) do request[k] = v; end
- request.callback(r.body, r.code, request);
+ request.callback(r.body, r.code, request, r);
request.callback = nil;
end
destroy_request(request);
req.path = "/";
end
- local custom_headers, body;
- local default_headers = { ["Host"] = req.host, ["User-Agent"] = "Prosody XMPP Server" }
+ local method, headers, body;
+ headers = {
+ ["Host"] = req.host;
+ ["User-Agent"] = "Prosody XMPP Server";
+ };
if req.userinfo then
- default_headers["Authorization"] = "Basic "..mime.b64(req.userinfo);
+ headers["Authorization"] = "Basic "..b64(req.userinfo);
end
if ex then
- custom_headers = ex.headers;
req.onlystatus = ex.onlystatus;
body = ex.body;
if body then
- req.method = "POST ";
- default_headers["Content-Length"] = tostring(#body);
- default_headers["Content-Type"] = "application/x-www-form-urlencoded";
+ method = "POST";
+ headers["Content-Length"] = tostring(#body);
+ headers["Content-Type"] = "application/x-www-form-urlencoded";
end
if ex.method then method = ex.method; end
if ex.headers then
end
end
- req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a");
- req.write = function (...) return req.handler:write(...); end
- req.conn:settimeout(0);
- local ok, err = req.conn:connect(req.host, req.port or 80);
+ -- Attach to request object
+ req.method, req.headers, req.body = method, headers, body;
+
+ local using_https = req.scheme == "https";
+ local port = tonumber(req.port) or (using_https and 443 or 80);
+
+ -- Connect the socket, and wrap it with net.server
+ local conn = socket.tcp();
+ conn:settimeout(10);
+ local ok, err = conn:connect(req.host, port);
if not ok and err ~= "timeout" then
callback(nil, 0, req);
return nil, err;
end
- local request_line = { req.method or "GET", " ", req.path, " HTTP/1.1\r\n" };
-
- if req.query then
- t_insert(request_line, 4, "?");
- t_insert(request_line, 5, req.query);
- end
-
- req.write(t_concat(request_line));
- local t = { [2] = ": ", [4] = "\r\n" };
- if custom_headers then
- for k, v in pairs(custom_headers) do
- t[1], t[3] = k, v;
- req.write(t_concat(t));
- default_headers[k] = nil;
- end
- end
-
- for k, v in pairs(default_headers) do
- t[1], t[3] = k, v;
- req.write(t_concat(t));
- default_headers[k] = nil;
- end
- req.write("\r\n");
-
- if body then
- req.write(body);
+ 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) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request) end, handleerr)); 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
if request.conn then
request.conn = nil;
request.handler:close()
- listener.ondisconnect(request.handler, "closed");
end
end