X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fhttp.lua;h=6c8e0a687b8beacb28331c9e659066a48d600cd7;hb=70281db08732799bcd1ff4dcc3ca51b1388f1375;hp=38db0c0df2f6ebce0130301fc017465182fba7d2;hpb=616b4f7f6b8537693e450974ad2d95a0a10d026f;p=prosody.git diff --git a/net/http.lua b/net/http.lua index 38db0c0d..6c8e0a68 100644 --- a/net/http.lua +++ b/net/http.lua @@ -1,7 +1,16 @@ +-- 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 url = require "socket.url" +local httpstream_new = require "util.httpstream".new; local server = require "net.server" @@ -9,100 +18,72 @@ 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 tonumber, tostring, pairs = tonumber, tostring, pairs; -local print = function () end +local pairs, ipairs = pairs, ipairs; +local tonumber, tostring, xpcall, select, debug_traceback, char, format = + tonumber, tostring, xpcall, select, debug.traceback, string.char, string.format; -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 +local log = require "util.logger".init("http"); 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 -end +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 function request_reader(request, data, startpos) - if not data then - if request.body then - request.callback(t_concat(request.body), request.code, request); +local function _formencodepart(s) + return s and (s:gsub("%W", function (c) + if c ~= " " then + return format("%%%02x", c:byte()); else - -- Error.. connection was closed prematurely - request.callback("connection-closed", 0, request); + return "+"; end - destroy_request(request); - return; + end)); +end +function formencode(form) + local result = {}; + for _, field in ipairs(form) do + t_insert(result, _formencodepart(field.name).."=".._formencodepart(field.value)); end - if request.state == "body" 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 - if request.callback then - request.callback(t_concat(request.body), request.code, request); - end - end - print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength); - 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); + return t_concat(result, "&"); +end + +local function request_reader(request, data, startpos) + if not request.parser then + 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 = nil; end + destroy_request(request); 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); - end - - request.code, request.responseversion = code, http; - - if request.onlystatus or not expectbody(request, code) then + local function error_cb(r) if request.callback then - request.callback(nil, code, request); + request.callback(r or "connection-closed", 0, 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 function request(u, ex, callback) local req = url.parse(u); + 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 custom_headers, body; local default_headers = { ["Host"] = req.host, ["User-Agent"] = "Prosody XMPP Server" } @@ -112,7 +93,7 @@ function request(u, ex, callback) end if ex then - custom_headers = ex.custom_headers; + custom_headers = ex.headers; req.onlystatus = ex.onlystatus; body = ex.body; if body then @@ -123,15 +104,23 @@ function request(u, ex, callback) 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.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); if not ok and err ~= "timeout" then + callback(nil, 0, req); return nil, err; end - req.write((req.method or "GET ")..req.path.." HTTP/1.0\r\n"); + 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 @@ -152,9 +141,9 @@ function request(u, ex, callback) req.write(body); end - req.callback = callback; + 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.reader = request_reader; - req.state = "status" + req.state = "status"; listener.register_request(req.handler, req); @@ -163,8 +152,9 @@ end function destroy_request(request) if request.conn then - request.handler.close() - listener.disconnect(request.conn, "closed"); + request.conn = nil; + request.handler:close() + listener.ondisconnect(request.handler, "closed"); end end