]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/commands/cmd_who.cpp
Replace hardcoded mode letters, part 3
[user/henk/code/inspircd.git] / src / commands / cmd_who.cpp
index 6f8b91e75fff8d42af961e95216d1b0b1dcd5f0a..3023939276502eb8316f56b0df68aefc3ea3de5c 100644 (file)
@@ -1,38 +1,87 @@
-/*       +------------------------------------+
- *       | 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 <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 = "*";
+#include "inspircd.h"
 
-static const std::string& 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
 {
-       UCListIter i = u->chans.begin();
-       if (i != u->chans.end())
+       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;
+       ChanModeReference secretmode;
+       ChanModeReference privatemode;
+       UserModeReference invisiblemode;
+
+       Channel* get_first_visible_channel(User *u)
+       {
+               UCListIter i = u->chans.begin();
+               while (i != u->chans.end())
+               {
+                       Channel* c = *i++;
+                       if (!c->IsModeSet(secretmode))
+                               return c;
+               }
+               return NULL;
+       }
+
+ public:
+       /** Constructor for who.
+        */
+       CommandWho(Module* parent)
+               : Command(parent, "WHO", 1)
+               , secretmode(parent, "secret")
+               , privatemode(parent, "private")
+               , invisiblemode(parent, "invisible")
        {
-               if (!i->first->IsModeSet('s'))
-                       return i->first->name;
+               syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohurmMiaplf]";
        }
 
-       return star;
-}
+       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);
+};
 
-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,19 +118,25 @@ 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)
-                       match = InspIRCd::Match(user->host, matchtext);
+                       match = InspIRCd::Match(user->host, matchtext, ascii_case_insensitive_map);
                else if (opt_ident)
-                       match = InspIRCd::Match(user->ident, matchtext);
+                       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 (portno == user->GetPort())
+                               if (IS_LOCAL(user) && portno == IS_LOCAL(user)->GetServerPort())
                                {
                                        match = true;
                                        break;
@@ -91,7 +146,7 @@ bool CommandWho::whomatch(User* user, const char* matchtext)
                        match = InspIRCd::Match(user->awaymsg, matchtext);
                else if (opt_time)
                {
-                       long seconds = ServerInstance->Duration(matchtext);
+                       long seconds = InspIRCd::Duration(matchtext);
 
                        // Okay, so time matching, we want all users connected `seconds' ago
                        if (user->age >= ServerInstance->Time() - seconds)
@@ -106,25 +161,19 @@ bool CommandWho::whomatch(User* user, const char* matchtext)
                 * -- w00t
                 */
                if (!match)
-                       match = InspIRCd::Match(user->dhost, matchtext);
+                       match = InspIRCd::Match(user->dhost, matchtext, ascii_case_insensitive_map);
 
                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)
@@ -139,27 +188,28 @@ bool CommandWho::CanView(Channel* chan, User* 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'))
+       else if (!chan->IsModeSet(secretmode) && !chan->IsModeSet(privatemode))
                return true;
 
        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)
 {
-       /* Not visible to this user */
-       if (u->Visibility && !u->Visibility->VisibleTo(user))
-               return;
+       if (!ch)
+               ch = 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 : "*") + " " + 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);
 
-       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 + " ";
+       wholine.append(" " + u->nick + " ");
 
        /* away? */
-       if (IS_AWAY(u))
+       if (u->IsAway())
        {
                wholine.append("G");
        }
@@ -169,13 +219,20 @@ void CommandWho::SendWhoLine(User* user, const std::string &initial, Channel* ch
        }
 
        /* oper? */
-       if (IS_OPER(u))
+       if (u->IsOper())
        {
-               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<std::string>& parameters, User *user)
@@ -190,7 +247,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;
@@ -201,36 +257,17 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
        opt_far = false;
        opt_time = false;
 
-       Channel *ch = NULL;
        std::vector<std::string> whoresults;
-       std::string initial = "352 " + std::string(user->nick) + " ";
-
-       char matchtext[MAXBUF];
-       bool usingwildcards = false;
+       std::string initial = "352 " + user->nick + " ";
 
        /* Change '0' into '*' so the wildcard matcher can grok it */
-       if (parameters[0] == "0")
-               strlcpy(matchtext, "*", MAXBUF);
-       else
-               strlcpy(matchtext, parameters[0].c_str(), MAXBUF);
-
-       for (const char* check = matchtext; *check; check++)
-       {
-               if (*check == '*' || *check == '?')
-               {
-                       usingwildcards = true;
-                       break;
-               }
-       }
+       std::string matchtext = ((parameters[0] == "0") ? "*" : parameters[0]);
 
-       if (ServerInstance->FindServerName(matchtext))
-               usingwildcards = true;
+       // WHO flags count as a wildcard
+       bool usingwildcards = ((parameters.size() > 1) || (matchtext.find_first_of("*?.") != std::string::npos));
 
        if (parameters.size() > 1)
        {
-               /* Fix for bug #444, WHO flags count as a wildcard */
-               usingwildcards = true;
-
                for (std::string::const_iterator iter = parameters[1].begin(); iter != parameters[1].end(); ++iter)
                {
                        switch (*iter)
@@ -242,33 +279,34 @@ 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;
                                case 'm':
-                                       opt_mode = true;
+                                       if (user->HasPrivPermission("users/auspex"))
+                                               opt_mode = true;
                                        break;
                                case 'M':
-                                       opt_metadata = true;
+                                       if (user->HasPrivPermission("users/auspex"))
+                                               opt_metadata = true;
                                        break;
                                case 'i':
                                        opt_ident = true;
                                        break;
                                case 'p':
-                                       opt_port = true;
+                                       if (user->HasPrivPermission("users/auspex"))
+                                               opt_port = true;
                                        break;
                                case 'a':
                                        opt_away = true;
                                        break;
                                case 'l':
-                                       opt_local = true;
+                                       if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty())
+                                               opt_local = true;
                                        break;
                                case 'f':
-                                       opt_far = true;
+                                       if (user->HasPrivPermission("users/auspex") || ServerInstance->Config->HideWhoisServer.empty())
+                                               opt_far = true;
                                        break;
                                case 't':
                                        opt_time = true;
@@ -279,32 +317,32 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
 
 
        /* who on a channel? */
-       ch = ServerInstance->FindChan(matchtext);
+       Channel* ch = ServerInstance->FindChan(matchtext);
 
        if (ch)
        {
                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)
                                {
                                        /* opers only, please */
-                                       if (opt_viewopersonly && !IS_OPER(i->first))
+                                       if (opt_viewopersonly && !i->first->IsOper())
                                                continue;
-       
+
                                        /* If we're not inside the channel, hide +i users */
-                                       if (i->first->IsModeSet('i') && !inside && !user->HasPrivPermission("users/auspex"))
+                                       if (i->first->IsModeSet(invisiblemode) && !inside && !user->HasPrivPermission("users/auspex"))
                                                continue;
                                }
-       
-                               SendWhoLine(user, initial, ch, i->first, whoresults);
+
+                               SendWhoLine(user, parameters, initial, ch, i->first, whoresults);
                        }
                }
        }
@@ -318,15 +356,15 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
                        {
                                User* oper = *i;
 
-                               if (whomatch(oper, matchtext))
+                               if (whomatch(user, oper, matchtext.c_str()))
                                {
                                        if (!user->SharesChannelWith(oper))
                                        {
-                                               if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
+                                               if (usingwildcards && (!oper->IsModeSet(invisiblemode)) && (!user->HasPrivPermission("users/auspex")))
                                                        continue;
                                        }
 
-                                       SendWhoLine(user, initial, NULL, oper, whoresults);
+                                       SendWhoLine(user, parameters, initial, NULL, oper, whoresults);
                                }
                        }
                }
@@ -334,32 +372,29 @@ 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.c_str()))
                                {
                                        if (!user->SharesChannelWith(i->second))
                                        {
-                                               if (usingwildcards && (i->second->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
+                                               if (usingwildcards && (i->second->IsModeSet(invisiblemode)) && (!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<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)