]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/commands/cmd_who.cpp
Merge pull request #1308 from SaberUK/insp20+warnings
[user/henk/code/inspircd.git] / src / commands / cmd_who.cpp
index a85e00fa3295456922ad36073cfe22aeed099637..8438f8cdd0e07d222252eb96c76df49a0d5741f1 100644 (file)
@@ -1,38 +1,81 @@
-/*       +------------------------------------+
- *       | 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 <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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 <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.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 = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohurmMiaplf]";
+       }
+       void SendWhoLine(User* user, const std::vector<std::string>& parms, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &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<std::string>& 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 match = false;
        bool positive = false;
-       char* dummy = NULL;
 
        if (user->registered != REG_ALL)
                return false;
@@ -69,7 +112,13 @@ bool CommandWho::whomatch(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)
@@ -81,7 +130,7 @@ bool CommandWho::whomatch(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;
@@ -94,7 +143,7 @@ bool CommandWho::whomatch(User* user, const char* matchtext)
                        long seconds = ServerInstance->Duration(matchtext);
 
                        // Okay, so time matching, we want all users connected `seconds' ago
-                       if (user->age >= ServerInstance->Time() - seconds)
+                       if (user->signon >= ServerInstance->Time() - seconds)
                                match = true;
                }
 
@@ -111,20 +160,14 @@ bool CommandWho::whomatch(User* user, const char* matchtext)
                if (!match)
                        match = InspIRCd::Match(user->nick, matchtext);
 
-               if (!match)
+               /* 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;
        }
 }
 
-
-
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
-{
-       return new CommandWho(Instance);
-}
-
 bool CommandWho::CanView(Channel* chan, User* user)
 {
        if (!user || !chan)
@@ -145,14 +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<std::string> &whoresults)
+void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms, const std::string &initial, Channel* ch, User* u, std::vector<std::string> &whoresults)
 {
-       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 && !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))
@@ -167,12 +215,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);
@@ -190,7 +241,6 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
        /* WHO options */
        opt_viewopersonly = false;
        opt_showrealhost = false;
-       opt_unlimit = false;
        opt_realname = false;
        opt_mode = false;
        opt_ident = false;
@@ -203,7 +253,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
 
        Channel *ch = NULL;
        std::vector<std::string> whoresults;
-       std::string initial = "352 " + std::string(user->nick) + " ";
+       std::string initial = "352 " + user->nick + " ";
 
        char matchtext[MAXBUF];
        bool usingwildcards = false;
@@ -216,16 +266,13 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& 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 */
@@ -242,10 +289,6 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& 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;
@@ -268,11 +311,11 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& 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':
@@ -293,9 +336,9 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& 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)
@@ -309,7 +352,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
                                                continue;
                                }
 
-                               SendWhoLine(user, initial, ch, i->first, whoresults);
+                               SendWhoLine(user, parameters, initial, ch, i->first, whoresults);
                        }
                }
        }
@@ -323,15 +366,15 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
                        {
                                User* oper = *i;
 
-                               if (whomatch(oper, matchtext))
+                               if (whomatch(user, oper, matchtext))
                                {
                                        if (!user->SharesChannelWith(oper))
                                        {
-                                               if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
+                                               if (usingwildcards && (oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
                                                        continue;
                                        }
 
-                                       SendWhoLine(user, initial, NULL, oper, whoresults);
+                                       SendWhoLine(user, parameters, initial, NULL, oper, whoresults);
                                }
                        }
                }
@@ -339,7 +382,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& 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))
                                        {
@@ -347,23 +390,21 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& 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<std::string>::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<std::string>::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)