fedserv/echo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: apply auto-join, vhost and memo notice on SASL connect
All checks were successful
CI / check (push) Successful in 3m44s
Details

Browse source 
A user authenticated via SASL during registration never runs the NickServ
IDENTIFY path, so they silently missed their auto-join channels, vhost, and
waiting-memo notice. The UserConnect handler now applies these login
side-effects when the arriving user is already authenticated, mirroring
identify.rs. Non-SASL connections are unaffected (no account set yet).
This commit is contained in:
Jean Chevronnet 2026-07-16 03:35:32 +00:00
parent dabb18abd4
commit dc23a44f57
No known key found for this signature in database
3 changed files with 76 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/engine/mod.rs
View file

@ -400,6 +400,38 @@ impl Engine {
sasl_success(agent, client, account)
}
// The login side-effects — auto-join, vhost, and a waiting-memo notice — for a
// user who is already authenticated the instant they connect: they logged in
// via SASL during registration, so the NickServ IDENTIFY path (which applies
// these itself) never ran for them. Mirrors modules/nickserv/src/identify.rs.
fn login_connect_effects(&self, uid: &str, account: &str) -> Vec<NetAction> {
let mut out = Vec::new();
for entry in self.db.ajoin_list(account) {
out.push(NetAction::ForceJoin { uid: uid.to_string(), channel: entry.channel.clone(), key: entry.key.clone() });
}
if let Some(vhost) = self.db.active_vhost(account) {
// apply_vhost semantics: an ident@host spec sets the ident as well.
match vhost.split_once('@') {
Some((ident, host)) => {
out.push(NetAction::SetIdent { uid: uid.to_string(), ident: ident.to_string() });
out.push(NetAction::SetHost { uid: uid.to_string(), host: host.to_string() });
}
None => out.push(NetAction::SetHost { uid: uid.to_string(), host: vhost }),
}
}
let unread = self.db.unread_memos(account);
if unread > 0 && self.db.memo_notify_on(account) {
if let Some(ns) = &self.nick_service {
out.push(NetAction::Notice {
from: ns.clone(),
to: uid.to_string(),
text: format!("You have \x02{unread}\x02 new memo(s). Read them with \x02/msg MemoServ READ NEW\x02."),
});
}
}
out
}
fn emit_irc(&self, action: NetAction) {
if let Some(tx) = &self.irc_out {
let _ = tx.send(action); // unbounded: never blocks; only fails if the link is down
@ -757,6 +789,12 @@ impl Engine {
// identified to.
let mut out = self.news_notices("logon", "News", &uid);
out.extend(self.enforce_registered_nick(&uid, &arriving_nick));
// A user already logged in the moment they connect (SASL during
// registration) never ran the IDENTIFY path, so give them their
// auto-join, vhost, and waiting-memo notice here.
if let Some(account) = self.network.account_of(&uid).map(str::to_string) {
out.extend(self.login_connect_effects(&uid, &account));
}
out
}
NetEvent::NickChange { uid, nick } => {