From e99330a44505910cb3b7eeb87eb2612a7e3db266 Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Tue, 25 Sep 2018 21:37:34 +0000
Subject: [PATCH] Adds additional CmdNewPassword() checks and tests.

---
 evennia/contrib/auditing/server.py | 2 ++
 evennia/contrib/auditing/tests.py  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/evennia/contrib/auditing/server.py b/evennia/contrib/auditing/server.py
index 923d873f0..38c97b598 100644
--- a/evennia/contrib/auditing/server.py
+++ b/evennia/contrib/auditing/server.py
@@ -25,6 +25,8 @@ AUDIT_MASKS = [
     {'create': r"^[^@]?[create]{5,6}\s+(\w+|\".+?\")\s+(?P<secret>[\w]+)"},
     {'create': r"^[^@]?[create]{5,6}\s+(?P<secret>[\w]+)"},
     {'userpassword': r"^[@\s]*[userpassword]{11,14}\s+(\w+|\".+?\")\s+=*\s*(?P<secret>[\w]+)"},
+    {'userpassword': r"^.*new password set to '(?P<secret>[^']+)'\."},
+    {'userpassword': r"^.* has changed your password to '(?P<secret>[^']+)'\."},
     {'password': r"^[@\s]*[password]{6,9}\s+(?P<secret>.*)"},
 ] + getattr(ev_settings, 'AUDIT_MASKS', [])
 
diff --git a/evennia/contrib/auditing/tests.py b/evennia/contrib/auditing/tests.py
index 434b4feb8..8d3611a20 100644
--- a/evennia/contrib/auditing/tests.py
+++ b/evennia/contrib/auditing/tests.py
@@ -44,6 +44,8 @@ class AuditingTest(EvenniaTest):
             self.assertEqual(self.session.mask(cmd), cmd)
             
         unsafe_cmds = (
+            ("something - new password set to 'asdfghjk'.", "something - new password set to '********'."),
+            ("someone has changed your password to 'something'.", "someone has changed your password to '*********'."),
             ('connect johnny password123', 'connect johnny ***********'),
             ('concnct johnny password123', 'concnct johnny ***********'),
             ('concnct johnnypassword123', 'concnct *****************'),