* luci/libs/web: extended template syntax to allow removal of leading and trailing...

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

diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index 0319f104f78d5dafbe60d15c1359ba4dbdd3f9b6..7a0a102325f3c76a37c07b57de635173f69f14fa 100644 (file)
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -7,9 +7,6 @@ HTTP-Header manipulator and form variable preprocessor
 FileId:
 $Id$
 
-ToDo:
-- Cookie handling
-
 License:
 Copyright 2008 Steven Barth <steven@midlink.org>
 
@@ -28,6 +25,7 @@ limitations under the License.
 ]]--
 
 module("luci.http", package.seeall)
+local ltn12 = require("luci.ltn12")
 require("luci.http.protocol")
 require("luci.util")
 
@@ -35,50 +33,46 @@ context = luci.util.threadlocal()
 
 
 Request = luci.util.class()
-function Request.__init__(self, env, instream, errstream)
-       self.input = instream
-       self.error = errstream
+function Request.__init__(self, env, sourcein, sinkerr)
+       self.input = sourcein
+       self.error = sinkerr
+
 
-       -- Formdata tables
-       self.get = {}
-       self.post = {}
-       
        -- File handler
        self.filehandler = function() end
        
-       -- Environment table
-       self.env = env
+       -- HTTP-Message table
+       self.message = {
+               env = env,
+               headers = {},
+               params = luci.http.protocol.urldecode_params(env.QUERY_STRING or ""),
+       }
        
-       setmetatable(self.get, {__index =
-               function(tbl, key)
-                       tbl = luci.http.protocol.urldecode_params(self.env.QUERY_STRING)
-                       setmetatable(tbl, nil)
-                       return rawget(tbl, key)
-               end })  
-               
-       setmetatable(self.post, {__index =
-               function(tbl, key)
-                       tbl = luci.http.protocol.
-                       setmetatable(tbl, nil)
-                       return rawget(tbl, key)
-               end })  
+       self.parsed_input = false
 end
 
-function Request.formvalue(self, name, default)
-       return tostring(self.post[name] or self.get[name] or default)
+function Request.formvalue(self, name)
+       if not self.parsed_input then
+               self:_parse_input()
+       end
+       
+       if name then
+               return self.message.params[name]
+       else
+               return self.message.params
+       end
 end
 
 function Request.formvaluetable(self, prefix)
        local vals = {}
        prefix = prefix and prefix .. "." or "."
        
-       for k, v in pairs(self.getvalue()) do
-               if k:find(prefix, 1, true) == 1 then
-                       vals[k:sub(#prefix + 1)] = tostring(v)
-               end
+       if not self.parsed_input then
+               self:_parse_input()
        end
        
-       for k, v in pairs(self.postvalue()) do
+       local void = self.message.params[nil]
+       for k, v in pairs(self.message.params) do
                if k:find(prefix, 1, true) == 1 then
                        vals[k:sub(#prefix + 1)] = tostring(v)
                end
@@ -87,24 +81,34 @@ function Request.formvaluetable(self, prefix)
        return vals
 end
 
-function Request.getenv(self, name)
-       return name and self.env[name] or self.env
+function Request.getcookie(self, name)
+  local c = string.gsub(";" .. (self:getenv("HTTP_COOKIE") or "") .. ";", "%s*;%s*", ";")
+  local p = ";" .. name .. "=(.-);"
+  local i, j, value = c:find(p)
+  return value and urldecode(value)
 end
 
-function Request.getvalue(self, name)
-       local void = self.get[nil]
-       return name and self.get[name] or self.get
-end
-
-function Request.postvalue(self, name)
-       local void = self.post[nil]
-       return name and self.post[name] or self.post
+function Request.getenv(self, name)
+       if name then
+               return self.message.env[name]
+       else
+               return self.message.env
+       end
 end
 
 function Request.setfilehandler(self, callback)
        self.filehandler = callback
 end
 
+function Request._parse_input(self)
+       luci.http.protocol.parse_message_body(
+                self.input,
+                self.message,
+                self.filehandler
+       )
+       self.parsed_input = true
+end
+
 
 function close()
        if not context.eoh then
@@ -126,6 +130,10 @@ function formvaluetable(...)
        return context.request:formvaluetable(...)
 end
 
+function getcookie(...)
+       return context.request:getcookie(...)
+end
+
 function getvalue(...)
        return context.request:getvalue(...)
 end
@@ -143,9 +151,6 @@ function setfilehandler(...)
 end
 
 function header(key, value)
-       if not context.status then
-               status()
-       end
        if not context.headers then
                context.headers = {}
        end
@@ -182,20 +187,8 @@ function write(content)
        coroutine.yield(4, content)
 end
 
-
-function basic_auth(realm, errorpage)
-       header("Status", "401 Unauthorized")
-       header("WWW-Authenticate", string.format('Basic realm="%s"', realm or ""))
-       
-       if errorpage then
-               errorpage()
-       end
-       
-       close()
-end
-
 function redirect(url)
-       header("Status", "302 Found")
+       status(302, "Found")
        header("Location", url)
        close()
 end
@@ -212,20 +205,3 @@ end
 
 urldecode = luci.http.protocol.urldecode
 urlencode = luci.http.protocol.urlencode
---[[
-function urldecode(str)
-       str = str:gsub("+", " ")
-       str = str:gsub("%%(%x%x)",
-               function(h) return string.char(tonumber(h,16)) end)
-       str = str:gsub("\r\n", "\n")
-       return str      
-end
-
-function urlencode(str)
-       str = str:gsub("\n", "\r\n")
-       str = str:gsub("([^%w ])",
-               function (c) return string.format ("%%%02X", string.byte(c)) end)
-       str = str:gsub(" ", "+")
-       return str      
-end
-]]--
\ No newline at end of file