]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_check.cpp
Ensure server names passed to some commands are really server names
[user/henk/code/inspircd.git] / src / modules / m_check.cpp
index 25835297904c74973e60c59a3aca71387e2f2cdc..17eb9d9c59d2194840645ceb75aab17dd354f46c 100644 (file)
 #include "inspircd.h"
 #include "listmode.h"
 
+enum
+{
+       RPL_CHECK = 802
+};
+
+class CheckContext
+{
+       User* const user;
+       const std::string& target;
+
+ public:
+       CheckContext(User* u, const std::string& targetstr)
+               : user(u)
+               , target(targetstr)
+       {
+               Write("START", target);
+       }
+
+       ~CheckContext()
+       {
+               Write("END", target);
+       }
+
+       void Write(const std::string& type, const std::string& text)
+       {
+               user->WriteRemoteNumeric(RPL_CHECK, type, text);
+       }
+
+       User* GetUser() const { return user; }
+
+       void DumpListMode(const ListModeBase::ModeList* list)
+       {
+               if (!list)
+                       return;
+
+               CheckContext::List modelist(*this, "modelist");
+               for (ListModeBase::ModeList::const_iterator i = list->begin(); i != list->end(); ++i)
+                       modelist.Add(i->mask);
+
+               modelist.Flush();
+       }
+
+       void DumpExt(Extensible* ext)
+       {
+               CheckContext::List extlist(*this, "metadata");
+               for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); ++i)
+               {
+                       ExtensionItem* item = i->first;
+                       std::string value = item->serialize(FORMAT_USER, ext, i->second);
+                       if (!value.empty())
+                               Write("meta:" + item->name, value);
+                       else if (!item->name.empty())
+                               extlist.Add(item->name);
+               }
+
+               extlist.Flush();
+       }
+
+       class List : public Numeric::GenericBuilder<' ', false, Numeric::WriteRemoteNumericSink>
+       {
+        public:
+               List(CheckContext& context, const char* checktype)
+                       : Numeric::GenericBuilder<' ', false, Numeric::WriteRemoteNumericSink>(Numeric::WriteRemoteNumericSink(context.GetUser()), RPL_CHECK, false, (IS_LOCAL(context.GetUser()) ? context.GetUser()->nick.length() : ServerInstance->Config->Limits.NickMax) + strlen(checktype) + 1)
+               {
+                       GetNumeric().push(checktype).push(std::string());
+               }
+       };
+};
+
 /** Handle /CHECK
  */
 class CommandCheck : public Command
 {
-       ChanModeReference ban;
        UserModeReference snomaskmode;
 
        std::string GetSnomasks(User* user)
@@ -44,7 +112,6 @@ class CommandCheck : public Command
  public:
        CommandCheck(Module* parent)
                : Command(parent,"CHECK", 1)
-               , ban(parent, "ban")
                , snomaskmode(parent, "snomask")
        {
                flags_needed = 'o'; syntax = "<nickname>|<ip>|<hostmask>|<channel> <server>";
@@ -54,83 +121,67 @@ class CommandCheck : public Command
        {
                char timebuf[60];
                struct tm *mytime = gmtime(&time);
-               strftime(timebuf, 59, "%Y-%m-%d %H:%M:%S UTC (%s)", mytime);
-               return std::string(timebuf);
-       }
-
-       void dumpExt(User* user, const std::string& checkstr, Extensible* ext)
-       {
-               std::stringstream dumpkeys;
-               for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++)
-               {
-                       ExtensionItem* item = i->first;
-                       std::string value = item->serialize(FORMAT_USER, ext, i->second);
-                       if (!value.empty())
-                               user->SendText(checkstr + " meta:" + item->name + " " + value);
-                       else if (!item->name.empty())
-                               dumpkeys << " " << item->name;
-               }
-               if (!dumpkeys.str().empty())
-                       user->SendText(checkstr + " metadata", dumpkeys);
+               strftime(timebuf, 59, "%Y-%m-%d %H:%M:%S UTC (", mytime);
+               std::string ret(timebuf);
+               ret.append(ConvToStr(time)).push_back(')');
+               return ret;
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName.c_str())
+               if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName)
                        return CMD_SUCCESS;
 
                User *targuser;
                Channel *targchan;
-               std::string checkstr;
                std::string chliststr;
 
-               checkstr = ":" + ServerInstance->Config->ServerName + " 304 " + user->nick + " :CHECK";
-
                targuser = ServerInstance->FindNick(parameters[0]);
                targchan = ServerInstance->FindChan(parameters[0]);
 
                /*
                 * Syntax of a /check reply:
-                *  :server.name 304 target :CHECK START <target>
-                *  :server.name 304 target :CHECK <field> <value>
-                *  :server.name 304 target :CHECK END
+                *  :server.name 802 target START <target>
+                *  :server.name 802 target <field> :<value>
+                *  :server.name 802 target END <target>
                 */
 
-               user->SendText(checkstr + " START " + parameters[0]);
+               // Constructor sends START, destructor sends END
+               CheckContext context(user, parameters[0]);
 
                if (targuser)
                {
                        LocalUser* loctarg = IS_LOCAL(targuser);
                        /* /check on a user */
-                       user->SendText(checkstr + " nuh " + targuser->GetFullHost());
-                       user->SendText(checkstr + " realnuh " + targuser->GetFullRealHost());
-                       user->SendText(checkstr + " realname " + targuser->fullname);
-                       user->SendText(checkstr + " modes +" + targuser->FormatModes());
-                       user->SendText(checkstr + " snomasks " + GetSnomasks(targuser));
-                       user->SendText(checkstr + " server " + targuser->server);
-                       user->SendText(checkstr + " uid " + targuser->uuid);
-                       user->SendText(checkstr + " signon " + timestring(targuser->signon));
-                       user->SendText(checkstr + " nickts " + timestring(targuser->age));
+                       context.Write("nuh", targuser->GetFullHost());
+                       context.Write("realnuh", targuser->GetFullRealHost());
+                       context.Write("realname", targuser->fullname);
+                       context.Write("modes", std::string("+") + targuser->FormatModes());
+                       context.Write("snomasks", GetSnomasks(targuser));
+                       context.Write("server", targuser->server->GetName());
+                       context.Write("uid", targuser->uuid);
+                       context.Write("signon", timestring(targuser->signon));
+                       context.Write("nickts", timestring(targuser->age));
                        if (loctarg)
-                               user->SendText(checkstr + " lastmsg " + timestring(loctarg->idle_lastmsg));
+                               context.Write("lastmsg", timestring(loctarg->idle_lastmsg));
 
                        if (targuser->IsAway())
                        {
                                /* user is away */
-                               user->SendText(checkstr + " awaytime " + timestring(targuser->awaytime));
-                               user->SendText(checkstr + " awaymsg " + targuser->awaymsg);
+                               context.Write("awaytime", timestring(targuser->awaytime));
+                               context.Write("awaymsg", targuser->awaymsg);
                        }
 
                        if (targuser->IsOper())
                        {
                                OperInfo* oper = targuser->oper;
                                /* user is an oper of type ____ */
-                               user->SendText(checkstr + " opertype " + oper->name);
+                               context.Write("opertype", oper->name);
                                if (loctarg)
                                {
                                        std::string umodes;
                                        std::string cmodes;
-                                       for(char c='A'; c < 'z'; c++)
+                                       for(char c='A'; c <= 'z'; c++)
                                        {
                                                ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_USER);
                                                if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_USER))
@@ -139,89 +190,85 @@ class CommandCheck : public Command
                                                if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_CHANNEL))
                                                        cmodes.push_back(c);
                                        }
-                                       user->SendText(checkstr + " modeperms user=" + umodes + " channel=" + cmodes);
-                                       std::string opcmds;
-                                       for(std::set<std::string>::iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); i++)
-                                       {
-                                               opcmds.push_back(' ');
-                                               opcmds.append(*i);
-                                       }
-                                       std::stringstream opcmddump(opcmds);
-                                       user->SendText(checkstr + " commandperms", opcmddump);
-                                       std::string privs;
-                                       for(std::set<std::string>::iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); i++)
-                                       {
-                                               privs.push_back(' ');
-                                               privs.append(*i);
-                                       }
-                                       std::stringstream privdump(privs);
-                                       user->SendText(checkstr + " permissions", privdump);
+                                       context.Write("modeperms", "user=" + umodes + " channel=" + cmodes);
+
+                                       CheckContext::List opcmdlist(context, "commandperms");
+                                       for (OperInfo::PrivSet::const_iterator i = oper->AllowedOperCommands.begin(); i != oper->AllowedOperCommands.end(); ++i)
+                                               opcmdlist.Add(*i);
+                                       opcmdlist.Flush();
+                                       CheckContext::List privlist(context, "permissions");
+                                       for (OperInfo::PrivSet::const_iterator i = oper->AllowedPrivs.begin(); i != oper->AllowedPrivs.end(); ++i)
+                                               privlist.Add(*i);
+                                       privlist.Flush();
                                }
                        }
 
                        if (loctarg)
                        {
-                               user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa));
-                               user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(loctarg->server_sa));
+                               context.Write("clientaddr", loctarg->client_sa.str());
+                               context.Write("serveraddr", loctarg->server_sa.str());
 
                                std::string classname = loctarg->GetClass()->name;
                                if (!classname.empty())
-                                       user->SendText(checkstr + " connectclass " + classname);
+                                       context.Write("connectclass", classname);
                        }
                        else
-                               user->SendText(checkstr + " onip " + targuser->GetIPString());
+                               context.Write("onip", targuser->GetIPString());
 
-                       for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
+                       CheckContext::List chanlist(context, "onchans");
+                       for (User::ChanList::iterator i = targuser->chans.begin(); i != targuser->chans.end(); i++)
                        {
-                               Channel* c = *i;
-                               chliststr.append(c->GetPrefixChar(targuser)).append(c->name).append(" ");
+                               Membership* memb = *i;
+                               Channel* c = memb->chan;
+                               char prefix = memb->GetPrefixChar();
+                               if (prefix)
+                                       chliststr.push_back(prefix);
+                               chliststr.append(c->name);
+                               chanlist.Add(chliststr);
+                               chliststr.clear();
                        }
 
-                       std::stringstream dump(chliststr);
-
-                       user->SendText(checkstr + " onchans", dump);
+                       chanlist.Flush();
 
-                       dumpExt(user, checkstr, targuser);
+                       context.DumpExt(targuser);
                }
                else if (targchan)
                {
                        /* /check on a channel */
-                       user->SendText(checkstr + " timestamp " + timestring(targchan->age));
+                       context.Write("timestamp", timestring(targchan->age));
 
-                       if (targchan->topic[0] != 0)
+                       if (!targchan->topic.empty())
                        {
                                /* there is a topic, assume topic related information exists */
-                               user->SendText(checkstr + " topic " + targchan->topic);
-                               user->SendText(checkstr + " topic_setby " + targchan->setby);
-                               user->SendText(checkstr + " topic_setat " + timestring(targchan->topicset));
+                               context.Write("topic", targchan->topic);
+                               context.Write("topic_setby", targchan->setby);
+                               context.Write("topic_setat", timestring(targchan->topicset));
                        }
 
-                       user->SendText(checkstr + " modes " + targchan->ChanModes(true));
-                       user->SendText(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter()));
+                       context.Write("modes", targchan->ChanModes(true));
+                       context.Write("membercount", ConvToStr(targchan->GetUserCounter()));
 
                        /* now the ugly bit, spool current members of a channel. :| */
 
-                       const UserMembList *ulist= targchan->GetUsers();
+                       const Channel::MemberMap& ulist = targchan->GetUsers();
 
                        /* note that unlike /names, we do NOT check +i vs in the channel */
-                       for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
+                       for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
                        {
                                /*
                                 * Unlike Asuka, I define a clone as coming from the same host. --w00t
                                 */
-                               user->SendText("%s member %-3lu %s%s (%s@%s) %s ",
-                                       checkstr.c_str(), ServerInstance->Users->GlobalCloneCount(i->first),
-                                       targchan->GetAllPrefixChars(i->first), i->first->nick.c_str(),
-                                       i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str());
+                               const UserManager::CloneCounts& clonecount = ServerInstance->Users->GetCloneCounts(i->first);
+                               context.Write("member", InspIRCd::Format("%-3u %s%s (%s@%s) %s ", clonecount.global,
+                                       i->second->GetAllPrefixChars(), i->first->nick.c_str(),
+                                       i->first->ident.c_str(), i->first->dhost.c_str(), i->first->fullname.c_str()));
                        }
 
-                       // We know that the mode handler for bans is in the core and is derived from ListModeBase
-                       ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
-                       banlm->DoSyncChannel(targchan, creator, user);
+                       const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes();
+                       for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i)
+                               context.DumpListMode((*i)->GetList(targchan));
 
-                       // Show other listmodes as well
-                       FOREACH_MOD(OnSyncChannel, (targchan,creator,user));
-                       dumpExt(user, checkstr, targchan);
+                       context.DumpExt(targchan);
                }
                else
                {
@@ -229,32 +276,32 @@ class CommandCheck : public Command
                        long x = 0;
 
                        /* hostname or other */
-                       for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
+                       const user_hash& users = ServerInstance->Users->GetUsers();
+                       for (user_hash::const_iterator a = users.begin(); a != users.end(); ++a)
                        {
                                if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
                                {
                                        /* host or vhost matches mask */
-                                       user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
+                                       context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
                                }
                                /* IP address */
                                else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0]))
                                {
                                        /* same IP. */
-                                       user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
+                                       context.Write("match", ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
                                }
                        }
 
-                       user->SendText(checkstr + " matches " + ConvToStr(x));
+                       context.Write("matches", ConvToStr(x));
                }
 
-               user->SendText(checkstr + " END " + parameters[0]);
-
+               // END is sent by the CheckContext destructor
                return CMD_SUCCESS;
        }
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               if (parameters.size() > 1)
+               if ((parameters.size() > 1) && (parameters[1].find('.') != std::string::npos))
                        return ROUTE_OPT_UCAST(parameters[1]);
                return ROUTE_LOCALONLY;
        }
@@ -268,27 +315,6 @@ class ModuleCheck : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(mycommand);
-       }
-
-       void ProtoSendMode(void* uv, TargetTypeFlags, void*, const std::vector<std::string>& result, const std::vector<TranslateType>&)
-       {
-               User* user = (User*)uv;
-               std::string checkstr(":");
-               checkstr.append(ServerInstance->Config->ServerName);
-               checkstr.append(" 304 ");
-               checkstr.append(user->nick);
-               checkstr.append(" :CHECK modelist");
-               for(unsigned int i=0; i < result.size(); i++)
-               {
-                       checkstr.append(" ");
-                       checkstr.append(result[i]);
-               }
-               user->SendText(checkstr);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);