module("luci.http.protocol", package.seeall)
-require("ltn12")
-require("luci.http.protocol.filter")
+local ltn12 = require("luci.ltn12")
HTTP_MAX_CONTENT = 1024*4 -- 4 kB maximum content size
HTTP_URLENC_MAXKEYLEN = 1024 -- maximum allowd size of urlencoded parameter names
-- Decode an urlencoded string.
-- Returns the decoded value.
-function urldecode( str )
+function urldecode( str, no_plus )
local function __chrdec( hex )
return string.char( tonumber( hex, 16 ) )
end
if type(str) == "string" then
- str = str:gsub( "+", " " ):gsub( "%%([a-fA-F0-9][a-fA-F0-9])", __chrdec )
+ if not no_plus then
+ str = str:gsub( "+", " " )
+ end
+
+ str = str:gsub( "%%([a-fA-F0-9][a-fA-F0-9])", __chrdec )
end
return str
if type(str) == "string" then
str = str:gsub(
- "([^a-zA-Z0-9$_%-%.+!*'(),])",
+ "([^a-zA-Z0-9$_%-%.%+!*'(),])",
__chrenc
)
end
end
+-- Parameter helper
+local function __initval( tbl, key )
+ local multival = ( key:sub( #key - 1, #key ) == "[]" )
+
+ if multival then
+ if type(tbl[key]) == "table" then
+ table.insert( tbl[key], "" )
+ else
+ tbl[key] = { "" }
+ end
+ else
+ tbl[key] = ""
+ end
+
+ return multival
+end
+
+local function __appendval( tbl, key, multival, chunk )
+ if multival then
+ tbl[key][#tbl[key]] = tbl[key][#tbl[key]] .. chunk
+ else
+ tbl[key] = tbl[key] .. chunk
+ end
+end
+
+local function __finishval( tbl, key, multival, handler )
+ if handler then
+ if multival then
+ tbl[key][#tbl[key]] = handler( tbl[key][#tbl[key]] )
+ else
+ tbl[key] = handler( tbl[key] )
+ end
+ end
+end
+
+
-- Table of our process states
local process_states = { }
-- Treat as form field
else
- msg.params[field] = ""
+ local mv = __initval( msg.params, field )
msg._mimecallback = function(chunk,eof)
- msg.params[field] = msg.params[field] .. chunk
+ __appendval( msg.params, field, mv, chunk )
end
end
local key = urldecode( buffer:sub( 1, spos - 1 ) )
-- Prepare buffers
- msg.params[key] = ""
msg._urldeclength = msg._urldeclength + epos
msg._urldecbuffer = buffer:sub( epos + 1, #buffer )
filecb( field, chunk, eof )
end
else
+ local mv = __initval( msg.params, key )
msg._urldeccallback = function( chunk, eof )
- msg.params[key] = msg.params[key] .. chunk
+ __appendval( msg.params, key, mv, chunk )
-- FIXME: Use a filter
if eof then
- msg.params[key] = urldecode( msg.params[key] )
+ __finishval( msg.params, key, mv, urldecode )
end
end
end
if chunk == nil then
if err ~= "timeout" then
return nil, part
- and "Line exceeds maximum allowed length["..part.."]"
+ and "Line exceeds maximum allowed length"
or "Unexpected EOF"
else
return nil, err
-- Status codes
statusmsg = {
[200] = "OK",
+ [301] = "Moved Permanently",
[304] = "Not Modified",
[400] = "Bad Request",
[403] = "Forbidden",