fix: strip code-span backticks from extracted matrix password
mara observed the tuwunel reply renders the new password as a code span,
so the plain message body carries literal backticks:
Successfully reset password for @user:server to: `<password>`
The previous extraction stopped at the first whitespace, capturing the
surrounding backticks ("`<password>`") and producing a login string that
doesn't match the password the bot actually set — recovery would still
fail after parsing.
Strip a leading backtick after the marker and stop the token at the first
whitespace OR closing backtick. Generated passwords contain neither, so a
real password is never truncated mid-token. Two regression tests cover the
backtick-wrapped form, including trailing prose after the closing backtick.
This commit is contained in:
parent
defface0a5
commit
93d28ce0b1
1 changed files with 22 additions and 3 deletions
|
|
@ -395,10 +395,15 @@ fn extract_new_password(bot_message: &str) -> Option<String> {
|
||||||
] {
|
] {
|
||||||
if let Some(pos) = lower.find(marker) {
|
if let Some(pos) = lower.find(marker) {
|
||||||
let rest = &bot_message[pos + marker.len()..];
|
let rest = &bot_message[pos + marker.len()..];
|
||||||
let rest = rest.trim_start();
|
// Strip leading whitespace, then a leading code-span backtick:
|
||||||
// Stop at first whitespace or newline; password must be non-empty.
|
// tuwunel renders the password as a code span, so the plain
|
||||||
|
// `body` carries literal backticks ("… to: `<pw>`").
|
||||||
|
let rest = rest.trim_start().trim_start_matches('`');
|
||||||
|
// The password ends at the first whitespace OR the closing
|
||||||
|
// backtick. Generated passwords contain neither, so this never
|
||||||
|
// truncates a real password mid-token.
|
||||||
let end = rest
|
let end = rest
|
||||||
.find(char::is_whitespace)
|
.find(|c: char| c.is_whitespace() || c == '`')
|
||||||
.unwrap_or(rest.len());
|
.unwrap_or(rest.len());
|
||||||
let pw = rest[..end].trim();
|
let pw = rest[..end].trim();
|
||||||
if !pw.is_empty() {
|
if !pw.is_empty() {
|
||||||
|
|
@ -484,6 +489,20 @@ mod extract_new_password_tests {
|
||||||
assert_eq!(extract_new_password(msg).as_deref(), Some("abc123XYZ"));
|
assert_eq!(extract_new_password(msg).as_deref(), Some("abc123XYZ"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn backtick_wrapped_password() {
|
||||||
|
// tuwunel renders the password as a code span; the plain body
|
||||||
|
// carries literal backticks. Strip them, don't capture them.
|
||||||
|
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 backtick_wrapped_with_trailing_text() {
|
||||||
|
let msg = "Done. New password is: `hunter2` (store it now)";
|
||||||
|
assert_eq!(extract_new_password(msg).as_deref(), Some("hunter2"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn bare_new_password_colon() {
|
fn bare_new_password_colon() {
|
||||||
let msg = "New password: P@ssword1";
|
let msg = "New password: P@ssword1";
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue