X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fhttpd%2Fluasrc%2Fhttpd%2Fserver.lua;h=7bfac68629bbe0ac7a4e69c695ad68bed6d9b6bd;hp=9155e93f54ec31b9fa8054bc55d4a1b45a166db3;hb=699784791cfc05cc03ebce731dca5e5c29b0ab87;hpb=bfbd74c6ae869467061958c92f18d9cc28079ea5 diff --git a/libs/httpd/luasrc/httpd/server.lua b/libs/httpd/luasrc/httpd/server.lua index 9155e93f54..7bfac68629 100644 --- a/libs/httpd/luasrc/httpd/server.lua +++ b/libs/httpd/luasrc/httpd/server.lua @@ -2,6 +2,7 @@ HTTP server implementation for LuCI - helper class (c) 2008 Freifunk Leipzig / Jo-Philipp Wich +(c) 2008 Steven Barth Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,112 +15,221 @@ $Id$ ]]-- module("luci.httpd.server", package.seeall) +require("socket") +require("socket.http") +require("luci.util") - -MAX_CLIENTS = 15 READ_BUFSIZE = 1024 +VERSION = 0.2 -function error400( client, msg ) - client:send( "HTTP/1.0 400 Bad request\r\n" ) - client:send( "Content-Type: text/plain\r\n\r\n" ) - - if msg then - client:send( msg .. "\r\n" ) - end +VHost = luci.util.class() - client:close() +function VHost.__init__(self, handler) + self.handler = handler + self.dhandler = {} end -function error503( client ) - client:send( "HTTP/1.0 503 Server unavailable\r\n" ) - client:send( "Content-Type: text/plain\r\n\r\n" ) - client:send( "There are too many clients connected, try again later\r\n" ) - client:close() -end +function VHost.process(self, request, sourcein, sinkerr, ...) + local handler = self.handler + local uri = request.env.REQUEST_URI:match("^([^?]*)") -function client_handler(client) + -- SCRIPT_NAME + request.env.SCRIPT_NAME = "" - client:settimeout( 0 ) - - -- Create LTN12 block source - local block_source = function() - - coroutine.yield() + -- Call URI part + request.env.PATH_INFO = uri - local chunk, err, part = client:receive( READ_BUFSIZE ) - - if chunk == nil and err == "timeout" then - return part - elseif chunk ~= nil then - return chunk - else - return nil, err + for k, dhandler in pairs(self.dhandler) do + if k == uri or k.."/" == uri:sub(1, #k+1) then + handler = dhandler + request.env.SCRIPT_NAME = k + request.env.PATH_INFO = uri:sub(#k+1) + break; end + end + if handler then + return handler:process(request, sourcein, sinkerr, ...) end +end - -- Create LTN12 line source - local line_source = ltn12.source.simplify( function() - coroutine.yield() +function VHost.set_default_handler(self, handler) + self.handler = handler +end - local chunk, err, part = client:receive("*l") - -- Line too long - if chunk == nil and err ~= "timeout" then +function VHost.set_handler(self, match, handler) + self.dhandler[match] = handler +end - return nil, part - and "Line exceeds maximum allowed length["..part.."]" - or "Unexpected EOF" - -- Line ok - else - -- Strip trailing CR - chunk = chunk:gsub("\r$","") +Server = luci.util.class() - -- We got end of headers, switch to dummy source - if #chunk == 0 then - return "", function() - return nil - end - else - return chunk, nil - end - end - end ) +function Server.__init__(self, host) + self.host = host + self.vhosts = {} +end - coroutine.yield(client) +function Server.set_default_vhost(self, vhost) + self.host = vhost +end +-- Sets a vhost +function Server.set_vhost(self, name, vhost) + self.vhosts[name] = vhost +end - -- parse message - local message, err = luci.http.protocol.parse_message_header( line_source ) +function Server.create_daemon_handlers(self) + return function(...) return self:process(...) end, + function(...) return self:error_overload(...) end +end - if message then - -- If we have a HTTP/1.1 client and an Expect: 100-continue header then - -- respond with HTTP 100 Continue message - if message.http_version == 1.1 and message.headers['Expect'] and - message.headers['Expect'] == '100-continue' - then - client:send("HTTP/1.1 100 Continue\r\n\r\n") - end +function Server.error(self, socket, code, msg) + hcode = tostring(code) + + socket:send( "HTTP/1.0 " .. hcode .. " " .. + luci.http.protocol.statusmsg[code] .. "\r\n" ) + socket:send( "Connection: close\r\n" ) + socket:send( "Content-Type: text/plain\r\n\r\n" ) + + if msg then + socket:send( "HTTP-Error " .. code .. ": " .. msg .. "\r\n" ) + end +end +function Server.error_overload(self, socket) + self:error(socket, 503, "Too many simultaneous connections") +end - local s, e = luci.http.protocol.parse_message_body( block_source, message ) - -- XXX: debug - luci.util.dumptable( message ) +function Server.process( self, client ) - if not s and e then - error400( client, e ) + -- Setup sockets and sources + local thread = { + receive = function(self, ...) return luci.httpd.corecv(client, ...) end + } + + client:settimeout( 0 ) + + local sourcein = ltn12.source.empty() + local sourcehdr = luci.http.protocol.header_source( thread ) + local sinkerr = ltn12.sink.file( io.stderr ) + + local close = false + + local reading = { client } + + local message, err + + repeat + -- parse headers + message, err = luci.http.protocol.parse_message_header( sourcehdr ) + + if not message then + self:error( client, 400, err ) + break + end + + -- keep-alive + if message.http_version == 1.1 then + close = (message.env.HTTP_CONNECTION == "close") + else + close = not message.env.HTTP_CONNECTION or message.env.HTTP_CONNECTION == "close" end - else - error400( client, err ) - end + + if message.request_method == "get" or message.request_method == "head" then + -- Be happy + + elseif message.request_method == "post" then + -- If we have a HTTP/1.1 client and an Expect: 100-continue header then + -- respond with HTTP 100 Continue message + if message.http_version == 1.1 and message.headers['Expect'] and + message.headers['Expect'] == '100-continue' + then + client:send("HTTP/1.1 100 Continue\r\n\r\n") + end + + if message.headers['Transfer-Encoding'] and + message.headers['Transfer-Encoding'] ~= "identity" then + sourcein = socket.source("http-chunked", thread) + elseif message.env.CONTENT_LENGTH then + sourcein = socket.source("by-length", thread, + tonumber(message.env.CONTENT_LENGTH)) + else + self:error( client, 411, luci.http.protocol.statusmsg[411] ) + break; + end + + else + self:error( client, 405, luci.http.protocol.statusmsg[405] ) + break; + + end + - -- send response - error400( client, "Dummy response" ) + local host = self.vhosts[message.env.HTTP_HOST] or self.host + if not host then + self:error( client, 500, "Unable to find matching host" ) + break; + end + + local response, sourceout = host:process( + message, sourcein, sinkerr, + client, io.stderr + ) + if not response then + self:error( client, 500, "Error processing handler" ) + end + + -- Post process response + local sinkmode = close and "close-when-done" or "keep-open" + + if sourceout then + if not response.headers["Content-Length"] then + if message.http_version == 1.1 then + response.headers["Transfer-Encoding"] = "chunked" + sinkmode = "http-chunked" + else + close = true + sinkmode = "close-when-done" + end + end + end + + if close then + response.headers["Connection"] = "close" + end + + + local sinkout = socket.sink(sinkmode, client) + + local header = + message.env.SERVER_PROTOCOL .. " " .. + tostring(response.status) .. " " .. + luci.http.protocol.statusmsg[response.status] .. "\r\n" + + header = header .. "Server: LuCI HTTPd/" .. tostring(VERSION) .. "\r\n" + + + for k,v in pairs(response.headers) do + header = header .. k .. ": " .. v .. "\r\n" + end + + client:send(header .. "\r\n") + + if sourceout then + local eof = false + repeat + coroutine.yield() + eof = not ltn12.pump.step(sourceout, sinkout) + until eof + end + until close + + client:close() end