X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_who.cpp;h=8438f8cdd0e07d222252eb96c76df49a0d5741f1;hb=466ba4100ae8f18470fdf8f1b3def5aa5f9a5cbb;hp=a9f27de83c7cb725644ec74cf0d241859652de10;hpb=31f1e7ad092f8bf16ee653cc105eea4a769650ca;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp index a9f27de83..8438f8cdd 100644 --- a/src/commands/cmd_who.cpp +++ b/src/commands/cmd_who.cpp @@ -1,44 +1,81 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#include "wildcard.h" -#include "commands/cmd_who.h" -static const std::string star = "*"; +/** 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_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 ( Module* parent) : Command(parent,"WHO", 1) { + syntax = "|||||0 [ohurmMiaplf]"; + } + void SendWhoLine(User* user, const std::vector& parms, 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& get_first_visible_channel(User *u) +static Channel* get_first_visible_channel(User *source, 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++; - return star; + /* XXX move the +I check into m_hidechans */ + if (source == u || !(c->IsModeSet('s') || c->IsModeSet('p') || u->IsModeSet('I')) || c->HasUser(source)) + return c; + } + return NULL; } -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; @@ -69,49 +106,66 @@ 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 { - if (opt_realname) - realname = match(user->fullname, matchtext); - else - { - if (opt_showrealhost) - realhost = match(user->host, matchtext); - else + match = false; + const Extensible::ExtensibleStore& list = user->GetExtList(); + for(Extensible::ExtensibleStore::const_iterator i = list.begin(); i != list.end(); ++i) + if (InspIRCd::Match(i->first->name, matchtext)) + match = true; + } + 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) + { + irc::portparser portrange(matchtext, false); + long portno = -1; + while ((portno = portrange.GetToken())) + if (IS_LOCAL(user) && portno == IS_LOCAL(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->signon >= 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); -extern "C" DllExport Command* init_command(InspIRCd* Instance) -{ - return new CommandWho(Instance); + if (!match) + match = InspIRCd::Match(user->nick, matchtext); + + /* Don't allow server name matches if HideWhoisServer is enabled, unless the command user has the priv */ + if (!match && (ServerInstance->Config->HideWhoisServer.empty() || cuser->HasPrivPermission("users/auspex"))) + match = InspIRCd::Match(user->server, matchtext); + + return match; + } } bool CommandWho::CanView(Channel* chan, User* user) @@ -125,7 +179,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,18 +188,19 @@ bool CommandWho::CanView(Channel* chan, User* user) return false; } -void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch, User* u, std::vector &whoresults) +void CommandWho::SendWhoLine(User* user, const std::vector& parms, const std::string &initial, Channel* ch, User* u, std::vector &whoresults) { - /* Not visible to this user */ - if (u->Visibility && !u->Visibility->VisibleTo(user)) - return; - - const std::string& lcn = get_first_visible_channel(u); - Channel* chlast = ServerInstance->FindChan(lcn); + if (!ch) + ch = get_first_visible_channel(user, u); - 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) + - " " + u->nick + " "; + std::string wholine = initial + (ch ? ch->name : "*") + " " + u->ident + " " + + (opt_showrealhost ? u->host : u->dhost) + " "; + if (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex")) + wholine.append(ServerInstance->Config->HideWhoisServer); + else + wholine.append(u->server); + + wholine.append(" " + u->nick + " "); /* away? */ if (IS_AWAY(u)) @@ -160,11 +215,18 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch /* oper? */ if (IS_OPER(u)) { - wholine.append("*"); + wholine.push_back('*'); } - wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname; - whoresults.push_back(wholine); + if (ch) + wholine.append(ch->GetPrefixChar(u)); + + wholine.append(" :0 " + u->fullname); + + FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, parms, u, wholine)); + + if (!wholine.empty()) + whoresults.push_back(wholine); } CmdResult CommandWho::Handle (const std::vector& parameters, User *user) @@ -179,7 +241,6 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * /* WHO options */ opt_viewopersonly = false; opt_showrealhost = false; - opt_unlimit = false; opt_realname = false; opt_mode = false; opt_ident = false; @@ -188,10 +249,11 @@ 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; - std::string initial = "352 " + std::string(user->nick) + " "; + std::string initial = "352 " + user->nick + " "; char matchtext[MAXBUF]; bool usingwildcards = false; @@ -204,16 +266,13 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * for (const char* check = matchtext; *check; check++) { - if (*check == '*' || *check == '?') + if (*check == '*' || *check == '?' || *check == '.') { usingwildcards = true; break; } } - if (ServerInstance->FindServerName(matchtext)) - usingwildcards = true; - if (parameters.size() > 1) { /* Fix for bug #444, WHO flags count as a wildcard */ @@ -225,39 +284,43 @@ 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; - case 'u': - if (IS_OPER(user)) - 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.empty()) + opt_local = true; + break; case 'f': - opt_far = true; - break; + if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty()) + opt_far = true; + break; + case 't': + opt_time = true; + break; } } } @@ -271,11 +334,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) @@ -283,13 +346,13 @@ 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); + + SendWhoLine(user, parameters, initial, ch, i->first, whoresults); } } } @@ -303,15 +366,15 @@ 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; } - SendWhoLine(user, initial, NULL, oper, whoresults); + SendWhoLine(user, parameters, initial, NULL, oper, whoresults); } } } @@ -319,32 +382,29 @@ 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; } - SendWhoLine(user, initial, NULL, i->second, whoresults); + SendWhoLine(user, parameters, initial, NULL, i->second, whoresults); } } } } /* Send the results out */ - 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); - 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.c_str(), parameters[0].c_str()); - return CMD_FAILURE; - } + 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.c_str(), *parameters[0].c_str() ? parameters[0].c_str() : "*"); + + // Penalize the user a bit for large queries + // (add one unit of penalty per 200 results) + if (IS_LOCAL(user)) + IS_LOCAL(user)->CommandFloodPenalty += whoresults.size() * 5; + return CMD_SUCCESS; } +COMMAND_INIT(CommandWho)