X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_who.cpp;h=c474abc3c8b2ea7c4662b3f24568181793553074;hb=f89e68d78684dab66f9c99aaf8bd8a37ec62bfce;hp=61b5a0f6032f19a0e56b03628f31c39e08a52401;hpb=933c31331b9fe4fc8921019f605330be656baa27;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp index 61b5a0f60..c474abc3c 100644 --- a/src/commands/cmd_who.cpp +++ b/src/commands/cmd_who.cpp @@ -1,25 +1,24 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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" - -#ifndef __CMD_WHO_H__ -#define __CMD_WHO_H__ - -// include the common header files -#include "users.h" -#include "channels.h" +#include "inspircd.h" /** Handle /WHO. These command handlers can be reloaded by the core, * and handle basic RFC1459 commands. Commands within modules work @@ -31,7 +30,6 @@ 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; @@ -45,8 +43,10 @@ class CommandWho : public Command 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); + 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 @@ -57,28 +57,23 @@ class CommandWho : public Command bool whomatch(User* cuser, User* user, const char* matchtext); }; -#endif - -static const std::string star = "*"; - -static const std::string& get_first_visible_channel(User *u) +static Channel* 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; } - - return star; + return NULL; } bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext) { bool match = false; bool positive = false; - char* dummy = NULL; if (user->registered != REG_ALL) return false; @@ -115,7 +110,13 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext) * -- w00t */ if (opt_metadata) - match = user->GetExt(matchtext, dummy); + { + 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) @@ -127,7 +128,7 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext) irc::portparser portrange(matchtext, false); long portno = -1; while ((portno = portrange.GetToken())) - if (portno == user->GetServerPort()) + if (IS_LOCAL(user) && portno == IS_LOCAL(user)->GetServerPort()) { match = true; break; @@ -158,15 +159,13 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext) 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 || cuser->HasPrivPermission("users/auspex"))) + 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) { if (!user || !chan) @@ -187,14 +186,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) { - const std::string& lcn = get_first_visible_channel(u); - Channel* chlast = ServerInstance->FindChan(lcn); + if (!ch) + ch = get_first_visible_channel(u); - std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " + - ((*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex")) ? 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)) @@ -209,12 +213,15 @@ 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; + if (ch) + wholine.append(ch->GetPrefixChar(u)); + + wholine.append(" :0 " + u->fullname); - FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, u, ch, wholine)); + FOREACH_MOD(I_OnSendWhoLine, OnSendWhoLine(user, parms, u, wholine)); if (!wholine.empty()) whoresults.push_back(wholine); @@ -232,7 +239,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; @@ -265,9 +271,6 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * } } - if (ServerInstance->FindServerName(matchtext)) - usingwildcards = true; - if (parameters.size() > 1) { /* Fix for bug #444, WHO flags count as a wildcard */ @@ -284,10 +287,6 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * if (user->HasPrivPermission("users/auspex")) opt_showrealhost = true; break; - case 'u': - if (user->HasPrivPermission("users/auspex")) - opt_unlimit = true; - break; case 'r': opt_realname = true; break; @@ -310,11 +309,11 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * opt_away = true; break; case 'l': - if (user->HasPrivPermission("users/auspex") || !*ServerInstance->Config->HideWhoisServer) + if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty()) opt_local = true; break; case 'f': - if (user->HasPrivPermission("users/auspex") || !*ServerInstance->Config->HideWhoisServer) + if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty()) opt_far = true; break; case 't': @@ -335,9 +334,9 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * bool inside = ch->HasUser(user); /* who on a channel. */ - CUList *cu = ch->GetUsers(); + const UserMembList *cu = ch->GetUsers(); - for (CUList::iterator i = cu->begin(); i != cu->end(); i++) + for (UserMembCIter i = cu->begin(); i != cu->end(); i++) { /* None of this applies if we WHO ourselves */ if (user != i->first) @@ -351,7 +350,7 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * continue; } - SendWhoLine(user, initial, ch, i->first, whoresults); + SendWhoLine(user, parameters, initial, ch, i->first, whoresults); } } } @@ -373,7 +372,7 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * continue; } - SendWhoLine(user, initial, NULL, oper, whoresults); + SendWhoLine(user, parameters, initial, NULL, oper, whoresults); } } } @@ -389,25 +388,21 @@ CmdResult CommandWho::Handle (const std::vector& parameters, User * 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)