luci-mod-system: remplement password change as client side view

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

2 files changed, 1 insertions, 72 deletions

diff --git a/modules/luci-mod-system/luasrc/controller/admin/system.lua b/modules/luci-mod-system/luasrc/controller/admin/system.lua
index be00a3f678..d1fda1d7c7 100644
--- a/modules/luci-mod-system/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-system/luasrc/controller/admin/system.lua
@@ -12,8 +12,7 @@ function index()
 	entry({"admin", "system", "ntp_restart"}, call("action_ntp_restart"), nil).leaf = true
 
 	entry({"admin", "system", "admin"}, firstchild(), _("Administration"), 2)
-	entry({"admin", "system", "admin", "password"}, template("admin_system/password"), _("Router Password"), 1)
-	entry({"admin", "system", "admin", "password", "json"}, post("action_password"))
+	entry({"admin", "system", "admin", "password"}, view("system/password"), _("Router Password"), 1)
 
 	if fs.access("/etc/config/dropbear") then
 		entry({"admin", "system", "admin", "dropbear"}, cbi("admin_system/dropbear"), _("SSH Access"), 2)
@@ -281,17 +280,6 @@ function action_reset()
 	http.redirect(luci.dispatcher.build_url('admin/system/flashops'))
 end
 
-function action_password()
-	local password = luci.http.formvalue("password")
-	if not password then
-		luci.http.status(400, "Bad Request")
-		return
-	end
-
-	luci.http.prepare_content("application/json")
-	luci.http.write_json({ code = luci.sys.user.setpasswd("root", password) })
-end
-
 function action_reboot()
 	luci.sys.reboot()
 end
diff --git a/modules/luci-mod-system/luasrc/view/admin_system/password.htm b/modules/luci-mod-system/luasrc/view/admin_system/password.htm
deleted file mode 100644
index 6ca02a83c1..0000000000
--- a/modules/luci-mod-system/luasrc/view/admin_system/password.htm
+++ /dev/null
@@ -1,59 +0,0 @@
-<%+header%>
-
-<input type="password" aria-hidden="true" style="position:absolute; left:-10000px" />
-
-<script type="text/javascript">
-function checkPassword() {
-	var pw1 = document.body.querySelector('[name="pw1"]');
-	var view  = document.getElementById("passstrength");
-
-	var strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
-	var mediumRegex = new RegExp("^(?=.{7,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))).*$", "g");
-	var enoughRegex = new RegExp("(?=.{6,}).*", "g");
-	if (false == enoughRegex.test(pw1.value)) {
-		view.innerHTML = '<%:Password strength%>: <span style="color:red"><%:More Characters%></span>';
-	} else if (strongRegex.test(pw1.value)) {
-		view.innerHTML = '<%:Password strength%>: <span style="color:green"><%:Strong%></span>';
-	} else if (mediumRegex.test(pw1.value)) {
-		view.innerHTML = '<%:Password strength%>: <span style="color:orange"><%:Medium%></span>';
-	} else {
-		view.innerHTML = '<%:Password strength%>: <span style="color:red"><%:Weak%></span>';
-	}
-	return true;
-}
-</script>
-
-<div class="cbi-map">
-	<h2><%:Router Password%></h2>
-
-	<div class="cbi-section-descr">
-		<%:Changes the administrator password for accessing the device%>
-	</div>
-
-	<div class="cbi-section-node">
-		<div class="cbi-value">
-			<label class="cbi-value-title" for="image"><%:Password%></label>
-			<div class="cbi-value-field">
-				<input type="password" name="pw1" onkeyup="checkPassword()"/><!--
-				--><button class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" aria-label="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'">∗</button>
-			</div>
-		</div>
-
-		<div class="cbi-value">
-			<label class="cbi-value-title" for="image"><%:Confirmation%></label>
-			<div class="cbi-value-field">
-				<input type="password" name="pw2" onkeydown="if (event.keyCode === 13) submitPassword(event)" /><!--
-				--><button class="cbi-button cbi-button-neutral" title="<%:Reveal/hide password%>" aria-label="<%:Reveal/hide password%>" onclick="var e = this.previousElementSibling; e.type = (e.type === 'password') ? 'text' : 'password'">∗</button>
-			<div id="passstrength" class="cbi-value-description"></div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<div class="cbi-page-actions">
-	<button class="btn cbi-button-apply" onclick="submitPassword(event)"><%:Save%></button>
-</div>
-
-<script type="application/javascript" src="<%=resource%>/view/system/password.js"></script>
-
-<%+footer%>