YunoHost/SSOwat
1
0
Fork 0
mirror of https://github.com/YunoHost/SSOwat.git synced 2024-09-03 20:06:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Simplify code thanks to change on password.py

Browse source
This commit is contained in:
ljf 2018-08-29 01:26:19 +02:00
parent 349d486cec
commit 7627101eb5
1 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
helpers.lua
View file

@ -609,20 +609,9 @@ function secure_cmd_password(cmd, password, start)
w_pwd:write("") w_pwd:write("")
w_pwd:close() w_pwd:close()
local r_pwd = io.open(tmp_file, 'r') local r_pwd = io.open(tmp_file, 'r')
local i = 0 text = r_pwd:read "*a"
local text = ""
for line in io.lines(tmp_file) do
i = i + 1
if i > start then
text = text..line.."\n"
end
end
if i > start then
text = text:sub(1, -2)
end
r_pwd:close() r_pwd:close()
os.remove(tmp_file) os.remove(tmp_file)
ngx.log(ngx.STDERR, text)
return text return text
end end
@ -656,19 +645,11 @@ function edit_user()
-- and the new password against the confirmation field's content -- and the new password against the confirmation field's content
if args.newpassword == args.confirm then if args.newpassword == args.confirm then
-- Check password validity -- Check password validity
local valid_result = secure_cmd_password("python /usr/lib/moulinette/yunohost/utils/password.py 2>&1 || echo ::ERROR::", args.newpassword, 4) local result_msg = secure_cmd_password("python /usr/lib/moulinette/yunohost/utils/password.py", args.newpassword)
-- We remove 4 lines due to a Warning message validation_error = true
local i = 0
local validation_error = nil
local result_msg = nil
for line in string.gmatch(valid_result, "[^\n]+") do if result_msg == 'password_advice' or result_msg == nil or result_msg == "" then
if i == 0 then validation_error = nil
result_msg = line
else
validation_error = line
end
i = i + 1
end end
if validation_error == nil then if validation_error == nil then
@ -888,7 +869,7 @@ end
-- hash the user password using sha-512 and using {CRYPT} to uses linux auth system -- hash the user password using sha-512 and using {CRYPT} to uses linux auth system
-- because ldap doesn't support anything stronger than sha1 -- because ldap doesn't support anything stronger than sha1
function hash_password(password) function hash_password(password)
local hashed_password = secure_cmd_password("mkpasswd --method=sha-512", password, 0) local hashed_password = secure_cmd_password("mkpasswd --method=sha-512", password)
hashed_password = "{CRYPT}"..hashed_password hashed_password = "{CRYPT}"..hashed_password
return hashed_password return hashed_password
end end