michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-05 06:40:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move password check before modifying group

Browse Source
This commit is contained in:
Jamie Cameron
2009-10-15 14:14:33 -07:00
parent 83190ccc16
commit 5f67cd3637
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acl/save_user.cgi
View File

@@ -55,6 +55,16 @@ if (!$in{'old'} || $in{'old'} ne $in{'name'}) {
!$access{'minsize'} || $in{'minsize_def'} ||
$in{'minsize'} =~ /^\d+$/ || &error($text{'save_eminsize'});
# Validate password
if ($in{'pass_def'} == 0) {
$in{'pass'} =~ /:/ && &error($text{'save_ecolon'});
if (!$in{'temp'}) {
# Check password quality, unless this is a temp password
$perr = &check_password_restrictions($in{'name'}, $in{'pass'});
$perr && &error(&text('save_epass', $perr));
}
}
# Find logged-in webmin user
foreach $u (@ulist) {
if ($u->{'name'} eq $base_remote_user) {
@@ -234,14 +244,8 @@ else {
}
if ($in{'pass_def'} == 0) {
# New password
$in{'pass'} =~ /:/ && &error($text{'save_ecolon'});
$user{'pass'} = &encrypt_password($in{'pass'});
$user{'sync'} = 0;
if (!$in{'temp'}) {
# Check password quality, unless this is a temp password
$perr = &check_password_restrictions($in{'name'}, $in{'pass'});
$perr && &error(&text('save_epass', $perr));
}
}
elsif ($in{'pass_def'} == 1) {
# No change in password