From 4fbc57350fc3cfaee996f84b9e819717e9ee71fd Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sat, 26 Apr 2025 10:04:43 -0700
Subject: [PATCH] Add logging for password resets

---
 acl/lang/en       | 2 ++
 acl/log_parser.pl | 4 ++++
 forgot.cgi        | 4 ++++
 forgot_send.cgi   | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/acl/lang/en b/acl/lang/en
index 05df50c78..a9f908877 100644
--- a/acl/lang/en
+++ b/acl/lang/en
@@ -249,6 +249,8 @@ log_sync=Changed unix user synchronization
 log_sql=Changed user and group database
 log_twofactor=Enrolled user $1 with two-factor provider $2
 log_onefactor=Dis-enrolled user $1 for two-factor authentication
+log_forgot_send=Sent password rest email for $1 to $2
+log_forgot_reset=Reset password for $1 with email $2
 
 gedit_ecannot=You are not allowed to edit groups
 gedit_title=Edit Webmin Group
diff --git a/acl/log_parser.pl b/acl/log_parser.pl
index 7bd83a48a..e164d976e 100755
--- a/acl/log_parser.pl
+++ b/acl/log_parser.pl
@@ -62,6 +62,10 @@ elsif ($action eq 'switch') {
 elsif ($action eq 'twofactor') {
 	return &text('log_twofactor', $object, $p->{'provider'}, $p->{'id'});
 	}
+elsif ($action eq 'forgot') {
+	return &text('log_forgot_'.$type, &html_escape($p->{'user'}),
+					  &html_escape($p->{'email'}));
+	}
 else {
 	return $text{'log_'.$action};
 	}
diff --git a/forgot.cgi b/forgot.cgi
index 28afe40b5..8ac1c0759 100755
--- a/forgot.cgi
+++ b/forgot.cgi
@@ -118,6 +118,10 @@ if (defined($in{'newpass'})) {
 		}
 	print &text('forgot_retry', '/'),"<p>\n";
 
+	&webmin_log("forgot", "reset", undef,
+		    { 'user' => $wuser->{'name'},
+		      'email' => $link{'email'} }, "acl");
+
 	&unlink_file("$main::forgot_password_link_dir/$in{'id'}");
 	}
 else {
diff --git a/forgot_send.cgi b/forgot_send.cgi
index 78c17081e..0feb085ca 100755
--- a/forgot_send.cgi
+++ b/forgot_send.cgi
@@ -101,6 +101,9 @@ print &text('forgot_sent',
 	    "<tt>".&html_escape($wuser->{'name'})."</tt>"),"<p>\n";
 print "</center>\n";
 
+&webmin_log("forgot", "send", undef,
+	    { 'user' => $wuser->{'name'},
+	      'email' => $email }, "acl");
 &ui_print_footer();
 
 # generate_random_id()