inspircd: restore logins from replayed accountname metadata
All checks were successful
CI / check (push) Successful in 3m45s
All checks were successful
CI / check (push) Successful in 3m45s
The inbound parser ignored METADATA entirely, so on a services netburst (after a restart/relink) the ircd's replayed 'accountname' metadata was dropped — every logged-in user looked logged out to services until they re-identified, losing ChanServ access. Parse METADATA <uid> accountname into a new AccountLogin event that restores account_of (empty = logout); our own echoes and other keys are filtered.
This commit is contained in:
parent
99df7baf10
commit
7e868babc3
4 changed files with 58 additions and 0 deletions
|
|
@ -185,6 +185,22 @@ impl Protocol for InspIrcd {
|
|||
_ => vec![],
|
||||
}
|
||||
}
|
||||
// :<src> METADATA <target> <key> :<value> — the ircd sharing user
|
||||
// state. We care about `accountname` on a uid (e.g. replayed on our
|
||||
// netburst) to restore who is logged in; an empty value is a logout.
|
||||
"METADATA" => {
|
||||
let a: Vec<&str> = tokens.collect();
|
||||
match (source.as_deref(), a.first(), a.get(1)) {
|
||||
(Some(src), Some(target), Some(key))
|
||||
if !src.starts_with(self.sid.as_str())
|
||||
&& key.eq_ignore_ascii_case("accountname")
|
||||
&& *target != "*" =>
|
||||
{
|
||||
vec![NetEvent::AccountLogin { uid: target.to_string(), account: trailing(rest) }]
|
||||
}
|
||||
_ => vec![],
|
||||
}
|
||||
}
|
||||
"QUIT" => vec![NetEvent::Quit { uid: source.unwrap_or_default() }],
|
||||
// ENCAP <target> <subcmd> … — we care about relayed SASL and the
|
||||
// account-registration relay (the ircd's account module forwards a
|
||||
|
|
@ -436,6 +452,19 @@ mod tests {
|
|||
);
|
||||
}
|
||||
|
||||
// The ircd replaying `accountname` metadata (e.g. on our netburst) restores a
|
||||
// login; an empty value is a logout, and our own echoes and other keys are ignored.
|
||||
#[test]
|
||||
fn parses_accountname_metadata() {
|
||||
let mut p = proto();
|
||||
assert!(matches!(p.parse(":0IR METADATA 0IRAAAAAB accountname :alice").as_slice(),
|
||||
[NetEvent::AccountLogin { uid, account }] if uid == "0IRAAAAAB" && account == "alice"), "login restored");
|
||||
assert!(matches!(p.parse(":0IR METADATA 0IRAAAAAB accountname :").as_slice(),
|
||||
[NetEvent::AccountLogin { uid, account }] if uid == "0IRAAAAAB" && account.is_empty()), "empty value = logout");
|
||||
assert!(p.parse(":42S METADATA 0IRAAAAAB accountname :bob").is_empty(), "our own echo is ignored");
|
||||
assert!(p.parse(":0IR METADATA 0IRAAAAAB ssl_cert :deadbeef").is_empty(), "non-account keys ignored");
|
||||
}
|
||||
|
||||
// A UID burst introduces the user under their current nick.
|
||||
#[test]
|
||||
fn parses_uid_burst() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue