X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_who.cpp;h=c4c37e52876d260c0ac32c3af203fbdf8b85695e;hb=166dfe4163f0941148f5927c28dfbdb8bdb49c5e;hp=06c99ac60df27b5467f009bb87ecfedcbb88c151;hpb=3a7c9d1180d57417ae6e9f963ba3ad51fdb26584;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index 06c99ac60..c4c37e528 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -2,56 +2,152 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ #include "configreader.h" #include "users.h" -#include "message.h" #include "modules.h" -#include "commands.h" -#include "helperfuncs.h" +#include "wildcard.h" #include "commands/cmd_who.h" -extern ServerConfig* Config; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector all_opers; - /* get the last 'visible' chan of a user */ static char *getlastchanname(userrec *u) { - for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) + UCListIter i = u->chans.begin(); + if (i != u->chans.end()) { - ucrec* temp = (ucrec*)*v; + if (!i->first->IsModeSet('s')) + return i->first->name; + } + + return "*"; +} + +bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_showrealhost, bool opt_mode) +{ + bool realhost = false; + bool realname = false; + bool positive = true; + + if (user->registered != REG_ALL) + return false; - if (temp->channel) + if (opt_mode) + { + for (const char* n = matchtext; *n; n++) { - if (!temp->channel->IsModeSet('s')) - return temp->channel->name; + if (*n == '+') + { + positive = true; + continue; + } + else if (*n == '-') + { + positive = false; + continue; + } + if (user->IsModeSet(*n) != positive) + return false; } + return true; } - return "*"; + if (opt_realname) + realname = match(user->fullname, matchtext); + + if (opt_showrealhost) + realhost = match(user->host, matchtext); + + return ((realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext))); } -void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) + + +extern "C" command_t* init_command(InspIRCd* Instance) +{ + return new cmd_who(Instance); +} + +bool cmd_who::CanView(chanrec* chan, userrec* user) { - bool opt_viewopersonly = false; + if (!user || !chan) + return false; + + /* Execute items in fastest-to-execute first order */ + if (*user->oper) + return true; + else if (!chan->IsModeSet('s') && !chan->IsModeSet('p')) + return true; + else if (chan->HasUser(user)) + return true; + + return false; +} + +void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector &whoresults) +{ + std::string lcn = getlastchanname(u); + chanrec* chlast = ServerInstance->FindChan(lcn); + + std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " + + ((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : u->server) + + " " + u->nick + " "; + + /* away? */ + if (u->awaymsg) + { + wholine.append("G"); + } + else + { + wholine.append("H"); + } + + /* oper? */ + if (u->oper) + { + wholine.append("*"); + } + + wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname; + whoresults.push_back(wholine); +} + +CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) +{ + /* + * XXX - RFC says: + * The passed to WHO is matched against users' host, server, real + * name and nickname + * Currently, we support WHO #chan, WHO nick, WHO 0, WHO *, and the addition of a 'o' flag, as per RFC. + */ + + /* WHO options */ + opt_viewopersonly = false; + opt_showrealhost = false; + opt_unlimit = false; + opt_realname = false; + opt_mode = false; + chanrec *ch = NULL; std::vector whoresults; std::string initial = "352 " + std::string(user->nick) + " "; - if (pcnt == 2) + const char* matchtext = NULL; + + /* Change '0' into '*' so the wildcard matcher can grok it */ + matchtext = parameters[0]; + if (!strcmp(matchtext,"0")) + matchtext = "*"; + + if (pcnt > 1) { /* parse flags */ const char *iter = parameters[1]; @@ -62,7 +158,21 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) { case 'o': opt_viewopersonly = true; - break; + break; + case 'h': + if (*user->oper) + opt_showrealhost = true; + break; + case 'u': + if (*user->oper) + opt_unlimit = true; + break; + case 'r': + opt_realname = true; + break; + case 'm': + opt_mode = true; + break; } *iter++; @@ -71,9 +181,9 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) /* who on a channel? */ - ch = FindChan(parameters[0]); + ch = ServerInstance->FindChan(matchtext); - if (ch) + if ((ch) && (CanView(ch,user))) { /* who on a channel. */ CUList *cu = ch->GetUsers(); @@ -84,171 +194,49 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user) if (opt_viewopersonly && !*(i->second)->oper) continue; - - std::string wholine = initial; - - wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + i->second->dhost + " " + - i->second->server + " " + i->second->nick + " "; - - /* away? */ - if (*(i->second)->awaymsg) - { - wholine.append("G"); - } - else - { - wholine.append("H"); - } - - /* oper? */ - if (*(i->second)->oper) - { - wholine.append("*"); - } - - wholine = wholine + cmode(i->second, ch) + " :0 " + i->second->fullname; - whoresults.push_back(wholine); + SendWhoLine(user, initial, ch, i->second, whoresults); } } else { - /* uhggle. who on .. something else. */ - -// The passed to WHO is matched against users' host, server, real -// name and nickname - - } - - - return; + /* Match against wildcard of nick, server or host */ - - - - - - - - - - chanrec* Ptr = NULL; - char tmp[10]; - - if (pcnt == 1) - { - if ((IS_SINGLE(parameters[0],'0')) || (IS_SINGLE(parameters[0],'*'))) - { - if ((user->chans.size()) && (((ucrec*)*(user->chans.begin()))->channel)) - { - int n_list = 0; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - Ptr = ((ucrec*)*(i->second->chans.begin()))->channel; - // suggested by phidjit and FCS - if ((!common_channels(user,i->second)) && (isnick(i->second->nick))) - { - // Bug Fix #29 - *tmp = 0; - if (*i->second->awaymsg) { - charlcat(tmp, 'G', 9); - } else { - charlcat(tmp, 'H', 9); - } - if (*i->second->oper) { charlcat(tmp, '*', 9); } - WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr ? Ptr->name : "*", i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname); - if (n_list++ > Config->MaxWhoResults) - { - WriteServ(user->fd,"523 %s WHO :Command aborted: More results than configured limit",user->nick); - break; - } - } - } - } - if (Ptr) - { - WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick , parameters[0]); - } - else - { - WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]); - } - return; - } - if (parameters[0][0] == '#') + if (opt_viewopersonly) { - Ptr = FindChan(parameters[0]); - if (Ptr) + /* Showing only opers */ + for (std::vector::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++) { - int n_list = 0; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + userrec* oper = *i; + + if (whomatch(oper, matchtext, opt_realname, opt_showrealhost, opt_mode)) { - if ((Ptr->HasUser(i->second)) && (isnick(i->second->nick))) - { - // Fix Bug #29 - Part 2.. - *tmp = 0; - if (*i->second->awaymsg) { - charlcat(tmp, 'G', 9); - } else { - charlcat(tmp, 'H', 9); - } - if (*i->second->oper) { charlcat(tmp, '*', 9); } - strlcat(tmp, cmode(i->second, Ptr),5); - WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname); - n_list++; - if (n_list > Config->MaxWhoResults) - { - WriteServ(user->fd,"523 %s WHO :Command aborted: More results than configured limit",user->nick); - break; - } - - } + SendWhoLine(user, initial, NULL, oper, whoresults); } - WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]); - } - else - { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); } } else { - userrec* u = Find(parameters[0]); - if (u) + for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++) { - // Bug Fix #29 -- Part 29.. - *tmp = 0; - if (*u->awaymsg) { - charlcat(tmp, 'G' ,9); - } else { - charlcat(tmp, 'H' ,9); + if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost, opt_mode)) + { + SendWhoLine(user, initial, NULL, i->second, whoresults); } - if (*u->oper) { charlcat(tmp, '*' ,9); } - WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, u->chans.size() && ((ucrec*)*(u->chans.begin()))->channel ? ((ucrec*)*(u->chans.begin()))->channel->name - : "*", u->ident, u->dhost, u->server, u->nick, tmp, u->fullname); } - WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]); } } - if (pcnt == 2) + /* Send the results out */ + if ((whoresults.size() < (size_t)ServerInstance->Config->MaxWhoResults) && (!opt_unlimit)) { - if ((IS_SINGLE(parameters[0],'0')) || (IS_SINGLE(parameters[0],'*')) && (IS_SINGLE(parameters[1],'o'))) - { - for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) - { - // If i were a rich man.. I wouldn't need to me making these bugfixes.. - // But i'm a poor bastard with nothing better to do. - userrec* oper = *i; - *tmp = 0; - if (*oper->awaymsg) { - charlcat(tmp, 'G' ,9); - } else { - charlcat(tmp, 'H' ,9); - } - WriteServ(user->fd,"352 %s %s %s %s %s %s %s* :0 %s", user->nick, oper->chans.size() && ((ucrec*)*(oper->chans.begin()))->channel ? ((ucrec*)*(oper->chans.begin()))->channel->name - : "*", oper->ident, oper->dhost, oper->server, oper->nick, tmp, oper->fullname); - } - WriteServ(user->fd,"315 %s %s :End of /WHO list.",user->nick, parameters[0]); - return; - } + for (std::vector::const_iterator n = whoresults.begin(); n != whoresults.end(); n++) + user->WriteServ(*n); + user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*"); + return CMD_SUCCESS; + } + else + { + /* BZZT! Too many results. */ + user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]); + return CMD_FAILURE; } }