X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fhttp.lua;h=0634d77391b72015f90e40571a60844c0776d776;hb=1881612f6e77c771984d73b85704e89818a82977;hp=a661bb522eaa307b21bae4703c219339c5a36eb1;hpb=cc99208ab793ff03e4a0d030cfcb355756260fcb;p=prosody.git diff --git a/net/http.lua b/net/http.lua index a661bb52..0634d773 100644 --- a/net/http.lua +++ b/net/http.lua @@ -1,3 +1,11 @@ +-- 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" @@ -9,17 +17,19 @@ 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 tonumber, tostring, pairs, xpcall, select, debug_traceback, char, format = + tonumber, tostring, pairs, 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" +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 expectbody(reqt, code) if reqt.method == "HEAD" then return nil end - if code == 204 or code == 304 then return nil end + if code == 204 or code == 304 or code == 301 then return nil end if code >= 100 and code < 200 then return nil end return 1 end @@ -27,16 +37,20 @@ end local function request_reader(request, data, startpos) if not data then if request.body then - request.callback(request.code, t_concat(request.body), request); - else + 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(0, "connection-closed", request); + request.callback("connection-closed", 0, request); + return; end destroy_request(request); + request.body = nil; + request.state = "completed"; return; end - if request.state == "body" then - print("Reading body...") + if request.state == "body" and request.state ~= "completed" then + log("debug", "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) @@ -46,46 +60,63 @@ local function request_reader(request, data, startpos) 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(request.code, t_concat(request.body), request); + request.callback(t_concat(request.body), request.code, request); end + request.body = nil; + request.state = "completed"; + else + log("debug", "Have "..request.havebodylength.." bytes out of "..request.bodylength); end - print("", "Have "..request.havebodylength.." bytes out of "..request.bodylength); end elseif request.state == "headers" then - print("Reading headers...") + log("debug", "Reading headers...") local pos = startpos; - local headers = request.responseheaders or {}; + local headers, headers_complete = request.responseheaders; + if not headers then + headers = {}; + request.responseheaders = headers; + end 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); + --log("debug", "Header: "..k:lower().." = "..v); elseif #line == 0 then - request.responseheaders = headers; + headers_complete = true; break; else - print("Unhandled header line: "..line); + log("warn", "Unhandled header line: "..line); end end + if not headers_complete then return; end -- Reached the end of the headers - request.state = "body"; + if not expectbody(request, request.code) then + request.callback(nil, request.code, request); + return; + end + request.state = "body"; if #data > startpos then return request_reader(request, data, startpos); end elseif request.state == "status" then - print("Reading status...") + log("debug", "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(0, "invalid-status-line", request); + log("warn", "Invalid HTTP status line, telling callback then closing"); + local ret = request.callback("invalid-status-line", 0, request); + destroy_request(request); + return ret; end - request.responsecode, request.responseversion = code, http; + request.code, request.responseversion = code, http; - if request.onlystatus or not expectbody(request, tonumber(code)) then + if request.onlystatus then if request.callback then - request.callback(code, nil, request); + request.callback(nil, code, request); end destroy_request(request); return; @@ -99,9 +130,19 @@ local function request_reader(request, data, startpos) end end -function request(u, callback, ex) +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" } @@ -111,7 +152,7 @@ function request(u, callback, ex) end if ex then - custom_headers = ex.custom_headers; + custom_headers = ex.headers; req.onlystatus = ex.onlystatus; body = ex.body; if body then @@ -122,15 +163,23 @@ function request(u, callback, ex) 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 @@ -151,9 +200,9 @@ function request(u, callback, ex) 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); @@ -162,8 +211,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