* Generalized HTTP-API

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

diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index 3bff28a..0319f10 100644 (file)
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -28,23 +28,191 @@ limitations under the License.
 ]]--
 
 module("luci.http", package.seeall)
+require("luci.http.protocol")
+require("luci.util")
 
-if ENV and ENV.HASERLVER then
-       require("luci.sgi.haserl")
-elseif webuci then
-       require("luci.sgi.webuci")
+context = luci.util.threadlocal()
+
+
+Request = luci.util.class()
+function Request.__init__(self, env, instream, errstream)
+       self.input = instream
+       self.error = errstream
+
+       -- Formdata tables
+       self.get = {}
+       self.post = {}
+       
+       -- File handler
+       self.filehandler = function() end
+       
+       -- Environment table
+       self.env = env
+       
+       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 })  
+end
+
+function Request.formvalue(self, name, default)
+       return tostring(self.post[name] or self.get[name] or default)
+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
+       end
+       
+       for k, v in pairs(self.postvalue()) do
+               if k:find(prefix, 1, true) == 1 then
+                       vals[k:sub(#prefix + 1)] = tostring(v)
+               end
+       end
+       
+       return vals
+end
+
+function Request.getenv(self, name)
+       return name and self.env[name] or self.env
+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
+end
+
+function Request.setfilehandler(self, callback)
+       self.filehandler = callback
+end
+
+
+function close()
+       if not context.eoh then
+               context.eoh = true
+               coroutine.yield(3)
+       end
+       
+       if not context.closed then
+               context.closed = true
+               coroutine.yield(5)
+       end
+end
+
+function formvalue(...)
+       return context.request:formvalue(...)
+end
+
+function formvaluetable(...)
+       return context.request:formvaluetable(...)
+end
+
+function getvalue(...)
+       return context.request:getvalue(...)
+end
+
+function postvalue(...)
+       return context.request:postvalue(...)
+end
+
+function getenv(...)
+       return context.request:getenv(...)
+end
+
+function setfilehandler(...)
+       return context.request:setfilehandler(...)
+end
+
+function header(key, value)
+       if not context.status then
+               status()
+       end
+       if not context.headers then
+               context.headers = {}
+       end
+       context.headers[key:lower()] = value
+       coroutine.yield(2, key, value)
+end
+
+function prepare_content(mime)
+       header("Content-Type", mime)
+end
+
+function status(code, message)
+       code = code or 200
+       message = message or "OK"
+       context.status = code
+       coroutine.yield(1, code, message)
+end
+
+function write(content)
+       if not content or #content == 0 then
+               return
+       end
+       if not context.eoh then
+               if not context.status then
+                       status()
+               end
+               if not context.headers or not context.headers["content-type"] then
+                       header("Content-Type", "text/html; charset=utf-8")
+               end
+               
+               context.eoh = true
+               coroutine.yield(3)
+       end
+       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")
+       header("Location", url)
+       close()
 end
 
 function build_querystring(table)
        local s="?"
        
        for k, v in pairs(table) do
-               s = s .. k .. "=" .. v .. "&"
+               s = s .. urlencode(k) .. "=" .. urlencode(v) .. "&"
        end
        
        return s
 end
 
+urldecode = luci.http.protocol.urldecode
+urlencode = luci.http.protocol.urlencode
+--[[
 function urldecode(str)
        str = str:gsub("+", " ")
        str = str:gsub("%%(%x%x)",
@@ -59,4 +227,5 @@ function urlencode(str)
                function (c) return string.format ("%%%02X", string.byte(c)) end)
        str = str:gsub(" ", "+")
        return str      
-end
\ No newline at end of file
+end
+]]--
\ No newline at end of file