X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fdispatcher.lua;h=28c460858d65be9d54a90f084bf53bac75656b99;hp=8c3320b0fe8736f5ea5c40631120357beabae145;hb=8055a5e18399be474ea4ed8f67cca3010b9a6f30;hpb=97743c13872fc3a650ff133cd0e2e26da23e3f99

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 8c3320b0f..28c460858 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -34,6 +34,9 @@ local nixio = require "nixio", require "nixio.util"
 
 module("luci.dispatcher", package.seeall)
 context = util.threadlocal()
+uci = require "luci.model.uci"
+i18n = require "luci.i18n"
+_M.fs = fs
 
 authenticator = {}
 
@@ -49,11 +52,25 @@ local fi
 -- @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
-	return sn .. ((#path > 0) and "/" .. table.concat(path, "/") or "")
+
+	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 table.concat(url, "")
 end
 
 --- Send a 404 error code and render the "error404" template if available.
@@ -108,17 +125,25 @@ end
 
 --- 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()
@@ -128,7 +153,7 @@ end
 
 --- 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
@@ -138,7 +163,7 @@ function dispatch(request, ext_tree)
 	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
@@ -148,17 +173,15 @@ function dispatch(request, ext_tree)
 				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
@@ -172,7 +195,7 @@ function dispatch(request, ext_tree)
 	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
@@ -202,7 +225,7 @@ function dispatch(request, ext_tree)
 		end
 	end
 
-	ctx.requestpath = freq
+	ctx.requestpath = ctx.requestpath or freq
 	ctx.path = preq
 
 	if track.i18n then
@@ -213,8 +236,7 @@ function dispatch(request, ext_tree)
 	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,
@@ -226,13 +248,15 @@ function dispatch(request, ext_tree)
 		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;
+		   export      = function(k, v) if tpl.context.viewns[k] == nil then tpl.context.viewns[k] = v end end;
+		   striptags   = util.striptags;
+		   pcdata      = util.pcdata;
+		   media       = media;
+		   theme       = fs.basename(media);
+		   resource    = luci.config.main.resourcebase
 		}, {__index=function(table, key)
 			if key == "controller" then
 				return build_url()
@@ -260,7 +284,7 @@ function dispatch(request, ext_tree)
 		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
 
@@ -274,6 +298,12 @@ function dispatch(request, ext_tree)
 			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
@@ -295,6 +325,7 @@ function dispatch(request, ext_tree)
 					end
 					luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())
 					ctx.authsession = sid
+					ctx.authuser = user
 				end
 			else
 				luci.http.status(403, "Forbidden")
@@ -302,6 +333,7 @@ function dispatch(request, ext_tree)
 			end
 		else
 			ctx.authsession = sess
+			ctx.authuser = user
 		end
 	end
 
@@ -364,9 +396,9 @@ function createindex()
 	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
 
@@ -374,7 +406,7 @@ 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")
@@ -388,8 +420,6 @@ function createindex_fastindex(path, suffixes)
 	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.
@@ -424,19 +454,19 @@ function createindex_plain(path, suffixes)
 		end
 	end
 
-	local index = {}
+	index = {}
 
 	for i,c in ipairs(controllers) do
-		local module = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".")
+		local modname = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".")
 		for _, suffix in ipairs(suffixes) do
-			module = module:gsub(suffix.."$", "")
+			modname = modname:gsub(suffix.."$", "")
 		end
 
-		local mod = require(module)
+		local mod = require(modname)
 		local idx = mod.index
 
 		if type(idx) == "function" then
-			index[module] = idx
+			index[modname] = idx
 		end
 	end
 
@@ -445,35 +475,32 @@ function createindex_plain(path, suffixes)
 		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
-	require "luci.i18n".loadc("default")
+	require "luci.i18n".loadc("base")
 
 	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)
@@ -483,10 +510,10 @@ function createtree()
 	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.
@@ -691,19 +718,60 @@ local function _cbi(self, ...)
 		end
 	end
 
-	local pageaction = true
 	http.header("X-CBI-State", state or 0)
+
 	if not config.noheader then
 		tpl.render("cbi/header", {state = state})
 	end
+
+	local redirect
+	local messages
+	local applymap   = false
+	local pageaction = true
+	local parsechain = { }
+
 	for i, res in ipairs(maps) do
-		res:render()
+		if res.apply_needed and res.parsechain then
+			local c
+			for _, c in ipairs(res.parsechain) do
+				parsechain[#parsechain+1] = c
+			end
+			applymap = true
+		end
+
+		if res.redirect then
+			redirect = redirect or res.redirect
+		end
+
 		if res.pageaction == false then
 			pageaction = false
 		end
+
+		if res.message then
+			messages = messages or { }
+			messages[#messages+1] = res.message
+		end
 	end
+
+	for i, res in ipairs(maps) do
+		res:render({
+			firstmap   = (i == 1),
+			applymap   = applymap,
+			redirect   = redirect,
+			messages   = messages,
+			pageaction = pageaction,
+			parsechain = parsechain
+		})
+	end
+
 	if not config.nofooter then
-		tpl.render("cbi/footer", {flow = config, pageaction=pageaction, state = state, autoapply = config.autoapply})
+		tpl.render("cbi/footer", {
+			flow       = config,
+			pageaction = pageaction,
+			redirect   = redirect,
+			state      = state,
+			autoapply  = config.autoapply
+		})
 	end
 end