pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-10 18:03:14 +02:00
Code Activity

Handle edge cases relating to IRCd-sent account names.

Browse Source
This commit is contained in:
Kufat
2026-07-10 04:04:37 -04:00
committed by GitHub
parent d3bf09b65b
commit 076af6bba9
6 changed files with 136 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/protocol/inspircd.cpp
+20 -2
View File
@@ -1814,9 +1814,27 @@ private:
{
// If we're bursting then then the user was probably logged in
// during a previous connection.
auto *nc = NickCore::Find(value);
if (nc)
auto *na = NickAlias::Find(value);
if (!na)
{
// Nick has been dropped, force the IRCd to deauth them.
IRCD->SendLogout(u);
return;
}
NickCore *nc = na->nc;
if (na == nc->na)
{
// User is logged into their display nick.
u->Login(nc);
}
else
{
// User is logged into a non-display nick, their display has
// probably expired due to a config change so reauthenticate
// them as their new display nick.
u->Identify(nc->na);
}
}
}
modules/protocol/ngircd.cpp
+22 -2
View File
@@ -329,9 +329,29 @@ struct IRCDMessageMetadata final
}
if (params[1].equals_cs("accountname"))
{
NickCore *nc = NickCore::Find(params[2]);
if (nc)
// If we're bursting then then the user was probably logged in
// during a previous connection.
auto *na = NickAlias::Find(params[2]);
if (!na)
{
// Nick has been dropped, force the IRCd to deauth them.
IRCD->SendLogout(u);
return;
}
NickCore *nc = na->nc;
if (na == nc->na)
{
// User is logged into their display nick.
u->Login(nc);
}
else
{
// User is logged into a non-display nick, their display has
// probably expired due to a config change so reauthenticate
// them as their new display nick.
u->Identify(nc->na);
}
}
else if (params[1].equals_cs("certfp"))
{
modules/protocol/plexus.cpp
+24 -2
View File
@@ -227,11 +227,33 @@ struct IRCDMessageEncap final
if (params[1].equals_cs("SU"))
{
User *u = User::Find(params[2]);
NickCore *nc = NickCore::Find(params[3]);
if (u && nc)
if (!u)
return; // Should never happen.
// If we're bursting then then the user was probably logged in
// during a previous connection.
auto *na = NickAlias::Find(params[3]);
if (!na)
{
// Nick has been dropped, force the IRCd to deauth them.
IRCD->SendLogout(u);
return;
}
NickCore *nc = na->nc;
if (na == nc->na)
{
// User is logged into their display nick.
u->Login(nc);
}
else
{
// User is logged into a non-display nick, their display has
// probably expired due to a config change so reauthenticate
// them as their new display nick.
u->Identify(nc->na);
}
}
/*
modules/protocol/ratbox.cpp
+24 -3
View File
@@ -156,11 +156,32 @@ struct IRCDMessageEncap final
if (params[1] == "LOGIN" || params[1] == "SU")
{
User *u = source.GetUser();
if (!u)
return; // Should never happen.
NickCore *nc = NickCore::Find(params[2]);
if (!nc)
// If we're bursting then then the user was probably logged in
// during a previous connection.
auto *na = NickAlias::Find(params[2]);
if (!na)
{
// Nick has been dropped, force the IRCd to deauth them.
IRCD->SendLogout(u);
return;
u->Login(nc);
}
NickCore *nc = na->nc;
if (na == nc->na)
{
// User is logged into their display nick.
u->Login(nc);
}
else
{
// User is logged into a non-display nick, their display has
// probably expired due to a config change so reauthenticate
// them as their new display nick.
u->Identify(nc->na);
}
/* Sometimes a user connects, we send them the usual "this nickname is registered" mess (if
* their server isn't syncing) and then we receive this.. so tell them about it.
modules/protocol/solanum.cpp
+24 -4
View File
@@ -318,12 +318,32 @@ struct IRCDMessageEncap final
if (params[1] == "LOGIN" || params[1] == "SU")
{
User *u = source.GetUser();
NickCore *nc = NickCore::Find(params[2]);
if (!u || !nc)
if (!u)
return;
u->Login(nc);
// If we're bursting then then the user was probably logged in
// during a previous connection.
auto *na = NickAlias::Find(params[2]);
if (!na)
{
// Nick has been dropped, force the IRCd to deauth them.
IRCD->SendLogout(u);
return;
}
NickCore *nc = na->nc;
if (na == nc->na)
{
// User is logged into their display nick.
u->Login(nc);
}
else
{
// User is logged into a non-display nick, their display has
// probably expired due to a config change so reauthenticate
// them as their new display nick.
u->Identify(nc->na);
}
}
// Received: :42XAAAAAE ENCAP * CERTFP :3f122a9cc7811dbad3566bf2cec3009007c0868f
else if (params[1] == "CERTFP")
modules/protocol/unrealircd.cpp
+22 -4
View File
@@ -1651,11 +1651,29 @@ public:
}
else
{
// If we're bursting then then the user was probably logged
// in during a previous connection.
NickCore *nc = NickCore::Find(params[2]);
if (nc)
// If we're bursting then then the user was probably logged in
// during a previous connection.
auto *na = NickAlias::Find(params[2]);
if (!na)
{
// Nick has been dropped, force the IRCd to deauth them.
IRCD->SendLogout(u);
return;
}
NickCore *nc = na->nc;
if (na == nc->na)
{
// User is logged into their display nick.
u->Login(nc);
}
else
{
// User is logged into a non-display nick, their display has
// probably expired due to a config change so reauthenticate
// them as their new display nick.
u->Identify(nc->na);
}
}
}
};