X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fweb%2Fluasrc%2Fdispatcher.lua;h=5110209aacb21e0ab6781d61b49b016ebe7bce1e;hp=cae5492f60994f4218220cdac3a8cee108791db2;hb=ab18c3ba1006db94df57c310da97b5ddb07991ad;hpb=a4fcc13388f2795b83921d1f0bd85b4d1d49ac7e

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index cae5492f6..5110209aa 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -32,7 +32,7 @@ local util = require "luci.util"
 local http = require "luci.http"
 
 module("luci.dispatcher", package.seeall)
-context = luci.util.threadlocal()
+context = util.threadlocal()
 
 authenticator = {}
 
@@ -47,7 +47,12 @@ local fi
 -- @param ...	Virtual path
 -- @return 		Relative URL
 function build_url(...)
-	return luci.http.getenv("SCRIPT_NAME") .. "/" .. table.concat(arg, "/")
+	local path = {...}
+	local sn = http.getenv("SCRIPT_NAME") or ""
+	for k, v in pairs(context.urltoken) do
+		sn = sn .. "/;" .. k .. "=" .. http.urlencode(v)
+	end
+	return sn .. ((#path > 0) and "/" .. table.concat(path, "/") or "")
 end
 
 --- Send a 404 error code and render the "error404" template if available.
@@ -100,7 +105,7 @@ end
 function httpdispatch(request)
 	luci.http.context.request = request
 	context.request = {}
-	local pathinfo = request:getenv("PATH_INFO") or ""
+	local pathinfo = http.urldecode(request:getenv("PATH_INFO") or "", true)
 
 	for node in pathinfo:gmatch("[^/]+") do
 		table.insert(context.request, node)
@@ -123,8 +128,21 @@ function dispatch(request)
 	--context._disable_memtrace = require "luci.debug".trap_memtrace()
 	local ctx = context
 	ctx.path = request
-
-	require "luci.i18n".setlanguage(require "luci.config".main.lang)
+	ctx.urltoken   = ctx.urltoken or {}
+
+	local conf = require "luci.config"
+	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
@@ -137,27 +155,47 @@ function dispatch(request)
 	ctx.args = args
 	ctx.requestargs = ctx.requestargs or args
 	local n
+	local t = true
+	local token = ctx.urltoken
+	local preq = {}
+	local freq = {}
 
 	for i, s in ipairs(request) do
-		c = c.nodes[s]
-		n = i
-		if not c then
-			break
+		local tkey, tval
+		if t then
+			tkey, tval = s:match(";(%w+)=(.*)")
 		end
 
-		util.update(track, c)
+		if tkey then
+			token[tkey] = tval
+		else
+			t = false
+			preq[#preq+1] = s
+			freq[#freq+1] = s
+			c = c.nodes[s]
+			n = i
+			if not c then
+				break
+			end
 
-		if c.leaf then
-			break
+			util.update(track, c)
+
+			if c.leaf then
+				break
+			end
 		end
 	end
 
 	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 = freq
+	ctx.path = preq
+
 	if track.i18n then
 		require("luci.i18n").loadc(track.i18n)
 	end
@@ -177,17 +215,23 @@ function dispatch(request)
 			assert(media, "No valid theme found")
 		end
 
-		local viewns = setmetatable({}, {__index=_G})
+		local viewns = setmetatable({}, {__index=function(table, key)
+			if key == "controller" then
+				return build_url()
+			elseif key == "REQUEST_URI" then
+				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.controller  = luci.http.getenv("SCRIPT_NAME")
 		viewns.media       = media
 		viewns.theme       = fs.basename(media)
 		viewns.resource    = luci.config.main.resourcebase
-		viewns.REQUEST_URI = (luci.http.getenv("SCRIPT_NAME") or "") .. (luci.http.getenv("PATH_INFO") or "")
 	end
 
 	track.dependent = (track.dependent ~= false)
@@ -202,27 +246,50 @@ function dispatch(request)
 
 		local def  = (type(track.sysauth) == "string") and track.sysauth
 		local accs = def and {track.sysauth} or track.sysauth
-		local sess = ctx.authsession or luci.http.getcookie("sysauth")
-		sess = sess and sess:match("^[A-F0-9]+$")
-		local user = sauth.read(sess)
+		local sess = ctx.authsession
+		local verifytoken = false
+		if not sess then
+			sess = luci.http.getcookie("sysauth")
+			sess = sess and sess:match("^[A-F0-9]+$")
+			verifytoken = true
+		end
+
+		local sdat = sauth.read(sess)
+		local user
+
+		if sdat then
+			sdat = loadstring(sdat)()
+			if not verifytoken or ctx.urltoken.stok == sdat.token then
+				user = sdat.user
+			end
+		end
 
 		if not util.contains(accs, user) then
 			if authen then
+				ctx.urltoken.stok = nil
 				local user, sess = authen(luci.sys.user.checkpasswd, accs, def)
 				if not user or not util.contains(accs, user) then
 					return
 				else
 					local sid = sess or luci.sys.uniqueid(16)
-					luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path=/")
 					if not sess then
-						sauth.write(sid, user)
+						local token = luci.sys.uniqueid(16)
+						sauth.write(sid, util.get_bytecode({
+							user=user,
+							token=token,
+							secret=luci.sys.uniqueid(16)
+						}))
+						ctx.urltoken.stok = token
 					end
+					luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())
 					ctx.authsession = sid
 				end
 			else
 				luci.http.status(403, "Forbidden")
 				return
 			end
+		else
+			ctx.authsession = sess
 		end
 	end
 
@@ -234,7 +301,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
@@ -247,9 +323,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=
 
@@ -257,10 +333,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
@@ -507,110 +587,134 @@ 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
+		if config.autoapply then
+			res.autoapply = config.autoapply
 		end
-
-		if config.on_changed_to and state and state > 1 then
-			luci.http.redirect(config.on_changed_to)
-			return
+		local cstate = res:parse()
+		if not state or cstate < state then
+			state = cstate
 		end
+	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(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(config.on_changed_to)
+		return
+	end
+
+	if config.on_success_to and state and state > 0 then
+		http.redirect(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)
+	tpl.render("cbi/header", {state = state})
+	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
+	tpl.render("cbi/footer", {pageaction=pageaction, state = state, autoapply = config.autoapply})
 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
 
-		http.header("X-CBI-State", state or 0)
-		luci.template.render("header")
-		for i, res in ipairs(maps) do
-			res:render()
+
+local function _form(self, ...)
+	local cbi = require "luci.cbi"
+	local tpl = require "luci.template"
+	local http = require "luci.http"
+
+	local maps = luci.cbi.load(self.model, ...)
+	local state = nil
+
+	for i, res in ipairs(maps) do
+		local cstate = res:parse()
+		if 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