nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-luci-admin: fix password setting

Browse Source
This commit is contained in:
Matthias Schiffer 2017-01-20 17:00:36 +01:00
parent 70b116fd61
commit e7b434ef34
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
package/gluon-luci-admin/luasrc/usr/lib/lua/luci/model/cbi/admin/remote.lua
View File

@ -16,24 +16,12 @@ $Id$
local fs = require "nixio.fs"
local m = Map("system", translate("SSH keys"))
m.pageaction = false
m.template = "cbi/simpleform"
if fs.access("/etc/config/dropbear") then
local s = m:section(TypedSection, "_dummy1", nil,
translate("You can provide your SSH keys here (one per line):"))
s.addremove = false
s.anonymous = true
function s.cfgsections()
return { "_keys" }
end
local f_keys = SimpleForm('keys', translate("SSH keys"), translate("You can provide your SSH keys here (one per line):"))
f_keys.hidden = { submit_keys = '1' }
local keys
keys = s:option(TextValue, "_data", "")
keys = f_keys:field(TextValue, "keys", "")
keys.wrap = "off"
keys.rows = 5
keys.rmempty = true
@ -43,63 +31,59 @@ if fs.access("/etc/config/dropbear") then
end
function keys.write(self, section, value)
if value then
if not f_keys:formvalue('submit_keys') then return end
fs.writefile("/etc/dropbear/authorized_keys", value:gsub("\r\n", "\n"):trim() .. "\n")
end
end
function keys.remove(self, section)
if keys:formvalue("_keys") then
if not f_keys:formvalue('submit_keys') then return end
fs.remove("/etc/dropbear/authorized_keys")
end
end
end
local m2 = Map("system", translate("Password"))
m2.reset = false
m2.pageaction = false
m2.template = "cbi/simpleform"
local s = m2:section(TypedSection, "_dummy2", nil, translate(
local f_password = SimpleForm('password', translate("Password"),
translate(
"Alternatively, you can set a password to access you node. Please choose a secure password you don't use anywhere else.<br /><br />"
.. "If you set an empty password, login via password will be disabled. This is the default."))
.. "If you set an empty password, login via password will be disabled. This is the default."
)
)
f_password.hidden = { submit_password = '1' }
f_password.reset = false
s.addremove = false
s.anonymous = true
local pw1 = s:option(Value, "pw1", translate("Password"))
local pw1 = f_password:field(Value, "pw1", translate("Password"))
pw1.password = true
local pw2 = s:option(Value, "pw2", translate("Confirmation"))
pw2.password = true
function s.cfgsections()
return { "_pass" }
function pw1.cfgvalue()
return ''
end
function m2.on_commit(map)
local v1 = pw1:formvalue("_pass")
local v2 = pw2:formvalue("_pass")
local pw2 = f_password:field(Value, "pw2", translate("Confirmation"))
pw2.password = true
function pw2.cfgvalue()
return ''
end
if v1 and v2 then
if v1 == v2 then
if #v1 > 0 then
if luci.sys.user.setpasswd('root', v1) == 0 then
m2.message = translate("Password changed.")
function f_password:handle(state, data)
if not f_password:formvalue('submit_password') then return end
if data.pw1 ~= data.pw2 then
f_password.errmessage = translate("The password and the confirmation differ.")
return
end
if data.pw1 and #data.pw1 > 0 then
if luci.sys.user.setpasswd('root', data.pw1) == 0 then
f_password.message = translate("Password changed.")
else
m2.errmessage = translate("Unable to change the password.")
f_password.errmessage = translate("Unable to change the password.")
end
else
-- We don't check the return code here as the error 'password for root is already locked' is normal...
os.execute('passwd -l root >/dev/null')
m2.message = translate("Password removed.")
end
else
m2.errmessage = translate("The password and the confirmation differ.")
end
f_password.message = translate("Password removed.")
end
end
local c = Compound(m, m2)
local c = Compound(f_keys, f_password)
c.pageaction = false
return c