modules/admin-full: rework system menu area

1 files changed, 182 insertions, 153 deletions

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 123e005822..114acba669 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -18,6 +18,8 @@ module("luci.controller.admin.system", package.seeall)
 function index()
 	entry({"admin", "system"}, alias("admin", "system", "system"), _("System"), 30).index = true
 	entry({"admin", "system", "system"}, cbi("admin_system/system"), _("System"), 1)
+	entry({"admin", "system", "clock_status"}, call("action_clock_status"))
+
 	entry({"admin", "system", "admin"}, cbi("admin_system/admin"), _("Administration"), 2)
 
 	if nixio.fs.access("/bin/opkg") then
@@ -37,11 +39,30 @@ function index()
 		entry({"admin", "system", "leds"}, cbi("admin_system/leds"), _("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
 	end
 
-	entry({"admin", "system", "backup"}, call("action_backup"), _("Backup / Restore"), 70)
-	entry({"admin", "system", "upgrade"}, call("action_upgrade"), _("Flash Firmware"), 80)
+	entry({"admin", "system", "flashops"}, call("action_flashops"), _("Backup / Flash Firmware"), 70)
+	entry({"admin", "system", "flashops", "backupfiles"}, form("admin_system/backupfiles"))
+
 	entry({"admin", "system", "reboot"}, call("action_reboot"), _("Reboot"), 90)
 end
 
+function action_clock_status()
+	local set = tonumber(luci.http.formvalue("set"))
+	if set ~= nil and set > 0 then
+		local date = os.date("*t", set)
+		if date then
+			-- prevent session timeoutby updating mtime
+			nixio.fs.utimes(luci.sauth.sessionpath .. "/" .. luci.dispatcher.context.authsession, set, set)
+
+			luci.sys.call("date -s '%04d-%02d-%02d %02d:%02d:%02d'" %{
+				date.year, date.month, date.day, date.hour, date.min, date.sec
+			})
+		end
+	end
+
+	luci.http.prepare_content("application/json")
+	luci.http.write_json({ timestring = os.date("%c") })
+end
+
 function action_packages()
 	local ipkg = require("luci.model.ipkg")
 	local submit = luci.http.formvalue("submit")
@@ -120,16 +141,34 @@ function action_packages()
 	end
 
 
+	-- List state
+	local no_lists = true
+	local old_lists = false
+	local tmp = nixio.fs.dir("/var/opkg-lists/")
+	if tmp then
+		for tmp in tmp do
+			no_lists = false
+			tmp = nixio.fs.stat("/var/opkg-lists/"..tmp)
+			if tmp and tmp.mtime < (os.time() - (24 * 60 * 60)) then
+				old_lists = true
+				break
+			end
+		end
+	end
+
+
 	luci.template.render("admin_system/packages", {
-		display = display,
-		letter  = letter,
-		query   = query,
-		install = install,
-		remove  = remove,
-		update  = update,
-		upgrade = upgrade,
-		stdout  = table.concat(stdout, ""),
-		stderr  = table.concat(stderr, "")
+		display   = display,
+		letter    = letter,
+		query     = query,
+		install   = install,
+		remove    = remove,
+		update    = update,
+		upgrade   = upgrade,
+		no_lists  = no_lists,
+		old_lists = old_lists,
+		stdout    = table.concat(stdout, ""),
+		stderr    = table.concat(stderr, "")
 	})
 
 	-- Remove index cache
@@ -138,45 +177,83 @@ function action_packages()
 	end
 end
 
-function action_backup()
+function action_flashops()
 	local sys = require "luci.sys"
 	local fs  = require "luci.fs"
 
-	local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
+	local upgrade_avail = nixio.fs.access("/lib/upgrade/platform.sh")
+	local reset_avail   = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
+
 	local restore_cmd = "tar -xzC/ >/dev/null 2>&1"
 	local backup_cmd  = "tar -czT %s 2>/dev/null"
+	local image_tmp   = "/tmp/firmware.img"
+
+	local function image_supported()
+		-- XXX: yay...
+		return ( 0 == os.execute(
+			". /etc/functions.sh; " ..
+			"include /lib/upgrade; " ..
+			"platform_check_image %q >/dev/null"
+				% image_tmp
+		) )
+	end
+
+	local function image_checksum()
+		return (luci.sys.exec("md5sum %q" % image_tmp):match("^([^%s]+)"))
+	end
+
+	local function storage_size()
+		local size = 0
+		if nixio.fs.access("/proc/mtd") then
+			for l in io.lines("/proc/mtd") do
+				local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
+				if n == "linux" or n == "firmware" then
+					size = tonumber(s, 16)
+					break
+				end
+			end
+		elseif nixio.fs.access("/proc/partitions") then
+			for l in io.lines("/proc/partitions") do
+				local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
+				if b and n and not n:match('[0-9]') then
+					size = tonumber(b) * 1024
+					break
+				end
+			end
+		end
+		return size
+	end
+
 
-	local restore_fpi
+	local fp
 	luci.http.setfilehandler(
 		function(meta, chunk, eof)
-			if not restore_fpi then
-				restore_fpi = io.popen(restore_cmd, "w")
+			if not fp then
+				if meta and meta.name == "image" then
+					fp = io.open(image_tmp, "w")
+				else
+					fp = io.popen(restore_cmd, "w")
+				end
 			end
 			if chunk then
-				restore_fpi:write(chunk)
+				fp:write(chunk)
 			end
 			if eof then
-				restore_fpi:close()
+				fp:close()
 			end
 		end
 	)
 
-	local upload = luci.http.formvalue("archive")
-	local backup = luci.http.formvalue("backup")
-	local reset  = reset_avail and luci.http.formvalue("reset")
-
-	if upload and #upload > 0 then
-		luci.template.render("admin_system/applyreboot")
-		luci.sys.reboot()
-	elseif backup then
+	if luci.http.formvalue("backup") then
+		--
+		-- Assemble file list, generate backup
+		--
 		local filelist = "/tmp/luci-backup-list.%d" % os.time()
-
 		sys.call(
 			"( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' /etc/sysupgrade.conf " ..
 			"/lib/upgrade/keep.d/* 2>/dev/null) -type f 2>/dev/null; " ..
 			"opkg list-changed-conffiles ) | sort -u > %s" % filelist
 		)
-
 		if fs.access(filelist) then
 			local reader = ltn12_popen(backup_cmd:format(filelist))
 			luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
@@ -185,11 +262,66 @@ function action_backup()
 			luci.ltn12.pump.all(reader, luci.http.write)
 			fs.unlink(filelist)
 		end
-	elseif reset then
-		luci.template.render("admin_system/applyreboot")
-		luci.util.exec("mtd -r erase rootfs_data")
+	elseif luci.http.formvalue("restore") then
+		--
+		-- Unpack received .tar.gz
+		--
+		local upload = luci.http.formvalue("archive")
+		if upload and #upload > 0 then
+			luci.template.render("admin_system/applyreboot")
+			luci.sys.reboot()
+		end
+	elseif luci.http.formvalue("image") or luci.http.formvalue("step") then
+		--
+		-- Initiate firmware flash
+		--
+		local step = tonumber(luci.http.formvalue("step") or 1)
+		if step == 1 then
+			if image_supported() then
+				luci.template.render("admin_system/upgrade", {
+					checksum = image_checksum(),
+					storage  = storage_size(),
+					size     = nixio.fs.stat(image_tmp).size,
+					keep     = (not not luci.http.formvalue("keep"))
+				})
+			else
+				nixio.fs.unlink(image_tmp)
+				luci.template.render("admin_system/flashops", {
+					reset_avail   = reset_avail,
+					upgrade_avail = upgrade_avail,
+					image_invalid = true
+				})
+			end
+		--
+		-- Start sysupgrade flash
+		--
+		elseif step == 2 then
+			local keep = (luci.http.formvalue("keep") == "1") and "" or "-n"
+			luci.template.render("admin_system/applyreboot", {
+				title = luci.i18n.translate("Flashing..."),
+				msg   = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
+				addr  = (#keep > 0) and "192.168.1.1" or nil
+			})
+			fork_exec("killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
+		end
+	elseif reset_avail and luci.http.formvalue("reset") then
+		--
+		-- Reset system
+		--
+		luci.template.render("admin_system/applyreboot", {
+			title = luci.i18n.translate("Erasing..."),
+			msg   = luci.i18n.translate("The system is erasing the configuration partition now and will reboot itself when finished."),
+			addr  = "192.168.1.1"
+		})
+		fork_exec("killall dropbear uhttpd; sleep 1; mtd -r erase rootfs_data")
 	else
-		luci.template.render("admin_system/backup", {reset_avail = reset_avail})
+		--
+		-- Overview
+		--
+		luci.template.render("admin_system/flashops", {
+			reset_avail   = reset_avail,
+			upgrade_avail = upgrade_avail
+		})
 	end
 end
 
@@ -217,130 +349,27 @@ function action_reboot()
 	end
 end
 
-function action_upgrade()
-	require("luci.model.uci")
-
-	local tmpfile = "/tmp/firmware.img"
-
-	local function image_supported()
-		-- XXX: yay...
-		return ( 0 == os.execute(
-			". /etc/functions.sh; " ..
-			"include /lib/upgrade; " ..
-			"platform_check_image %q >/dev/null"
-				% tmpfile
-		) )
-	end
-
-	local function image_checksum()
-		return (luci.sys.exec("md5sum %q" % tmpfile):match("^([^%s]+)"))
-	end
-
-	local function storage_size()
-		local size = 0
-		if nixio.fs.access("/proc/mtd") then
-			for l in io.lines("/proc/mtd") do
-				local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
-				if n == "linux" then
-					size = tonumber(s, 16)
-					break
-				end
-			end
-		elseif nixio.fs.access("/proc/partitions") then
-			for l in io.lines("/proc/partitions") do
-				local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
-				if b and n and not n:match('[0-9]') then
-					size = tonumber(b) * 1024
-					break
-				end
-			end
-		end
-		return size
-	end
-
-
-	-- Install upload handler
-	local file
-	luci.http.setfilehandler(
-		function(meta, chunk, eof)
-			if not nixio.fs.access(tmpfile) and not file and chunk and #chunk > 0 then
-				file = io.open(tmpfile, "w")
-			end
-			if file and chunk then
-				file:write(chunk)
-			end
-			if file and eof then
-				file:close()
+function fork_exec(command)
+	local pid = nixio.fork()
+	if pid > 0 then
+		return
+	elseif pid == 0 then
+		-- change to root dir
+		nixio.chdir("/")
+
+		-- patch stdin, out, err to /dev/null
+		local null = nixio.open("/dev/null", "w+")
+		if null then
+			nixio.dup(null, nixio.stderr)
+			nixio.dup(null, nixio.stdout)
+			nixio.dup(null, nixio.stdin)
+			if null:fileno() > 2 then
+				null:close()
 			end
 		end
-	)
-
-
-	-- Determine state
-	local keep_avail   = true
-	local step         = tonumber(luci.http.formvalue("step") or 1)
-	local has_image    = nixio.fs.access(tmpfile)
-	local has_support  = image_supported()
-	local has_platform = nixio.fs.access("/lib/upgrade/platform.sh")
-	local has_upload   = luci.http.formvalue("image")
-
-	-- This does the actual flashing which is invoked inside an iframe
-	-- so don't produce meaningful errors here because the the
-	-- previous pages should arrange the stuff as required.
-	if step == 4 then
-		if has_platform and has_image and has_support then
-			-- Mimetype text/plain
-			luci.http.prepare_content("text/plain")
-			luci.http.write("Starting sysupgrade...\n")
-
-			io.flush()
-
-			-- Now invoke sysupgrade
-			local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
-			local flash = ltn12_popen("/sbin/sysupgrade %s %q" %{
-				keepcfg and "" or "-n", tmpfile
-			})
-
-			luci.ltn12.pump.all(flash, luci.http.write)
-		end
-
-
-	--
-	-- This is step 1-3, which does the user interaction and
-	-- image upload.
-	--
 
-	-- Step 1: file upload, error on unsupported image format
-	elseif not has_image or not has_support or step == 1 then
-		-- If there is an image but user has requested step 1
-		-- or type is not supported, then remove it.
-		if has_image then
-			nixio.fs.unlink(tmpfile)
-		end
-
-		luci.template.render("admin_system/upgrade", {
-			step=1,
-			bad_image=(has_image and not has_support or false),
-			keepavail=keep_avail,
-			supported=has_platform
-		} )
-
-	-- Step 2: present uploaded file, show checksum, confirmation
-	elseif step == 2 then
-		luci.template.render("admin_system/upgrade", {
-			step=2,
-			checksum=image_checksum(),
-			filesize=nixio.fs.stat(tmpfile).size,
-			flashsize=storage_size(),
-			keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
-		} )
-
-	-- Step 3: load iframe which calls the actual flash procedure
-	elseif step == 3 then
-		luci.template.render("admin_system/upgrade", {
-			step=3,
-			keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
-		} )
+		-- replace with target command
+		nixio.exec("/bin/sh", "-c", command)
 	end
 end