X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fhttp.lua;h=6ddb19004beb1977b3fe20301487bdbd60ff59b7;hb=1ba6cd3bdef5249183fe70109ded9beb39497a45;hp=043c589066752c33601d2d8e40361ae6e2d842ac;hpb=363fbb548587c434e314f4ba20d48667e5cbb543;p=prosody.git

diff --git a/net/http.lua b/net/http.lua
index 043c5890..6ddb1900 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -1,191 +1,201 @@
+-- Prosody IM
+-- 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.
+--
 
 local socket = require "socket"
-local mime = require "mime"
+local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
+local httpstream_new = require "net.http.parser".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 tonumber, tostring, pairs, xpcall, select, debug_traceback = 
-        tonumber, tostring, pairs, xpcall, select, debug.traceback;
+local pairs = pairs;
+local tonumber, tostring, xpcall, select, traceback =
+      tonumber, tostring, xpcall, select, debug.traceback;
+local assert, error = assert, error
 
 local log = require "util.logger".init("http");
-local print = function () end
-
-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("%%%02x", c:byte()); end)); end
 
 module "http"
 
-local function expectbody(reqt, code)
-    if reqt.method == "HEAD" then return nil end
-    if code == 204 or code == 304 then return nil end
-    if code >= 100 and code < 200 then return nil end
-    return 1
+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
 
-local function request_reader(request, data, startpos)
-	if not data then
-		if request.body then
-			log("debug", "Connection closed, but we have data, calling callback...");
-			request.callback(t_concat(request.body), request.code, request);
-		elseif request.state ~= "completed" then
-			-- Error.. connection was closed prematurely
-			request.callback("connection-closed", 0, request);
-		end
-		destroy_request(request);
-		request.body = nil;
-		request.state = "completed";
+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 request.state == "body" and request.state ~= "completed" then
-		print("Reading body...")
-		if not request.body then request.body = {}; request.havebodylength, request.bodylength = 0, tonumber(request.responseheaders["content-length"]); end
-		if startpos then
-			data = data:sub(startpos, -1)
-		end
-		t_insert(request.body, data);
-		if request.bodylength then
-			request.havebodylength = request.havebodylength + #data;
-			if request.havebodylength >= request.bodylength then
-				-- We have the body
-				log("debug", "Have full body, calling callback");
-				if request.callback then
-					request.callback(t_concat(request.body), request.code, request);
-				end
-				request.body = nil;
-				request.state = "completed";
-			else
-				print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength);
-			end
-		end
-	elseif request.state == "headers" then
-		print("Reading headers...")
-		local pos = startpos;
-		local headers = request.responseheaders or {};
-		for line in data:sub(startpos, -1):gmatch("(.-)\r\n") do
-			startpos = startpos + #line + 2;
-			local k, v = line:match("(%S+): (.+)");
-			if k and v then
-				headers[k:lower()] = v;
-				print("Header: "..k:lower().." = "..v);
-			elseif #line == 0 then
-				request.responseheaders = headers;
-				break;
-			else
-				print("Unhandled header line: "..line);
+
+	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, err);
+	end
+	requests[conn] = nil;
+end
+
+local function request_reader(request, data, err)
+	if not request.parser then
+		local function error_cb(reason)
+			if request.callback then
+				request.callback(reason or "connection-closed", 0, request);
+				request.callback = nil;
 			end
-		end
-		-- Reached the end of the headers
-		request.state = "body";
-		if #data > startpos then
-			return request_reader(request, data, startpos);
-		end
-	elseif request.state == "status" then
-		print("Reading status...")
-		local http, code, text, linelen = data:match("^HTTP/(%S+) (%d+) (.-)\r\n()", startpos);
-		code = tonumber(code);
-		if not code then
-			return request.callback("invalid-status-line", 0, request);
+			destroy_request(request);
 		end
 		
-		request.code, request.responseversion = code, http;
+		if not data then
+			error_cb(err);
+			return;
+		end
 		
-		if request.onlystatus or not expectbody(request, code) then
+		local function success_cb(r)
 			if request.callback then
-				request.callback(nil, code, request);
+				request.callback(r.body, r.code, r, request);
+				request.callback = nil;
 			end
 			destroy_request(request);
-			return;
 		end
-		
-		request.state = "headers";
-		
-		if #data > linelen then
-			return request_reader(request, data, linelen);
+		local function options_cb()
+			return request;
 		end
+		request.parser = httpstream_new(success_cb, error_cb, "client", options_cb);
 	end
+	request.parser:feed(data);
 end
 
-local function handleerr(err) log("error", "Traceback[http]: %s: %s", tostring(err), debug_traceback()); end
+local function handleerr(err) log("error", "Traceback[http]: %s", traceback(tostring(err), 2)); end
 function request(u, ex, callback)
 	local req = url.parse(u);
 	
-	local custom_headers, body;
-	local default_headers = { ["Host"] = req.host, ["User-Agent"] = "Prosody XMPP Server" }
+	if not (req and req.host) then
+		callback(nil, 0, req);
+		return nil, "invalid-url";
+	end
+	
+	if not req.path then
+		req.path = "/";
+	end
 	
+	local method, headers, body;
 	
-	if req.userinfo then
-		default_headers["Authorization"] = "Basic "..mime.b64(req.userinfo);
+	local host, port = req.host, req.port;
+	local host_header = host;
+	if (port == "80" and req.scheme == "http")
+	or (port == "443" and req.scheme == "https") then
+		port = nil;
+	elseif port then
+		host_header = host_header..":"..port;
 	end
+
+	headers = {
+		["Host"] = host_header;
+		["User-Agent"] = "Prosody XMPP Server";
+	};
 	
+	if req.userinfo then
+		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
+			for k, v in pairs(ex.headers) do
+				headers[k] = v;
+			end
 		end
-		if ex.method then req.method = ex.method; end
-	end
-	
-	req.handler, req.conn = server.wraptcpclient(listener, socket.tcp(), req.host, req.port or 80, 0, "*a");
-	req.write = req.handler.write;
-	req.conn:settimeout(0);
-	local ok, err = req.conn:connect(req.host, req.port or 80);
-	if not ok and err ~= "timeout" then
-		return nil, err;
 	end
 	
-	local request_line = { req.method or "GET", " ", req.path, " HTTP/1.1\r\n" };
+	-- Attach to request object
+	req.method, req.headers, req.body = method, headers, body;
 	
-	if req.query then
-		t_insert(request_line, 4, "?");
-		t_insert(request_line, 5, req.query);
+	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_number = port and tonumber(port) or (using_https and 443 or 80);
 	
-	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;
+	-- Connect the socket, and wrap it with net.server
+	local conn = socket.tcp();
+	conn:settimeout(10);
+	local ok, err = conn:connect(host, port_number);
+	if not ok and err ~= "timeout" then
+		callback(nil, 0, req);
+		return nil, err;
 	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 = assert(server.wrapclient(conn, host, port_number, 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
 
 function destroy_request(request)
 	if request.conn then
-		request.handler.close()
-		listener.disconnect(request.conn, "closed");
+		request.conn = nil;
+		request.handler:close()
 	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;