summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua4
-rw-r--r--libs/core/luasrc/sys.lua3
-rw-r--r--libs/sgi-cgi/Makefile2
-rw-r--r--libs/sgi-cgi/htdocs/cgi-bin/luci4
-rw-r--r--libs/sgi-cgi/luasrc/sgi/cgi.lua57
-rw-r--r--libs/web/luasrc/dispatcher.lua2
-rw-r--r--libs/web/luasrc/http.lua81
-rw-r--r--libs/web/luasrc/http/protocol.lua21
8 files changed, 106 insertions, 68 deletions
diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
index aeee636301..67ea8a6f0c 100644
--- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
+++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua
@@ -80,7 +80,7 @@ function index()
page.setuser = "nobody"
page.setgroup = "nogroup"
- local vars = luci.http.getvalue()
+ local vars = luci.http.formvalue()
local span = vars.timespan or nil
for i, plugin in luci.util.vspairs( tree:plugins() ) do
@@ -148,7 +148,7 @@ function statistics_render()
require("luci.template")
require("luci.model.uci")
- local vars = luci.http.getvalue()
+ local vars = luci.http.formvalue()
local req = luci.dispatcher.context.request
local path = luci.dispatcher.context.dispatched.path
local uci = luci.model.uci
diff --git a/libs/core/luasrc/sys.lua b/libs/core/luasrc/sys.lua
index 80d702b942..17caa78241 100644
--- a/libs/core/luasrc/sys.lua
+++ b/libs/core/luasrc/sys.lua
@@ -75,6 +75,9 @@ function flash(image, kpattern)
return os.execute(cmd)
end
+-- Returns the enivornment
+getenv = posix.getenv
+
-- Returns the hostname
function hostname()
return io.lines("/proc/sys/kernel/hostname")()
diff --git a/libs/sgi-cgi/Makefile b/libs/sgi-cgi/Makefile
new file mode 100644
index 0000000000..81a96f6a83
--- /dev/null
+++ b/libs/sgi-cgi/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk \ No newline at end of file
diff --git a/libs/sgi-cgi/htdocs/cgi-bin/luci b/libs/sgi-cgi/htdocs/cgi-bin/luci
new file mode 100644
index 0000000000..0435e59ba2
--- /dev/null
+++ b/libs/sgi-cgi/htdocs/cgi-bin/luci
@@ -0,0 +1,4 @@
+#!/usr/bin/lua
+require("luci.sgi.cgi")
+luci.dispatcher.indexcache = "/tmp/.luciindex"
+luci.sgi.cgi.run() \ No newline at end of file
diff --git a/libs/sgi-cgi/luasrc/sgi/cgi.lua b/libs/sgi-cgi/luasrc/sgi/cgi.lua
new file mode 100644
index 0000000000..7abb1ef781
--- /dev/null
+++ b/libs/sgi-cgi/luasrc/sgi/cgi.lua
@@ -0,0 +1,57 @@
+--[[
+LuCI - SGI-Module for CGI
+
+Description:
+Server Gateway Interface for CGI
+
+FileId:
+$Id$
+
+License:
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+module("luci.sgi.cgi", package.seeall)
+require("luci.http")
+require("luci.sys")
+require("luci.dispatcher")
+
+function run()
+ local r = luci.http.Request(luci.sys.getenv(), io.stdin, io.stderr)
+
+ local x = coroutine.create(luci.dispatcher.httpdispatch)
+
+ while coroutine.status(x) ~= "dead" do
+ local res, id, data1, data2 = coroutine.resume(x, r)
+
+ if not res then
+ print("Status: 500 Internal Server Error")
+ print("Content-Type: text/plain\n")
+ print(id)
+ break;
+ end
+
+ if id == 1 then
+ io.write("Status: " .. tostring(data1) .. " " .. data2 .. "\n")
+ elseif id == 2 then
+ io.write(data1 .. ": " .. data2 .. "\n")
+ elseif id == 3 then
+ io.write("\n")
+ elseif id == 4 then
+ io.write(data1)
+ end
+
+ end
+end
diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index e3ebe5b0e4..f5894bffc8 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -84,7 +84,7 @@ end
function httpdispatch(request)
luci.http.context.request = request
context.request = {}
- local pathinfo = request.env.PATH_INFO or ""
+ local pathinfo = request:getenv("PATH_INFO") or ""
for node in pathinfo:gmatch("[^/]+") do
table.insert(context.request, node)
diff --git a/libs/web/luasrc/http.lua b/libs/web/luasrc/http.lua
index 0319f104f7..89385a1617 100644
--- a/libs/web/luasrc/http.lua
+++ b/libs/web/luasrc/http.lua
@@ -38,47 +38,51 @@ Request = luci.util.class()
function Request.__init__(self, env, instream, errstream)
self.input = instream
self.error = errstream
-
- -- Formdata tables
- self.get = {}
- self.post = {}
+ -- Provide readline function
+ self.inputreader = self.input.readline
+ or self.input.read and function() return self.input:read() end
+ or self.input.receive and function() return self.input:receive() end
+ or function() return nil end
+
-- 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),
+ }
- setmetatable(self.get, {__index =
+ setmetatable(self.message.params, {__index =
function(tbl, key)
- tbl = luci.http.protocol.urldecode_params(self.env.QUERY_STRING)
+ luci.http.protocol.parse_message_body(
+ self.inputreader,
+ self.message,
+ self.filehandler
+ )
+
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
+ })
end
function Request.formvalue(self, name, default)
- return tostring(self.post[name] or self.get[name] or default)
+ if name then
+ return self.message.params[name] and tostring(self.message.params[name]) or default
+ 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
- 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
@@ -88,17 +92,7 @@ function Request.formvaluetable(self, prefix)
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
+ return name and self.message.env[name] or self.message.env
end
function Request.setfilehandler(self, callback)
@@ -212,20 +206,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
diff --git a/libs/web/luasrc/http/protocol.lua b/libs/web/luasrc/http/protocol.lua
index 4ff2cb8f98..d9259f6604 100644
--- a/libs/web/luasrc/http/protocol.lua
+++ b/libs/web/luasrc/http/protocol.lua
@@ -370,9 +370,6 @@ function parse_message_header( data )
message.headers = hdrs
- -- Get content
- local clen = ( hdrs['Content-Length'] or HTTP_MAX_CONTENT ) + 0
-
-- Process get parameters
if ( method == "get" or method == "post" ) and
message.request_uri:match("?")
@@ -421,25 +418,24 @@ end
function parse_message_body( reader, message, filecb )
if type(message) == "table" then
+ local env = message.env
- local hdrs = message.headers
-
+ local clen = ( env.CONTENT_LENGTH or HTTP_MAX_CONTENT ) + 0
+
-- Process post method
- if message.request_method == "post" and hdrs['Content-Type'] then
-
+ if env.REQUEST_METHOD:lower() == "post" and env.CONTENT_TYPE then
-- Is it multipart/form-data ?
- if hdrs['Content-Type']:match("^multipart/form%-data") then
+ if env.CONTENT_TYPE:match("^multipart/form%-data") then
for k, v in pairs( mimedecode(
reader,
- hdrs['Content-Type']:match("boundary=(.+)"),
+ env.CONTENT_TYPE:match("boundary=(.+)"),
filecb
) ) do
message.params[k] = v
end
- -- Is it x-www-urlencoded?
- elseif hdrs['Content-Type'] == 'application/x-www-urlencoded' then
-
+ -- Is it x-www-form-urlencoded?
+ elseif env.CONTENT_TYPE:match('^application/x%-www%-form%-urlencoded') then
-- XXX: readline isn't the best solution here
for chunk in reader do
for k, v in pairs( urldecode_params( chunk ) ) do
@@ -458,7 +454,6 @@ function parse_message_body( reader, message, filecb )
-- If a file callback is given then feed it line by line, else
-- store whole buffer in message.content
else
-
for chunk in reader do
-- We have a callback, feed it.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 06:31:36 +0000