modules: Make luci-base sufficient to use luci apps

Per the discussion in https://github.com/openwrt/luci/issues/869, make
luci-base sufficient to login, logout, and review and apply or revert
uci changes.  This allows most luci-app-xxx to work without having
luci-mod-admin-full installed.

It has been tested with some apps and not luci-mod-admin-full, as well
as with luci-mod-admin-full (to make sure the usual case doesn't break).

Instead of creating a new module namespace (e.g. 'Base') we reduce the
opportunities for breakage by having luci-base take over the 'shell' of
the 'Administration' (admin/....) namespace.

Since admin is assumed by all current building LuCI components (including
Freifunk), this doesn't introduce the 'Administration' tab into any
situation where it would not already be present (but includes it where it
was before).

We also add a "Component not installed" page to avoid fatal errors and
backtrace when e.g. luci-mod-admin-full is not installed.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>

2 files changed, 191 insertions, 0 deletions

diff --git a/modules/luci-base/luasrc/controller/admin/index.lua b/modules/luci-base/luasrc/controller/admin/index.lua
new file mode 100644
index 0000000000..39e6e573b1
--- /dev/null
+++ b/modules/luci-base/luasrc/controller/admin/index.lua
@@ -0,0 +1,82 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Licensed to the public under the Apache License 2.0.
+
+module("luci.controller.admin.index", package.seeall)
+
+function index()
+	function toplevel_page(page, preflookup, preftarget)
+		if preflookup and preftarget then
+			if lookup(preflookup) then
+				page.target = preftarget
+			end
+		end
+
+		if not page.target then
+			page.target = firstchild()
+		end
+	end
+
+	local root = node()
+	if not root.target then
+		root.target = alias("admin")
+		root.index = true
+	end
+
+	local page   = node("admin")
+	page.title   = _("Administration")
+	page.order   = 10
+	page.sysauth = "root"
+	page.sysauth_authenticator = "htmlauth"
+	page.ucidata = true
+	page.index = true
+	toplevel_page(page, "admin/status/overview", alias("admin", "status"))
+
+	-- Empty menu tree to be populated by addons and modules
+
+	page = node("admin", "status")
+	page.title = _("Status")
+	page.order = 10
+	page.index = true
+	-- overview is from mod-admin-full
+	toplevel_page(page, "admin/status/overview", alias("admin", "status", "overview"))
+
+	page = node("admin", "system")
+	page.title = _("System")
+	page.order = 20
+	page.index = true
+	-- system/system is from mod-admin-full
+	toplevel_page(page, "admin/system/system", alias("admin", "system", "system")) 
+
+	-- Only used if applications add items
+	page = node("admin", "services")
+	page.title = _("Services")
+	page.order = 40
+	page.index = true
+	toplevel_page(page, false, false)
+
+	-- Even for mod-admin-full network just uses first submenu item as landing
+	page = node("admin", "network")
+	page.title = _("Network")
+	page.order = 50
+	page.index = true
+	toplevel_page(page, false, false)
+
+	-- Logout is last
+	entry({"admin", "logout"}, call("action_logout"), _("Logout"), 999)
+end
+
+function action_logout()
+	local dsp = require "luci.dispatcher"
+	local utl = require "luci.util"
+	local sid = dsp.context.authsession
+
+	if sid then
+		utl.ubus("session", "destroy", { ubus_rpc_session = sid })
+
+		luci.http.header("Set-Cookie", "sysauth=%s; expires=%s; path=%s/" %{
+			sid, 'Thu, 01 Jan 1970 01:00:00 GMT', dsp.build_url()
+		})
+	end
+
+	luci.http.redirect(dsp.build_url())
+end
diff --git a/modules/luci-base/luasrc/controller/admin/uci.lua b/modules/luci-base/luasrc/controller/admin/uci.lua
new file mode 100644
index 0000000000..1d955dd982
--- /dev/null
+++ b/modules/luci-base/luasrc/controller/admin/uci.lua
@@ -0,0 +1,109 @@
+-- Copyright 2008 Steven Barth <steven@midlink.org>
+-- Copyright 2010-2015 Jo-Philipp Wich <jow@openwrt.org>
+-- Licensed to the public under the Apache License 2.0.
+
+module("luci.controller.admin.uci", package.seeall)
+
+function index()
+	local redir = luci.http.formvalue("redir", true)
+		or table.concat(luci.dispatcher.context.request, "/")
+
+	entry({"admin", "uci"}, nil, _("Configuration"))
+	entry({"admin", "uci", "changes"}, post_on({ trigger_apply = true }, "action_changes"), _("Changes"), 40).query = {redir=redir}
+	entry({"admin", "uci", "revert"}, post("action_revert"), _("Revert"), 30).query = {redir=redir}
+
+	local node
+	local authen = function(checkpass, allowed_users)
+		return "root", luci.http.formvalue("sid")
+	end
+
+	node = entry({"admin", "uci", "apply_rollback"}, post("action_apply_rollback"), nil)
+	node.cors = true
+	node.sysauth_authenticator = authen
+
+	node = entry({"admin", "uci", "apply_unchecked"}, post("action_apply_unchecked"), nil)
+	node.cors = true
+	node.sysauth_authenticator = authen
+
+	node = entry({"admin", "uci", "confirm"}, call("action_confirm"), nil)
+	node.cors = true
+	node.sysauth = false
+end
+
+
+function action_changes()
+	local uci  = require "luci.model.uci"
+	local changes = uci:changes()
+
+	luci.template.render("admin_uci/changes", {
+		changes       = next(changes) and changes,
+		timeout       = timeout,
+		trigger_apply = luci.http.formvalue("trigger_apply") and true or false
+	})
+end
+
+function action_revert()
+	local uci = require "luci.model.uci"
+	local changes = uci:changes()
+
+	-- Collect files to be reverted
+	local r, tbl
+	for r, tbl in pairs(changes) do
+		uci:revert(r)
+	end
+
+	luci.template.render("admin_uci/revert", {
+		changes        = next(changes) and changes,
+		trigger_revert = true
+	})
+end
+
+
+local function ubus_state_to_http(errstr)
+	local map = {
+		["Invalid command"]   = 400,
+		["Invalid argument"]  = 400,
+		["Method not found"]  = 404,
+		["Entry not found"]   = 404,
+		["No data"]           = 204,
+		["Permission denied"] = 403,
+		["Timeout"]           = 504,
+		["Not supported"]     = 500,
+		["Unknown error"]     = 500,
+		["Connection failed"] = 503
+	}
+
+	local code = map[errstr] or 200
+	local msg  = errstr      or "OK"
+
+	luci.http.status(code, msg)
+
+	if code ~= 204 then
+		luci.http.prepare_content("text/plain")
+		luci.http.write(msg)
+	end
+end
+
+function action_apply_rollback()
+	local uci = require "luci.model.uci"
+	local token, errstr = uci:apply(true)
+	if token then
+		luci.http.prepare_content("application/json")
+		luci.http.write_json({ token = token })
+	else
+		ubus_state_to_http(errstr)
+	end
+end
+
+function action_apply_unchecked()
+	local uci = require "luci.model.uci"
+	local _, errstr = uci:apply(false)
+	ubus_state_to_http(errstr)
+end
+
+function action_confirm()
+	local uci = require "luci.model.uci"
+	local token = luci.http.formvalue("token")
+	local _, errstr = uci:confirm(token)
+	ubus_state_to_http(errstr)
+end