X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_who.cpp;h=ff39c4552ebaf2e501b24b1ebbfd1ac09c3630aa;hb=91df762e93212958db487d8517addba1a63a4ddd;hp=2c91cb6e761ee31b28604e758cb306c6340f3c00;hpb=cf513d2e3f0d6645d9b7aba5fa5e74499297e9a5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp index 2c91cb6e7..ff39c4552 100644 --- a/src/commands/cmd_who.cpp +++ b/src/commands/cmd_who.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,31 +12,63 @@ */ #include "inspircd.h" -#include "wildcard.h" -#include "commands/cmd_who.h" -static const char *get_first_visible_channel(User *u) +/** Handle /WHO. These command handlers can be reloaded by the core, + * and handle basic RFC1459 commands. Commands within modules work + * the same way, however, they can be fully unloaded, where these + * may not. + */ +class CommandWho : public Command +{ + bool CanView(Channel* chan, User* user); + bool opt_viewopersonly; + bool opt_showrealhost; + bool opt_unlimit; + bool opt_realname; + bool opt_mode; + bool opt_ident; + bool opt_metadata; + bool opt_port; + bool opt_away; + bool opt_local; + bool opt_far; + bool opt_time; + + public: + /** Constructor for who. + */ + CommandWho (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"WHO", 0, 1, false, 2) { syntax = "|||||0 [ohurmMiaplf]"; } + void SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector &whoresults); + /** Handle command. + * @param parameters The parameters to the comamnd + * @param pcnt The number of parameters passed to teh command + * @param user The user issuing the command + * @return A value from CmdResult to indicate command success or failure. + */ + CmdResult Handle(const std::vector& parameters, User *user); + bool whomatch(User* cuser, User* user, const char* matchtext); +}; + + +static const std::string star = "*"; + +static const std::string& get_first_visible_channel(User *u) { UCListIter i = u->chans.begin(); - if (i != u->chans.end()) + while (i != u->chans.end()) { - if (!i->first->IsModeSet('s')) - return i->first->name; + Channel* c = *i++; + if (!c->IsModeSet('s')) + return c->name; } - return "*"; + return star; } -bool CommandWho::whomatch(User* user, const char* matchtext) +bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext) { - bool realhost = false; - bool realname = false; - bool positive = true; - bool metadata = false; - bool ident = false; - bool away = false; - bool port = false; - char* dummy = NULL; + bool match = false; + bool positive = false; if (user->registered != REG_ALL) return false; @@ -67,51 +99,64 @@ bool CommandWho::whomatch(User* user, const char* matchtext) } else { - + /* + * This was previously one awesome pile of ugly nested if, when really, it didn't need + * to be, since only one condition was ever checked, a chained if works just fine. + * -- w00t + */ if (opt_metadata) - metadata = user->GetExt(matchtext, dummy); - else + match = user->GetExtList().find(matchtext) != user->GetExtList().end(); + else if (opt_realname) + match = InspIRCd::Match(user->fullname, matchtext); + else if (opt_showrealhost) + match = InspIRCd::Match(user->host, matchtext, ascii_case_insensitive_map); + else if (opt_ident) + match = InspIRCd::Match(user->ident, matchtext, ascii_case_insensitive_map); + else if (opt_port) { - if (opt_realname) - realname = match(user->fullname, matchtext); - else - { - if (opt_showrealhost) - realhost = match(user->host, matchtext); - else + irc::portparser portrange(matchtext, false); + long portno = -1; + while ((portno = portrange.GetToken())) + if (portno == user->GetServerPort()) { - if (opt_ident) - ident = match(user->ident, matchtext); - else - { - if (opt_port) - { - irc::portparser portrange(matchtext, false); - long portno = -1; - while ((portno = portrange.GetToken())) - if (portno == user->GetPort()) - port = true; - } - else - { - if (opt_away) - away = match(user->awaymsg, matchtext); - } - } + match = true; + break; } - } } - return ((port) || (away) || (ident) || (metadata) || (realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext))); - } -} + else if (opt_away) + match = InspIRCd::Match(user->awaymsg, matchtext); + else if (opt_time) + { + long seconds = ServerInstance->Duration(matchtext); + + // Okay, so time matching, we want all users connected `seconds' ago + if (user->age >= ServerInstance->Time() - seconds) + match = true; + } + /* + * Once the conditionals have been checked, only check dhost/nick/server + * if they didn't match this user -- and only match if we don't find a match. + * + * This should make things minutely faster, and again, less ugly. + * -- w00t + */ + if (!match) + match = InspIRCd::Match(user->dhost, matchtext, ascii_case_insensitive_map); + if (!match) + match = InspIRCd::Match(user->nick, matchtext); -extern "C" DllExport Command* init_command(InspIRCd* Instance) -{ - return new CommandWho(Instance); + /* Don't allow server name matches if HideWhoisServer is enabled, unless the command user has the priv */ + if (!match && (!*ServerInstance->Config->HideWhoisServer || cuser->HasPrivPermission("users/auspex"))) + match = InspIRCd::Match(user->server, matchtext); + + return match; + } } + + bool CommandWho::CanView(Channel* chan, User* user) { if (!user || !chan) @@ -123,7 +168,7 @@ bool CommandWho::CanView(Channel* chan, User* user) if (chan->HasUser(user)) return true; /* Opers see all */ - if (IS_OPER(user)) + if (user->HasPrivPermission("users/auspex")) 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')) @@ -134,15 +179,11 @@ bool CommandWho::CanView(Channel* chan, User* user) void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector &whoresults) { - /* Not visible to this user */ - if (u->Visibility && !u->Visibility->VisibleTo(user)) - return; - - std::string lcn = get_first_visible_channel(u); + const std::string& lcn = get_first_visible_channel(u); Channel* chlast = ServerInstance->FindChan(lcn); std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " + - ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) + + ((*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex")) ? ServerInstance->Config->HideWhoisServer : u->server) + " " + u->nick + " "; /* away? */ @@ -162,7 +203,11 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch } wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname; - whoresults.push_back(wholine); + + FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, u, ch, wholine)); + + if (!wholine.empty()) + whoresults.push_back(wholine); } CmdResult CommandWho::Handle (const std::vector& parameters, User *user) @@ -186,6 +231,7 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * opt_away = false; opt_local = false; opt_far = false; + opt_time = false; Channel *ch = NULL; std::vector whoresults; @@ -223,39 +269,47 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * { case 'o': opt_viewopersonly = true; - break; + break; case 'h': - if (IS_OPER(user)) + if (user->HasPrivPermission("users/auspex")) opt_showrealhost = true; - break; + break; case 'u': - if (IS_OPER(user)) + if (user->HasPrivPermission("users/auspex")) opt_unlimit = true; - break; + break; case 'r': opt_realname = true; - break; + break; case 'm': - opt_mode = true; - break; + if (user->HasPrivPermission("users/auspex")) + opt_mode = true; + break; case 'M': - opt_metadata = true; - break; + if (user->HasPrivPermission("users/auspex")) + opt_metadata = true; + break; case 'i': opt_ident = true; - break; + break; case 'p': - opt_port = true; - break; + if (user->HasPrivPermission("users/auspex")) + opt_port = true; + break; case 'a': opt_away = true; - break; + break; case 'l': - opt_local = true; - break; + if (user->HasPrivPermission("users/auspex") || !*ServerInstance->Config->HideWhoisServer) + opt_local = true; + break; case 'f': - opt_far = true; - break; + if (user->HasPrivPermission("users/auspex") || !*ServerInstance->Config->HideWhoisServer) + opt_far = true; + break; + case 't': + opt_time = true; + break; } } } @@ -269,11 +323,11 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * if (CanView(ch,user)) { bool inside = ch->HasUser(user); - + /* who on a channel. */ - CUList *cu = ch->GetUsers(); - - for (CUList::iterator i = cu->begin(); i != cu->end(); i++) + const UserMembList *cu = ch->GetUsers(); + + for (UserMembCIter i = cu->begin(); i != cu->end(); i++) { /* None of this applies if we WHO ourselves */ if (user != i->first) @@ -281,12 +335,12 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * /* opers only, please */ if (opt_viewopersonly && !IS_OPER(i->first)) continue; - + /* If we're not inside the channel, hide +i users */ - if (i->first->IsModeSet('i') && !inside && !IS_OPER(user)) + if (i->first->IsModeSet('i') && !inside && !user->HasPrivPermission("users/auspex")) continue; } - + SendWhoLine(user, initial, ch, i->first, whoresults); } } @@ -301,11 +355,11 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * { User* oper = *i; - if (whomatch(oper, matchtext)) + if (whomatch(user, oper, matchtext)) { if (!user->SharesChannelWith(oper)) { - if (usingwildcards && (!oper->IsModeSet('i')) && (!IS_OPER(user))) + if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex"))) continue; } @@ -317,11 +371,11 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * { for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++) { - if (whomatch(i->second, matchtext)) + if (whomatch(user, i->second, matchtext)) { if (!user->SharesChannelWith(i->second)) { - if (usingwildcards && (i->second->IsModeSet('i')) && (!IS_OPER(user))) + if (usingwildcards && (i->second->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex"))) continue; } @@ -335,14 +389,15 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * { for (std::vector::const_iterator n = whoresults.begin(); n != whoresults.end(); n++) user->WriteServ(*n); - user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick, *parameters[0].c_str() ? parameters[0].c_str() : "*"); + user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick.c_str(), *parameters[0].c_str() ? parameters[0].c_str() : "*"); return CMD_SUCCESS; } else { /* BZZT! Too many results. */ - user->WriteNumeric(315, "%s %s :Too many results",user->nick, parameters[0].c_str()); + user->WriteNumeric(315, "%s %s :Too many results",user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } } +COMMAND_INIT(CommandWho)