VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-23 00:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support to reset password for Virtualmin mail users

Browse Source
This commit is contained in:
Ilia Ross
2025-05-31 23:40:39 +03:00
parent c2c33130ab
commit e5f67a2394
3 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
forgot.cgi
View File

@ -26,9 +26,33 @@ time() - $link{'time'} > 60*$timeout &&
# Get the Webmin user
&foreign_require("acl");
my ($wuser) = grep { $_->{'name'} eq $link{'user'} } &acl::list_users();
$wuser || &error(&text('forgot_euser2',
# Get the Virtualmin mail Unix user if Webmin user is not found
my ($muser, $muserdom);
if (!$wuser && $link{'muser'}) {
# Probably Virtualmin mail user, so try to find it
&foreign_require("virtual-server");
foreach my $d (&virtual_server::list_domains()) {
my @users =
&virtual_server::list_domain_users($d, 0, 0, 0, 0, 1);
($muser) = grep { $_->{'user'} eq lc($link{'muser'}) } @users;
if ($muser) {
$muserdom = $d;
last;
}
}
}
# Show an error if neither user was found
!$muser && $link{'muser'} && &error(&text('forgot_euser3',
"<tt>".&html_escape($link{'muser'})."</tt>"));
$wuser || $muser || &error(&text('forgot_euser2',
"<tt>".&html_escape($link{'user'})."</tt>"));
my $username = $link{'uuser'} || $link{'user'};
# Set the username whichever is available
my $username = $link{'muser'} || $link{'uuser'} || $link{'user'};
my $email = $wuser ? $wuser->{'email'} :
$muser ? $muser->{'recovery'} || $muser->{'email'} : undef;
&ui_print_header(undef, $text{'forgot_title'}, "", undef, undef, 1, 1);
@ -86,6 +110,17 @@ if (defined($in{'newpass'})) {
&virtual_server::pop_all_print();
print $text{'forgot_done'},"<p>\n";
}
elsif ($muser) {
# Update in Virtualmin if this is a mail user
my %oldmuser = %$muser;
$muser->{'plainpass'} = $in{'newpass'};
$muser->{'pass'} =
&virtual_server::encrypt_user_password(
$muser, $muser->{'plainpass'});
$muser->{'passmode'} = 3;
&virtual_server::set_pass_change($muser);
&virtual_server::modify_user($muser, \%oldmuser, $muserdom);
}
elsif ($link{'uuser'} || $wuser->{'pass'} eq 'x') {
# Update in Users and Groups
print &text('forgot_udoing',
@ -121,7 +156,7 @@ if (defined($in{'newpass'})) {
&webmin_log("forgot", "reset", undef,
{ 'user' => $username,
'unix' => $link{'uuser'} ? 1 : 0,
'email' => $wuser->{'email'} }, "acl");
'email' => $email }, "acl");
&unlink_logged($linkfile);
}

30
forgot_send.cgi
View File

@ -27,7 +27,22 @@ if (!$wuser) {
($wuser) = grep { $_->{'name'} eq 'root' } &acl::list_users();
}
}
my $email = $wuser ? $wuser->{'email'} : undef;
# If no Webmin user, then try to get mail user from Virtualmin
my $muser;
if (!$wuser && &foreign_check("virtual-server")) {
# Probably in Virtualmin, so try to find the user
&foreign_require("virtual-server");
foreach my $d (&virtual_server::list_domains()) {
my @users =
&virtual_server::list_domain_users($d, 0, 0, 0, 0, 1);
($muser) = grep { $_->{'user'} eq lc($in{'forgot'}) } @users;
last if ($muser);
}
}
my $email = $wuser ? $wuser->{'email'} :
$muser ? $muser->{'recovery'} || $muser->{'email'} : undef;
# Check if the IP or Webmin user is over it's rate limit
&make_dir($main::forgot_password_link_dir, 0700);
@ -43,6 +58,7 @@ my $ptime = $gconfig{'passreset_time'} // 60;
foreach my $key ($ENV{'REMOTE_ADDR'},
$wuser ? ( $wuser->{'name'} ) : ( ),
$uuser ? ( $uuser->{'user'} ) : ( ),
$muser ? ( $muser->{'user'} ) : ( ),
$email ? ( $email ) : ( )) {
# Don't block if disabled
next if (!$pfailures || !$ptime);
@ -83,7 +99,7 @@ sleep($maxtries);
&error($rlerr) if ($rlerr);
# Make sure the Webmin user exists and is eligible for a reset
$wuser && $wuser->{'email'} || &error($text{'forgot_euser'});
(($wuser && $email) || ($muser && $email)) || &error($text{'forgot_euser'});
($wuser->{'sync'} || $wuser->{'pass'} eq 'e') && &error($text{'forgot_esync'});
$wuser->{'pass'} eq '*LK*' && &error($text{'forgot_elock'});
@ -92,7 +108,8 @@ my %link = ( 'id' => &acl::generate_random_id(),
'remote' => $ENV{'REMOTE_ADDR'},
'time' => $now,
'user' => $wuser->{'name'},
'uuser' => $uuser ? $uuser->{'user'} : undef, );
'uuser' => $uuser ? $uuser->{'user'} : undef,
'muser' => $muser ? $muser->{'user'} : undef, );
$link{'id'} || &error($text{'forgot_erandom'});
my $linkfile = $main::forgot_password_link_dir."/".$link{'id'};
&lock_file($linkfile);
@ -100,8 +117,9 @@ my $linkfile = $main::forgot_password_link_dir."/".$link{'id'};
&unlock_file($linkfile);
my $baseurl = &get_webmin_email_url();
my $url = $baseurl.'/forgot.cgi?id='.&urlize($link{'id'});
my $username = $uuser ? $uuser->{'user'} : $wuser->{'name'};
$url = &theme_forgot_url($baseurl, $link{'id'}, $link{'user'})
my $username = $muser ? $muser->{'user'} :
$uuser ? $uuser->{'user'} : $wuser->{'name'};
$url = &theme_forgot_url($baseurl, $link{'id'}, $username)
if (defined(&theme_forgot_url));
&ui_print_header(undef, $text{'forgot_title'}, "", undef, undef, 1, 1);
@ -128,6 +146,6 @@ print "</center>\n";
&webmin_log("forgot", "send", undef,
{ 'user' => $username,
'unix' => $uuser ? 1 : 0,
'unix' => $muser || $uuser ? 1 : 0,
'email' => $email }, "acl");
&ui_print_footer();

1
lang/en
View File

@ -163,6 +163,7 @@ forgot_newpass=New password for Webmin user $1
forgot_newpass2=New password again
forgot_passok=Change Password
forgot_euser2=Webmin user $1 does not exist!
forgot_euser3=Mail user $1 does not exist!
forgot_esync=The password cannot be changed for this user
forgot_elock=The password for this user is locked
forgot_err=Failed to reset password