X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_who.cpp;h=07370f31eddaa422f7dafc03f68cb8ce54bee1a3;hb=4c83624ed825ca123401a45c8d2844ba6453a85b;hp=39169b4ac4365e82fc32bf1b2b440a03152030fd;hpb=711b65bb2a2470b1b3b8fee9bf8dd45b56361a1a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp index 39169b4ac..07370f31e 100644 --- a/src/cmd_who.cpp +++ b/src/cmd_who.cpp @@ -11,14 +11,11 @@ * --------------------------------------------------- */ -#include "configreader.h" -#include "users.h" -#include "modules.h" +#include "inspircd.h" #include "wildcard.h" #include "commands/cmd_who.h" -/* get the last 'visible' chan of a user */ -static char *getlastchanname(userrec *u) +static char *get_first_visible_channel(userrec *u) { UCListIter i = u->chans.begin(); if (i != u->chans.end()) @@ -44,6 +41,11 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext) if (user->registered != REG_ALL) return false; + if (opt_local && !IS_LOCAL(user)) + return false; + else if (opt_far && IS_LOCAL(user)) + return false; + if (opt_mode) { for (const char* n = matchtext; *n; n++) @@ -83,7 +85,13 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext) else { if (opt_port) - port = (user->GetPort() == ConvToInt(matchtext)); + { + irc::portparser portrange(matchtext, false); + long portno = -1; + while ((portno = portrange.GetToken())) + if (portno == user->GetPort()) + port = true; + } else { if (opt_away) @@ -99,7 +107,7 @@ bool cmd_who::whomatch(userrec* user, const char* matchtext) -extern "C" command_t* init_command(InspIRCd* Instance) +extern "C" DllExport command_t* init_command(InspIRCd* Instance) { return new cmd_who(Instance); } @@ -109,22 +117,24 @@ bool cmd_who::CanView(chanrec* chan, userrec* user) if (!user || !chan) return false; - /* Execute items in fastest-to-execute first order */ - + /* Bug #383 - moved higher up the list, because if we are in the channel + * we can see all its users + */ + if (chan->HasUser(user)) + return true; /* Opers see all */ - if (*user->oper) + if (IS_OPER(user)) return true; + /* Cant see inside a +s or a +p channel unless we are a member (see above) */ 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); + std::string lcn = get_first_visible_channel(u); chanrec* chlast = ServerInstance->FindChan(lcn); /* Not visible to this user */ @@ -132,11 +142,11 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch return; 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) + + ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) + " " + u->nick + " "; /* away? */ - if (*u->awaymsg) + if (IS_AWAY(u)) { wholine.append("G"); } @@ -146,7 +156,7 @@ void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch } /* oper? */ - if (*u->oper) + if (IS_OPER(u)) { wholine.append("*"); } @@ -174,18 +184,30 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) opt_metadata = false; opt_port = false; opt_away = false; + opt_local = false; + opt_far = false; chanrec *ch = NULL; std::vector whoresults; std::string initial = "352 " + std::string(user->nick) + " "; const char* matchtext = NULL; + bool usingwildcards = false; /* Change '0' into '*' so the wildcard matcher can grok it */ matchtext = parameters[0]; if (!strcmp(matchtext,"0")) matchtext = "*"; + for (const char* check = matchtext; *check; check++) + { + if (*check == '*' || *check == '?') + { + usingwildcards = true; + break; + } + } + if (pcnt > 1) { /* parse flags */ @@ -199,11 +221,11 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) opt_viewopersonly = true; break; case 'h': - if (*user->oper) + if (IS_OPER(user)) opt_showrealhost = true; break; case 'u': - if (*user->oper) + if (IS_OPER(user)) opt_unlimit = true; break; case 'r': @@ -224,6 +246,12 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) case 'a': opt_away = true; break; + case 'l': + opt_local = true; + break; + case 'f': + opt_far = true; + break; } *iter++; @@ -245,22 +273,25 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) for (CUList::iterator i = cu->begin(); i != cu->end(); i++) { - /* opers only, please */ - if (opt_viewopersonly && !*(i->second)->oper) - continue; + /* None of this applies if we WHO ourselves */ + if (user != i->first) + { + /* opers only, please */ + if (opt_viewopersonly && !IS_OPER(i->first)) + continue; - /* If we're not inside the channel, hide +i users */ - if (i->second->IsModeSet('i') && !inside) - continue; + /* If we're not inside the channel, hide +i users */ + if (i->first->IsModeSet('i') && !inside) + continue; + } - SendWhoLine(user, initial, ch, i->second, whoresults); + SendWhoLine(user, initial, ch, i->first, whoresults); } } } else { /* Match against wildcard of nick, server or host */ - if (opt_viewopersonly) { /* Showing only opers */ @@ -270,8 +301,13 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) if (whomatch(oper, matchtext)) { - if (!oper->IsModeSet('i')) - SendWhoLine(user, initial, NULL, oper, whoresults); + if (!user->SharesChannelWith(oper)) + { + if (usingwildcards && (!oper->IsModeSet('i')) && (!IS_OPER(user))) + continue; + } + + SendWhoLine(user, initial, NULL, oper, whoresults); } } } @@ -281,14 +317,19 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) { if (whomatch(i->second, matchtext)) { - if (!i->second->IsModeSet('i')) - SendWhoLine(user, initial, NULL, i->second, whoresults); + if (!user->SharesChannelWith(i->second)) + { + if (usingwildcards && (i->second->IsModeSet('i')) && (!IS_OPER(user))) + continue; + } + + SendWhoLine(user, initial, NULL, i->second, whoresults); } } } } /* Send the results out */ - if ((whoresults.size() <= (size_t)ServerInstance->Config->MaxWhoResults) || opt_unlimit) + if ((ServerInstance->Config->MaxWhoResults && (whoresults.size() <= (size_t)ServerInstance->Config->MaxWhoResults)) || opt_unlimit) { for (std::vector::const_iterator n = whoresults.begin(); n != whoresults.end(); n++) user->WriteServ(*n); @@ -302,3 +343,4 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user) return CMD_FAILURE; } } +