From defface0a5364189c415a841906d016243dc4b22 Mon Sep 17 00:00:00 2001
From: atlas <atlas@pr1ma.darkest.space>
Date: Thu, 4 Jun 2026 21:27:04 +0200
Subject: [PATCH] fix: parse tuwunel 'reset password for X to: <pw>' admin
 reply
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

extract_new_password had markers for 'is:', 'changed to:', 'reset to:',
'set to:' etc. but none match tuwunel's actual reset-password reply:

  Successfully reset password for @user:server to: <password>

Here the verb ('reset') is not adjacent to 'to:', so every marker missed
and the function returned None for every polled event. The admin-room poll
then ran its full 15s loop without a match and the auto-recovery timed out
on every agent — even though the bot replied correctly and the backward
poll found the message. This is why matrix password auto-recovery kept
looping despite the poll-strategy fix.

Add a generic ' to: ' marker (with surrounding spaces) placed after the
specific verb markers and before the bare 'password:' last resort. Matrix
user ids and server names can't contain ' to: ', so it only ever anchors
on the prose delimiter. Two regression tests cover the exact production
wording.
---
 hive-c0re/src/matrix.rs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/hive-c0re/src/matrix.rs b/hive-c0re/src/matrix.rs
index a2750e88..30a40165 100644
--- a/hive-c0re/src/matrix.rs
+++ b/hive-c0re/src/matrix.rs
@@ -378,6 +378,14 @@ fn extract_new_password(bot_message: &str) -> Option<String> {
         "reset to:",
         "set to: ",
         "set to:",
+        // Generic "… to: <pw>" form. tuwunel's actual reset-password reply is
+        // "Successfully reset password for @user:server to: <password>" — the
+        // password follows " to: " but no recognised verb sits adjacent to it,
+        // so the markers above miss it. Matrix user ids / server names can't
+        // contain " to: ", so this only ever anchors on the prose delimiter.
+        // Placed after the specific verb markers and before the bare
+        // "password:" last resort.
+        " to: ",
         // Bare "new password:" without "is":
         "new password: ",
         "new password:",
@@ -459,6 +467,23 @@ mod extract_new_password_tests {
         assert_eq!(extract_new_password(msg).as_deref(), Some("hunter2"));
     }
 
+    #[test]
+    fn tuwunel_reset_password_for_to_variant() {
+        // The actual tuwunel admin-room reply observed in production — the
+        // verb ("reset") is not adjacent to "to:", so only the generic
+        // " to: " marker catches it.
+        let msg = "Successfully reset password for @atlas:pr1ma.darkest.space to: N3wP@ssw0rd";
+        assert_eq!(extract_new_password(msg).as_deref(), Some("N3wP@ssw0rd"));
+    }
+
+    #[test]
+    fn to_marker_not_confused_by_user_id() {
+        // The user id contains no " to: " so the marker only fires on the
+        // real delimiter; the password is the token right after it.
+        let msg = "Successfully reset password for @sock:pr1ma.darkest.space to: abc123XYZ";
+        assert_eq!(extract_new_password(msg).as_deref(), Some("abc123XYZ"));
+    }
+
     #[test]
     fn bare_new_password_colon() {
         let msg = "New password: P@ssword1";