X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fdispatcher.lua;h=6445c124ed5ee0fc076bccad528f7577ddcf7290;hp=f69713a911ba0681236ecfa39295f64baf750623;hb=8f2a3f1dccee6a0b7ca99ac24458aa9c8987e131;hpb=57cfc2ee266076472c578e34f4ff664361672487

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index f69713a91..6445c124e 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -25,11 +25,12 @@ limitations under the License.
 ]]--
 
 --- LuCI web dispatcher.
-local fs = require "luci.fs"
+local fs = require "nixio.fs"
 local sys = require "luci.sys"
 local init = require "luci.init"
 local util = require "luci.util"
 local http = require "luci.http"
+local nixio = require "nixio", require "nixio.util"
 
 module("luci.dispatcher", package.seeall)
 context = util.threadlocal()
@@ -74,12 +75,17 @@ end
 -- @param message	Custom error message (optional)#
 -- @return			false
 function error500(message)
-	luci.http.status(500, "Internal Server Error")
-
-	require("luci.template")
-	if not luci.util.copcall(luci.template.render, "error500", {message=message}) then
+	luci.util.perror(message)
+	if not context.template_header_sent then
+		luci.http.status(500, "Internal Server Error")
 		luci.http.prepare_content("text/plain")
 		luci.http.write(message)
+	else
+		require("luci.template")
+		if not luci.util.copcall(luci.template.render, "error500", {message=message}) then
+			luci.http.prepare_content("text/plain")
+			luci.http.write(message)
+		end
 	end
 	return false
 end
@@ -102,21 +108,27 @@ end
 
 --- Dispatch an HTTP request.
 -- @param request	LuCI HTTP Request object
-function httpdispatch(request)
+function httpdispatch(request, prefix)
 	luci.http.context.request = request
-	context.request = {}
-	local pathinfo = request:getenv("PATH_INFO") or ""
 
-	for node in pathinfo:gmatch("[^/]+") do
-		table.insert(context.request, node)
+	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
 
-	local stat, err = util.copcall(dispatch, context.request)
-	if not stat then
-		luci.util.perror(err)
-		error500(err)
+	for node in pathinfo:gmatch("[^/]+") do
+		r[#r+1] = node
 	end
 
+	local stat, err = util.coxpcall(function()
+		dispatch(context.request)
+	end, error500)
+
 	luci.http.close()
 
 	--context._disable_memtrace()
@@ -125,12 +137,27 @@ end
 --- Dispatches a LuCI virtual path.
 -- @param request	Virtual path
 function dispatch(request)
-	--context._disable_memtrace = require "luci.debug".trap_memtrace()
+	--context._disable_memtrace = require "luci.debug".trap_memtrace("l")
 	local ctx = context
 	ctx.path = request
 	ctx.urltoken   = ctx.urltoken or {}
 
-	require "luci.i18n".setlanguage(require "luci.config".main.lang)
+	local conf = require "luci.config"
+	assert(conf.main,
+		"/etc/config/luci seems to be corrupt, unable to find section 'main'")
+
+	local lang = conf.main.lang
+	if lang == "auto" then
+		local aclang = http.getenv("HTTP_ACCEPT_LANGUAGE") or ""
+		for lpat in aclang:gmatch("[%w-]+") do
+			lpat = lpat and lpat:gsub("-", "_")
+			if conf.languages[lpat] then
+				lang = lpat
+				break
+			end
+		end
+        end
+	require "luci.i18n".setlanguage(lang)
 
 	local c = ctx.tree
 	local stat
@@ -146,6 +173,7 @@ function dispatch(request)
 	local t = true
 	local token = ctx.urltoken
 	local preq = {}
+	local freq = {}
 
 	for i, s in ipairs(request) do
 		local tkey, tval
@@ -158,6 +186,7 @@ function dispatch(request)
 		else
 			t = false
 			preq[#preq+1] = s
+			freq[#freq+1] = s
 			c = c.nodes[s]
 			n = i
 			if not c then
@@ -174,10 +203,12 @@ function dispatch(request)
 
 	if c and c.leaf then
 		for j=n+1, #request do
-			table.insert(args, request[j])
+			args[#args+1] = request[j]
+			freq[#freq+1] = request[j]
 		end
 	end
 
+	ctx.requestpath = ctx.requestpath or freq
 	ctx.path = preq
 
 	if track.i18n then
@@ -199,23 +230,24 @@ function dispatch(request)
 			assert(media, "No valid theme found")
 		end
 
-		local viewns = setmetatable({}, {__index=function(table, key)
+		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;
+		   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()
 			elseif key == "REQUEST_URI" then
-				return build_url(unpack(ctx.requested.path))
+				return build_url(unpack(ctx.requestpath))
 			else
 				return rawget(table, key) or _G[key]
 			end
 		end})
-		tpl.context.viewns = viewns
-		viewns.write       = luci.http.write
-		viewns.include     = function(name) tpl.Template(name):render(getfenv(2)) end
-		viewns.translate   = function(...) return require("luci.i18n").translate(...) end
-		viewns.striptags   = util.striptags
-		viewns.media       = media
-		viewns.theme       = fs.basename(media)
-		viewns.resource    = luci.config.main.resourcebase
 	end
 
 	track.dependent = (track.dependent ~= false)
@@ -234,7 +266,7 @@ function dispatch(request)
 		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
 
@@ -242,10 +274,18 @@ function dispatch(request)
 		local user
 
 		if sdat then
-			sdat = loadstring(sdat)()
+			sdat = loadstring(sdat)
+			setfenv(sdat, {})
+			sdat = sdat()
 			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
@@ -267,6 +307,7 @@ function dispatch(request)
 					end
 					luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())
 					ctx.authsession = sid
+					ctx.authuser = user
 				end
 			else
 				luci.http.status(403, "Forbidden")
@@ -274,6 +315,7 @@ function dispatch(request)
 			end
 		else
 			ctx.authsession = sess
+			ctx.authuser = user
 		end
 	end
 
@@ -285,7 +327,16 @@ function dispatch(request)
 		luci.sys.process.setuser(track.setuser)
 	end
 
-	if c and (c.index or type(c.target) == "function") then
+	local target = nil
+	if c then
+		if type(c.target) == "function" then
+			target = c.target
+		elseif type(c.target) == "table" then
+			target = c.target.target
+		end
+	end
+
+	if c and (c.index or type(target) == "function") then
 		ctx.dispatched = c
 		ctx.requested = ctx.requested or ctx.dispatched
 	end
@@ -298,9 +349,9 @@ function dispatch(request)
 		end
 	end
 
-	if c and type(c.target) == "function" then
+	if type(target) == "function" then
 		util.copcall(function()
-			local oldenv = getfenv(c.target)
+			local oldenv = getfenv(target)
 			local module = require(c.module)
 			local env = setmetatable({}, {__index=
 
@@ -308,10 +359,14 @@ function dispatch(request)
 				return rawget(tbl, key) or module[key] or oldenv[key]
 			end})
 
-			setfenv(c.target, env)
+			setfenv(target, env)
 		end)
 
-		c.target(unpack(args))
+		if type(c.target) == "table" then
+			target(c.target, unpack(args))
+		else
+			target(unpack(args))
+		end
 	else
 		error404()
 	end
@@ -320,7 +375,7 @@ end
 --- Generate the dispatching index using the best possible strategy.
 function createindex()
 	local path = luci.util.libpath() .. "/controller/"
-	local suff = ".lua"
+	local suff = { ".lua", ".lua.gz" }
 
 	if luci.util.copcall(require, "luci.fastindex") then
 		createindex_fastindex(path, suff)
@@ -331,14 +386,16 @@ end
 
 --- Generate the dispatching index using the fastindex C-indexer.
 -- @param path		Controller base directory
--- @param suffix	Controller file suffix
-function createindex_fastindex(path, suffix)
+-- @param suffixes	Controller file suffixes
+function createindex_fastindex(path, suffixes)
 	index = {}
 
 	if not fi then
 		fi = luci.fastindex.new("index")
-		fi.add(path .. "*" .. suffix)
-		fi.add(path .. "*/*" .. suffix)
+		for _, suffix in ipairs(suffixes) do
+			fi.add(path .. "*" .. suffix)
+			fi.add(path .. "*/*" .. suffix)
+		end
 	end
 	fi.scan()
 
@@ -349,26 +406,27 @@ end
 
 --- Generate the dispatching index using the native file-cache based strategy.
 -- @param path		Controller base directory
--- @param suffix	Controller file suffix
-function createindex_plain(path, suffix)
-	local controllers = util.combine(
-		luci.fs.glob(path .. "*" .. suffix) or {},
-		luci.fs.glob(path .. "*/*" .. suffix) or {}
-	)
+-- @param suffixes	Controller file suffixes
+function createindex_plain(path, suffixes)
+	local controllers = { }
+	for _, suffix in ipairs(suffixes) do
+		nixio.util.consume((fs.glob(path .. "*" .. suffix)), controllers)
+		nixio.util.consume((fs.glob(path .. "*/*" .. suffix)), controllers)
+	end
 
 	if indexcache then
-		local cachedate = fs.mtime(indexcache)
+		local cachedate = fs.stat(indexcache, "mtime")
 		if cachedate then
 			local realdate = 0
 			for _, obj in ipairs(controllers) do
-				local omtime = fs.mtime(path .. "/" .. obj)
+				local omtime = fs.stat(path .. "/" .. obj, "mtime")
 				realdate = (omtime and omtime > realdate) and omtime or realdate
 			end
 
 			if cachedate > realdate then
 				assert(
 					sys.process.info("uid") == fs.stat(indexcache, "uid")
-					and fs.stat(indexcache, "mode") == "rw-------",
+					and fs.stat(indexcache, "modestr") == "rw-------",
 					"Fatal: Indexcache is not sane!"
 				)
 
@@ -381,7 +439,11 @@ function createindex_plain(path, suffix)
 	index = {}
 
 	for i,c in ipairs(controllers) do
-		local module = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
+		local module = "luci.controller." .. c:sub(#path+1, #c):gsub("/", ".")
+		for _, suffix in ipairs(suffixes) do
+			module = module:gsub(suffix.."$", "")
+		end
+
 		local mod = require(module)
 		local idx = mod.index
 
@@ -391,8 +453,9 @@ function createindex_plain(path, suffix)
 	end
 
 	if indexcache then
-		fs.writefile(indexcache, util.get_bytecode(index))
-		fs.chmod(indexcache, "a-rwx,u+rw")
+		local f = nixio.open(indexcache, "w", 600)
+		f:writeall(util.get_bytecode(index))
+		f:close()
 	end
 end
 
@@ -483,6 +546,14 @@ function entry(path, target, title, order)
 	return c
 end
 
+--- Fetch or create a dispatching node without setting the target module or
+-- enabling the node.
+-- @param	...		Virtual path
+-- @return			Dispatching tree node
+function get(...)
+	return _create_node({...})
+end
+
 --- Fetch or create a new dispatching node.
 -- @param	...		Virtual path
 -- @return			Dispatching tree node
@@ -558,110 +629,140 @@ function rewrite(n, ...)
 	end
 end
 
+
+local function _call(self, ...)
+	if #self.argv > 0 then
+		return getfenv()[self.name](unpack(self.argv), ...)
+	else
+		return getfenv()[self.name](...)
+	end
+end
+
 --- Create a function-call dispatching target.
 -- @param	name	Target function of local controller
 -- @param	...		Additional parameters passed to the function
 function call(name, ...)
-	local argv = {...}
-	return function(...)
-		if #argv > 0 then 
-			return getfenv()[name](unpack(argv), ...)
-		else
-			return getfenv()[name](...)
-		end
-	end
+	return {type = "call", argv = {...}, name = name, target = _call}
+end
+
+
+local _template = function(self, ...)
+	require "luci.template".render(self.view)
 end
 
 --- Create a template render dispatching target.
 -- @param	name	Template to be rendered
 function template(name)
-	return function()
-		require("luci.template")
-		luci.template.render(name)
-	end
+	return {type = "template", view = name, target = _template}
 end
 
---- Create a CBI model dispatching target.
--- @param	model	CBI model to be rendered
-function cbi(model, config)
-	config = config or {}
-	return function(...)
-		require("luci.cbi")
-		require("luci.template")
-		local http = require "luci.http"
 
-		maps = luci.cbi.load(model, ...)
+local function _cbi(self, ...)
+	local cbi = require "luci.cbi"
+	local tpl = require "luci.template"
+	local http = require "luci.http"
 
-		local state = nil
+	local config = self.config or {}
+	local maps = cbi.load(self.model, ...)
 
-		for i, res in ipairs(maps) do
-			if config.autoapply then
-				res.autoapply = config.autoapply
-			end
-			local cstate = res:parse()
-			if not state or cstate < state then
-				state = cstate
-			end
-		end
+	local state = nil
 
-		if config.on_valid_to and state and state > 0 and state < 2 then
-			luci.http.redirect(config.on_valid_to)
-			return
+	for i, res in ipairs(maps) do
+		res.flow = config
+		local cstate = res:parse()
+		if cstate and (not state or cstate < state) then
+			state = cstate
 		end
+	end
 
-		if config.on_changed_to and state and state > 1 then
-			luci.http.redirect(config.on_changed_to)
-			return
-		end
+	local function _resolve_path(path)
+		return type(path) == "table" and build_url(unpack(path)) or path
+	end
 
-		if config.on_success_to and state and state > 0 then
-			luci.http.redirect(config.on_success_to)
-			return
-		end
+	if config.on_valid_to and state and state > 0 and state < 2 then
+		http.redirect(_resolve_path(config.on_valid_to))
+		return
+	end
 
-		if config.state_handler then
-			if not config.state_handler(state, maps) then
-				return
-			end
+	if config.on_changed_to and state and state > 1 then
+		http.redirect(_resolve_path(config.on_changed_to))
+		return
+	end
+
+	if config.on_success_to and state and state > 0 then
+		http.redirect(_resolve_path(config.on_success_to))
+		return
+	end
+
+	if config.state_handler then
+		if not config.state_handler(state, maps) then
+			return
 		end
+	end
 
-		local pageaction = true
-		http.header("X-CBI-State", state or 0)
-		luci.template.render("cbi/header", {state = state})
-		for i, res in ipairs(maps) do
-			res:render()
-			if res.pageaction == false then
-				pageaction = false
-			end
+	local pageaction = true
+	http.header("X-CBI-State", state or 0)
+	if not config.noheader then
+		tpl.render("cbi/header", {state = state})
+	end
+	for i, res in ipairs(maps) do
+		res:render()
+		if res.pageaction == false then
+			pageaction = false
 		end
-		luci.template.render("cbi/footer", {pageaction=pageaction, state = state, autoapply = config.autoapply})
+	end
+	if not config.nofooter then
+		tpl.render("cbi/footer", {flow = config, pageaction=pageaction, state = state, autoapply = config.autoapply})
 	end
 end
 
---- Create a CBI form model dispatching target.
--- @param	model	CBI form model tpo be rendered
-function form(model)
-	return function(...)
-		require("luci.cbi")
-		require("luci.template")
-		local http = require "luci.http"
+--- Create a CBI model dispatching target.
+-- @param	model	CBI model to be rendered
+function cbi(model, config)
+	return {type = "cbi", config = config, model = model, target = _cbi}
+end
 
-		maps = luci.cbi.load(model, ...)
 
-		local state = nil
+local function _arcombine(self, ...)
+	local argv = {...}
+	local target = #argv > 0 and self.targets[2] or self.targets[1]
+	setfenv(target.target, self.env)
+	target:target(unpack(argv))
+end
 
-		for i, res in ipairs(maps) do
-			local cstate = res:parse()
-			if not state or cstate < state then
-				state = cstate
-			end
-		end
+--- Create a combined dispatching target for non argv and argv requests.
+-- @param trg1	Overview Target
+-- @param trg2	Detail Target
+function arcombine(trg1, trg2)
+	return {type = "arcombine", env = getfenv(), target = _arcombine, targets = {trg1, trg2}}
+end
+
+
+local function _form(self, ...)
+	local cbi = require "luci.cbi"
+	local tpl = require "luci.template"
+	local http = require "luci.http"
 
-		http.header("X-CBI-State", state or 0)
-		luci.template.render("header")
-		for i, res in ipairs(maps) do
-			res:render()
+	local maps = luci.cbi.load(self.model, ...)
+	local state = nil
+
+	for i, res in ipairs(maps) do
+		local cstate = res:parse()
+		if cstate and (not state or cstate < state) then
+			state = cstate
 		end
-		luci.template.render("footer")
 	end
+
+	http.header("X-CBI-State", state or 0)
+	tpl.render("header")
+	for i, res in ipairs(maps) do
+		res:render()
+	end
+	tpl.render("footer")
+end
+
+--- Create a CBI form model dispatching target.
+-- @param	model	CBI form model tpo be rendered
+function form(model)
+	return {type = "cbi", model = model, target = _form}
 end