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] Validate password as configured

Browse source
This commit is contained in:
ljf 2018-08-28 21:33:19 +02:00
parent 6e1e1e10ff
commit ab8b040174
2 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
helpers.lua
View file

@ -626,6 +626,13 @@ function edit_user()
then then
-- 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
local validatepw = io.popen("python /usr/lib/moulinette/yunohost/utils/password.py '" ..args.newpassword:gsub("'", "'\\''").."' 2>&1 || echo ::ERROR::", 'r')
local validation = validatepw:read()
local validation_error = validatepw:read()
validatepw:close()
if validation_error == nil then
local dn = conf["ldap_identifier"].."="..user..","..conf["ldap_group"] local dn = conf["ldap_identifier"].."="..user..","..conf["ldap_group"]
-- Open the LDAP connection -- Open the LDAP connection
@ -635,7 +642,11 @@ function edit_user()
-- Modify the LDAP information -- Modify the LDAP information
if ldap:modify(dn, {'=', userPassword = password }) then if ldap:modify(dn, {'=', userPassword = password }) then
if validation == nil then
flash("win", t("password_changed")) flash("win", t("password_changed"))
else
flash("win", t(validation))
end
-- Reset the password cache -- Reset the password cache
cache:set(user.."-password", args.newpassword, conf["session_timeout"]) cache:set(user.."-password", args.newpassword, conf["session_timeout"])
@ -643,6 +654,9 @@ function edit_user()
else else
flash("fail", t("password_changed_error")) flash("fail", t("password_changed_error"))
end end
else
flash("fail", t(validation))
end
else else
flash("fail", t("password_not_match")) flash("fail", t("password_not_match"))
end end

9
portal/locales/en.json
View file

@ -22,6 +22,15 @@
"password_changed": "Password successfully changed", "password_changed": "Password successfully changed",
"password_changed_error": "An error occurred on password changing", "password_changed_error": "An error occurred on password changing",
"password_not_match": "New passwords don't match", "password_not_match": "New passwords don't match",
"password_too_simple_1": "Password needs to be at least 6 characters long",
"password_too_simple_2": "Password needs to be at least 8 characters long and contains digit, upper and lower characters",
"password_too_simple_3": "Password needs to be at least 8 characters long and contains digit, upper, lower and special characters",
"password_too_simple_4": "Password needs to be at least 12 characters long and contains digit, upper, lower and special characters",
"password_listed_1": "This password is in a well known list. Please make it unique. Password needs to be at least 6 characters long",
"password_listed_2": "This password is in a well known list. Please make it unique. Password needs to be at least 8 characters long and contains digit, upper and lower characters",
"password_listed_3": "This password is in a well known list. Please make it unique. Password needs to be at least 8 characters long and contains digit, upper, lower and special characters",
"password_listed_4": "This password is in a well known list. Please make it unique. Password needs to be at least 12 characters long and contains digit, upper, lower and special characters",
"password_advice": "Password successfully changed. Note: to improve your password make it with at least 8 characters and put digits, upper, lower and special characters",
"wrong_current_password": "Current password is wrong", "wrong_current_password": "Current password is wrong",
"invalid_mail": "Invalid mail address", "invalid_mail": "Invalid mail address",
"invalid_domain": "Invalid domain in", "invalid_domain": "Invalid domain in",