X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=461ac5a2d7889d819e35e4e25fcc02842c3a8973;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=847e9d5c9014640e96e5cdad79a2c5334dd099a1;hpb=0ed3ef9dee2cb8f4b0c37da218a2fd1eee8c31f6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 847e9d5c9..461ac5a2d 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -20,9 +20,9 @@ class CommandCheck : public Command { public: - CommandCheck (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"CHECK", "o", 1) + CommandCheck(Module* parent) : Command(parent,"CHECK", 1) { - syntax = "||| "; + flags_needed = 'o'; syntax = "||| "; } std::string timestring(time_t time) @@ -36,24 +36,22 @@ class CommandCheck : public Command void dumpExt(User* user, std::string checkstr, Extensible* ext) { std::stringstream dumpkeys; - for(ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++) + for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++) { - ExtensionItem* item = Extensible::GetItem(i->first); - std::string value; - if (item) - value = item->serialize(FORMAT_USER, ext, i->second); - if (value.empty()) - dumpkeys << " " << i->first; - else - ServerInstance->DumpText(user, checkstr + " meta:" + i->first + " " + value); + 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()) - ServerInstance->DumpText(user,checkstr + " metadata", dumpkeys); + user->SendText(checkstr + " metadata", dumpkeys); } CmdResult Handle (const std::vector ¶meters, User *user) { - if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName) + if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName.c_str()) return CMD_SUCCESS; User *targuser; @@ -73,70 +71,108 @@ class CommandCheck : public Command * :server.name 304 target :CHECK END */ - ServerInstance->DumpText(user, checkstr + " START " + parameters[0]); + user->SendText(checkstr + " START " + parameters[0]); if (targuser) { + LocalUser* loctarg = IS_LOCAL(targuser); /* /check on a user */ - ServerInstance->DumpText(user, checkstr + " nuh " + targuser->GetFullHost()); - ServerInstance->DumpText(user, checkstr + " realnuh " + targuser->GetFullRealHost()); - ServerInstance->DumpText(user, checkstr + " realname " + targuser->fullname); - ServerInstance->DumpText(user, checkstr + " modes +" + targuser->FormatModes()); - ServerInstance->DumpText(user, checkstr + " snomasks +" + targuser->FormatNoticeMasks()); - ServerInstance->DumpText(user, checkstr + " server " + targuser->server); - ServerInstance->DumpText(user, checkstr + " uid " + targuser->uuid); - ServerInstance->DumpText(user, checkstr + " signon " + timestring(targuser->signon)); - ServerInstance->DumpText(user, checkstr + " nickts " + timestring(targuser->age)); - if (IS_LOCAL(targuser)) - ServerInstance->DumpText(user, checkstr + " lastmsg " + timestring(targuser->idle_lastmsg)); + 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 +" + targuser->FormatNoticeMasks()); + 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)); + if (loctarg) + user->SendText(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg)); if (IS_AWAY(targuser)) { /* user is away */ - ServerInstance->DumpText(user, checkstr + " awaytime " + timestring(targuser->awaytime)); - ServerInstance->DumpText(user, checkstr + " awaymsg " + targuser->awaymsg); + user->SendText(checkstr + " awaytime " + timestring(targuser->awaytime)); + user->SendText(checkstr + " awaymsg " + targuser->awaymsg); } if (IS_OPER(targuser)) { + OperInfo* oper = targuser->oper; /* user is an oper of type ____ */ - ServerInstance->DumpText(user, checkstr + " opertype " + irc::Spacify(targuser->oper.c_str())); + user->SendText(checkstr + " opertype " + oper->NameStr()); + if (loctarg) + { + std::string umodes; + std::string cmodes; + for(char c='A'; c < 'z'; c++) + { + ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_USER); + if (mh && mh->NeedsOper() && loctarg->HasModePermission(c, MODETYPE_USER)) + umodes.push_back(c); + mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL); + 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::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::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); + } } - if (IS_LOCAL(targuser)) + if (loctarg) { - ServerInstance->DumpText(user, checkstr + " clientaddr " + irc::sockets::satouser(&targuser->client_sa)); - ServerInstance->DumpText(user, checkstr + " serveraddr " + irc::sockets::satouser(&targuser->server_sa)); + user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(loctarg->client_sa)); + user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(loctarg->server_sa)); - std::string classname = targuser->GetClass()->name; + std::string classname = loctarg->GetClass()->name; if (!classname.empty()) - ServerInstance->DumpText(user, checkstr + " connectclass " + classname); + user->SendText(checkstr + " connectclass " + classname); } else - ServerInstance->DumpText(user, checkstr + " onip " + targuser->GetIPString()); + user->SendText(checkstr + " onip " + targuser->GetIPString()); + + for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++) + { + Channel* c = *i; + chliststr.append(c->GetPrefixChar(targuser)).append(c->name).append(" "); + } - chliststr = targuser->ChannelList(targuser); std::stringstream dump(chliststr); - ServerInstance->DumpText(user,checkstr + " onchans", dump); + user->SendText(checkstr + " onchans", dump); dumpExt(user, checkstr, targuser); } else if (targchan) { /* /check on a channel */ - ServerInstance->DumpText(user, checkstr + " timestamp " + timestring(targchan->age)); + user->SendText(checkstr + " timestamp " + timestring(targchan->age)); if (targchan->topic[0] != 0) { /* there is a topic, assume topic related information exists */ - ServerInstance->DumpText(user, checkstr + " topic " + targchan->topic); - ServerInstance->DumpText(user, checkstr + " topic_setby " + targchan->setby); - ServerInstance->DumpText(user, checkstr + " topic_setat " + timestring(targchan->topicset)); + user->SendText(checkstr + " topic " + targchan->topic); + user->SendText(checkstr + " topic_setby " + targchan->setby); + user->SendText(checkstr + " topic_setat " + timestring(targchan->topicset)); } - ServerInstance->DumpText(user, checkstr + " modes " + targchan->ChanModes(true)); - ServerInstance->DumpText(user, checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); + user->SendText(checkstr + " modes " + targchan->ChanModes(true)); + user->SendText(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); /* now the ugly bit, spool current members of a channel. :| */ @@ -150,9 +186,23 @@ class CommandCheck : public Command * Unlike Asuka, I define a clone as coming from the same host. --w00t */ snprintf(tmpbuf, MAXBUF, "%-3lu %s%s (%s@%s) %s ", 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()); - ServerInstance->DumpText(user, checkstr + " member " + tmpbuf); + user->SendText(checkstr + " member " + tmpbuf); } + irc::modestacker modestack(true); + std::string letter_b("b"); + for(BanList::iterator b = targchan->bans.begin(); b != targchan->bans.end(); ++b) + { + modestack.Push('b', b->data); + } + std::vector stackresult; + std::vector dummy; + while (modestack.GetStackedLine(stackresult)) + { + creator->ProtoSendMode(user, TYPE_CHANNEL, targchan, stackresult, dummy); + stackresult.clear(); + } + FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(targchan,creator,user)); dumpExt(user, checkstr, targchan); } else @@ -166,20 +216,20 @@ class CommandCheck : public Command 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 */ - ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); + user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } /* IP address */ else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0])) { /* same IP. */ - ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); + user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } } - ServerInstance->DumpText(user, checkstr + " matches " + ConvToStr(x)); + user->SendText(checkstr + " matches " + ConvToStr(x)); } - ServerInstance->DumpText(user, checkstr + " END " + parameters[0]); + user->SendText(checkstr + " END " + parameters[0]); return CMD_SUCCESS; } @@ -198,15 +248,35 @@ class ModuleCheck : public Module private: CommandCheck mycommand; public: - ModuleCheck(InspIRCd* Me) : Module(Me), mycommand(Me, this) + ModuleCheck() : mycommand(this) { - ServerInstance->AddCommand(&mycommand); + } + + void init() + { + ServerInstance->Modules->AddService(mycommand); } ~ModuleCheck() { } + void ProtoSendMode(void* uv, TargetTypeFlags, void*, const std::vector& result, const std::vector&) + { + 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() { return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON);