* libs/http: fix header handling in conditionals.lua

[project/luci.git] / libs / http / luasrc / http / protocol.lua

diff --git a/libs/http/luasrc/http/protocol.lua b/libs/http/luasrc/http/protocol.lua
index 08e8ba2..67b4258 100644 (file)
--- a/libs/http/luasrc/http/protocol.lua
+++ b/libs/http/luasrc/http/protocol.lua
@@ -16,7 +16,6 @@ $Id$
 module("luci.http.protocol", package.seeall)
 
 require("ltn12")
-require("luci.util")
 require("luci.http.protocol.filter")
 
 HTTP_MAX_CONTENT      = 1024*4         -- 4 kB maximum content size
@@ -49,7 +48,7 @@ function urldecode_params( url, tbl )
                url = url:gsub( "^.+%?([^?]+)", "%1" )
        end
 
-       for i, pair in ipairs(luci.util.split( url, "[&;]+", nil, true )) do
+       for pair in url:gmatch( "[^&;]+" ) do
 
                -- find key and value
                local key = urldecode( pair:match("^([^=]+)")     )
@@ -115,9 +114,13 @@ local process_states = { }
 -- Extract "magic", the first line of a http message.
 -- Extracts the message type ("get", "post" or "response"), the requested uri
 -- or the status code if the line descripes a http response.
-process_states['magic'] = function( msg, chunk )
+process_states['magic'] = function( msg, chunk, err )
 
        if chunk ~= nil then
+               -- ignore empty lines before request
+               if #chunk == 0 then
+                       return true, nil
+               end
 
                -- Is it a request?
                local method, uri, http_ver = chunk:match("^([A-Z]+) ([^ ]+) HTTP/([01]%.[019])$")
@@ -516,11 +519,41 @@ process_states['urldecode-value'] = function( msg, chunk, filecb )
                        return true
                end
        else
-               return nil, "Unexpected EOF"
+               -- Send EOF
+               msg._urldeccallback( "", true )
+               return false
        end
 end
 
 
+-- Creates a header source from a given socket
+function header_source( sock )
+       return ltn12.source.simplify( function()
+
+               local chunk, err, part = sock:receive("*l")
+
+               -- Line too long
+               if chunk == nil then
+                       if err ~= "timeout" then
+                               return nil, part
+                                       and "Line exceeds maximum allowed length["..part.."]"
+                                       or  "Unexpected EOF"
+                       else
+                               return nil, err
+                       end
+
+               -- Line ok
+               elseif chunk ~= nil then
+
+                       -- Strip trailing CR
+                       chunk = chunk:gsub("\r$","")
+
+                       return chunk, nil
+               end
+       end )
+end
+
+
 -- Decode MIME encoded data.
 function mimedecode_message_body( source, msg, filecb )
 
@@ -616,20 +649,6 @@ function urldecode_message_body( source, msg )
 end
 
 
--- Parse a http message
-function parse_message( data, filecb )
-
-       local reader  = _linereader( data, HTTP_MAX_READBUF )
-       local message = parse_message_header( reader )
-
-       if message then
-               parse_message_body( reader, message, filecb )
-       end
-
-       return message
-end
-
-
 -- Parse a http message header
 function parse_message_header( source )
 
@@ -672,7 +691,7 @@ function parse_message_header( source )
                                REQUEST_URI       = msg.request_uri;
                                SCRIPT_NAME       = msg.request_uri:gsub("?.+$","");
                                SCRIPT_FILENAME   = "";         -- XXX implement me
-                               SERVER_PROTOCOL   = "HTTP/" .. msg.http_version
+                               SERVER_PROTOCOL   = "HTTP/" .. string.format("%.1f", msg.http_version)
                        }
 
                        -- Populate HTTP_* environment variables
@@ -701,19 +720,6 @@ end
 
 -- Parse a http message body
 function parse_message_body( source, msg, filecb )
-
-       -- Install an additional filter if we're operating on chunked transfer
-       -- coding and client is HTTP/1.1 capable
-       if msg.http_version == 1.1 and
-          msg.headers['Transfer-Encoding'] and
-          msg.headers['Transfer-Encoding']:find("chunked")
-       then
-               source = ltn12.source.chain(
-                       source, luci.http.protocol.filter.decode_chunked
-               )
-       end
-
-
        -- Is it multipart/mime ?
        if msg.env.REQUEST_METHOD == "POST" and msg.env.CONTENT_TYPE and
           msg.env.CONTENT_TYPE:match("^multipart/form%-data")
@@ -729,7 +735,7 @@ function parse_message_body( source, msg, filecb )
 
 
        -- Unhandled encoding
-       -- If a file callback is given then feed it line by line, else
+       -- If a file callback is given then feed it chunk by chunk, else
        -- store whole buffer in message.content
        else
 
@@ -769,3 +775,17 @@ function parse_message_body( source, msg, filecb )
                end
        end
 end
+
+-- Status codes
+statusmsg = {
+       [200] = "OK",
+       [304] = "Not Modified",
+       [400] = "Bad Request",
+       [403] = "Forbidden",
+       [404] = "Not Found",
+       [405] = "Method Not Allowed",
+       [411] = "Length Required",
+       [412] = "Precondition Failed",
+       [500] = "Internal Server Error",
+       [503] = "Server Unavailable",
+}