-- @return Relative URL
function build_url(...)
local path = {...}
- local sn = http.getenv("SCRIPT_NAME") or ""
+ local url = { http.getenv("SCRIPT_NAME") or "" }
+
+ local k, v
for k, v in pairs(context.urltoken) do
- sn = sn .. "/;" .. k .. "=" .. http.urlencode(v)
+ url[#url+1] = "/;"
+ url[#url+1] = http.urlencode(k)
+ url[#url+1] = "="
+ url[#url+1] = http.urlencode(v)
+ end
+
+ local p
+ for _, p in ipairs(path) do
+ if p:match("^[a-zA-Z0-9_%-%./,;]+$") then
+ url[#url+1] = "/"
+ url[#url+1] = p
+ end
end
- return sn .. ((#path > 0) and "/" .. table.concat(path, "/") or "")
+
+ return table.concat(url, "")
end
--- Send a 404 error code and render the "error404" template if available.
--- Dispatch an HTTP request.
-- @param request LuCI HTTP Request object
-function httpdispatch(request, prefix, ext_tree)
+function httpdispatch(request, prefix)
luci.http.context.request = request
- context.request = {}
+
+ local r = {}
+ context.request = r
local pathinfo = http.urldecode(request:getenv("PATH_INFO") or "", true)
+ if prefix then
+ for _, node in ipairs(prefix) do
+ r[#r+1] = node
+ end
+ end
+
for node in pathinfo:gmatch("[^/]+") do
- table.insert(context.request, node)
+ r[#r+1] = node
end
local stat, err = util.coxpcall(function()
- dispatch(context.request, ext_tree)
+ dispatch(context.request)
end, error500)
luci.http.close()
--- Dispatches a LuCI virtual path.
-- @param request Virtual path
-function dispatch(request, ext_tree)
+function dispatch(request)
--context._disable_memtrace = require "luci.debug".trap_memtrace("l")
local ctx = context
ctx.path = request
assert(conf.main,
"/etc/config/luci seems to be corrupt, unable to find section 'main'")
- local lang = conf.main.lang
+ local lang = conf.main.lang or "auto"
if lang == "auto" then
local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
for lpat in aclang:gmatch("[%w-]+") do
break
end
end
- end
- require "luci.i18n".setlanguage(lang)
-
- if ext_tree then
- ctx.index, ctx.tree, ctx.treecache, ctx.modifiers = unpack(ext_tree)
- elseif not ctx.tree then
- createtree()
end
+ require "luci.i18n".setlanguage(lang)
local c = ctx.tree
local stat
+ if not c then
+ c = createtree()
+ end
+
local track = {}
local args = {}
ctx.args = args
for i, s in ipairs(request) do
local tkey, tval
if t then
- tkey, tval = s:match(";(%w+)=(.*)")
+ tkey, tval = s:match(";(%w+)=([a-fA-F0-9]*)")
end
if tkey then
if (c and c.index) or not track.notemplate then
local tpl = require("luci.template")
local media = track.mediaurlbase or luci.config.main.mediaurlbase
- if not tpl.Template("themes/%s/header" % fs.basename(media)) then
- --if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
+ if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
media = nil
for name, theme in pairs(luci.config.themes) do
if name:sub(1,1) ~= "." and pcall(tpl.Template,
end
tpl.context.viewns = setmetatable({
- write = luci.http.write;
- include = function(name) tpl.Template(name):render(getfenv(2)) end;
- translate = function(...) return require("luci.i18n").translate(...) end;
- striptags = util.striptags;
- media = media;
- theme = fs.basename(media);
- resource = luci.config.main.resourcebase
+ write = luci.http.write;
+ include = function(name) tpl.Template(name):render(getfenv(2)) end;
+ translate = function(...) return require("luci.i18n").translate(...) end;
+ striptags = util.striptags;
+ media = media;
+ theme = fs.basename(media);
+ resource = luci.config.main.resourcebase
}, {__index=function(table, key)
if key == "controller" then
return build_url()
local verifytoken = false
if not sess then
sess = luci.http.getcookie("sysauth")
- sess = sess and sess:match("^[a-f0-9]+$")
+ sess = sess and sess:match("^[a-f0-9]*$")
verifytoken = true
end
if not verifytoken or ctx.urltoken.stok == sdat.token then
user = sdat.user
end
+ else
+ local eu = http.getenv("HTTP_AUTH_USER")
+ local ep = http.getenv("HTTP_AUTH_PASS")
+ if eu and ep and luci.sys.user.checkpasswd(eu, ep) then
+ authen = function() return eu end
+ end
end
if not util.contains(accs, user) then
local suff = { ".lua", ".lua.gz" }
if luci.util.copcall(require, "luci.fastindex") then
- return createindex_fastindex(path, suff)
+ createindex_fastindex(path, suff)
else
- return createindex_plain(path, suff)
+ createindex_plain(path, suff)
end
end
-- @param path Controller base directory
-- @param suffixes Controller file suffixes
function createindex_fastindex(path, suffixes)
- local index = {}
+ index = {}
if not fi then
fi = luci.fastindex.new("index")
for k, v in pairs(fi.indexes) do
index[v[2]] = v[1]
end
-
- return index
end
--- Generate the dispatching index using the native file-cache based strategy.
end
end
- local index = {}
+ index = {}
for i,c in ipairs(controllers) do
local module = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".")
f:writeall(util.get_bytecode(index))
f:close()
end
-
- return index
end
--- Create the dispatching tree from the index.
-- Build the index before if it does not exist yet.
function createtree()
- local ctx = context
- local tree = {nodes={}}
- local cache = setmetatable({}, {__mode="v"})
- local modi = {}
-
- if not ctx.index then
- ctx.index = createindex()
+ if not index then
+ createindex()
end
- ctx.tree = tree
- ctx.treecache = cache
+ local ctx = context
+ local tree = {nodes={}}
+ local modi = {}
+
+ ctx.treecache = setmetatable({}, {__mode="v"})
+ ctx.tree = tree
ctx.modifiers = modi
-- Load default translation
local scope = setmetatable({}, {__index = luci.dispatcher})
- for k, v in pairs(ctx.index) do
+ for k, v in pairs(index) do
scope._NAME = k
setfenv(v, scope)
- pcall(v)
+ v()
end
local function modisort(a,b)
for _, v in util.spairs(modi, modisort) do
scope._NAME = v.module
setfenv(v.func, scope)
- pcall(v.func)
+ v.func()
end
- return { index, tree, cache, modi }
+ return tree
end
--- Register a tree modifier.
projects / project / luci.git / blobdiff