Skip to content

Fix parsing RPL_WHOISACTUALLY on some networks. #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sadiepowell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix parsing RPL_WHOISACTUALLY on some networks. #415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions src/commands/handlers/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,19 +310,23 @@ const handlers = {
const cache_key = command.params[1].toLowerCase();
const cache = handler.cache('whois.' + cache_key);

// <source> 338 <target> <nick> [<user>@]<host> <ip> :Actual user@host, Actual IP
const user_host = command.params[command.params.length - 3] || '';
const mask_sep = user_host.indexOf('@');
const user = user_host.substring(0, mask_sep) || undefined;
const host = user_host.substring(mask_sep + 1);
const ip = command.params[command.params.length - 2];

// UnrealIRCd uses this numeric for something else resulting in ip+host
// to be empty, so ignore this is that's the case
if (ip && host) {
cache.actual_ip = ip;
cache.actual_username = user;
cache.actual_hostname = host;
// Until 2018 (commit 5044013) UnrealIRCd used to use this numeric for
// RPL_IRCOPS. If there's not enough parameters for it to be the numeric
// we expect then just ignore it.
if (command.params.length < 4) {
return;
}

// <source> 338 <target> <nick> [[<user>@]<host>] <ip> :Actual user@host, Actual IP
cache.actual_ip = command.params[command.params.length - 2];

// Some servers (e.g. Libera.Chat) only return an actual IP address.
if (command.params.length > 4) {
const user_host = command.params[command.params.length - 3];
const mask_sep = user_host.indexOf('@');

cache.actual_username = user_host.substring(0, mask_sep) || undefined;
cache.actual_hostname = user_host.substring(mask_sep + 1);
}
},

Expand Down
Loading