X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=9c5c414f195473386d4b7bf2b2ad95061a694d10;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=7f85b186972a09245c693099b4a1307ffbbab70a;hpb=0377d937c5d1bf20fa0c29d4a41c7fd89502ab38;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 7f85b1869..9c5c414f1 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -1,57 +1,68 @@ -/* +------------------------------------+ - * | 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 Dennis Friis + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2006 Craig Edwards * - * 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" -/* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */ +/* $ModDesc: Provides the /CHECK command to retrieve information on a user, channel, hostname or IP address */ + +#include "inspircd.h" /** Handle /CHECK */ class CommandCheck : public Command { public: - std::set meta_seen; - 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) { char timebuf[60]; struct tm *mytime = gmtime(&time); - strftime(timebuf, 59, "%Y-%m-%d %H:%M:%S UTC (%s)", mytime); - return std::string(timebuf); + strftime(timebuf, 59, "%Y-%m-%d %H:%M:%S UTC (", mytime); + std::string ret(timebuf); + ret.append(ConvToStr(time)).push_back(')'); + return ret; } - void dumpExtra(User* user, std::string checkstr, Extensible* ext) + void dumpExt(User* user, const std::string& checkstr, Extensible* ext) { - std::deque extlist; - ext->GetExtList(extlist); std::stringstream dumpkeys; - for(std::deque::iterator i = extlist.begin(); i != extlist.end(); i++) + for(Extensible::ExtensibleStore::const_iterator i = ext->GetExtList().begin(); i != ext->GetExtList().end(); i++) { - if (meta_seen.find(*i) == meta_seen.end()) - dumpkeys << " " << *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; } - meta_seen.clear(); 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; @@ -59,7 +70,7 @@ class CommandCheck : public Command std::string checkstr; std::string chliststr; - checkstr = std::string(":") + ServerInstance->Config->ServerName + " 304 " + std::string(user->nick) + " :CHECK"; + checkstr = ":" + ServerInstance->Config->ServerName + " 304 " + user->nick + " :CHECK"; targuser = ServerInstance->FindNick(parameters[0]); targchan = ServerInstance->FindChan(parameters[0]); @@ -71,89 +82,138 @@ 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); - FOREACH_MOD_I(ServerInstance,I_OnSyncUser,OnSyncUser(targuser,creator,(void*)user)); - dumpExtra(user, checkstr, targuser); + 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. :| */ - CUList *ulist= targchan->GetUsers(); + const UserMembList *ulist= targchan->GetUsers(); /* note that unlike /names, we do NOT check +i vs in the channel */ - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) { char tmpbuf[MAXBUF]; /* * 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); } - FOREACH_MOD_I(ServerInstance,I_OnSyncChannel,OnSyncChannel(targchan,creator,(void*)user)); - dumpExtra(user, checkstr, targchan); + irc::modestacker modestack(true); + 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 +226,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() + " " + a->second->GetIPString() + " " + a->second->fullname); } /* 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() + " " + a->second->GetIPString() + " " + a->second->fullname); } } - 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,37 +258,38 @@ class ModuleCheck : public Module private: CommandCheck mycommand; public: - ModuleCheck(InspIRCd* Me) : Module(Me), mycommand(Me, this) + ModuleCheck() : mycommand(this) { - ServerInstance->AddCommand(&mycommand); } - virtual ~ModuleCheck() + void init() { + ServerInstance->Modules->AddService(mycommand); } - virtual Version GetVersion() + ~ModuleCheck() { - return Version("$Id$", VF_VENDOR|VF_OPTCOMMON, API_VERSION); } - virtual void ProtoSendMetaData(void* opaque, Extensible* target, const std::string& name, const std::string& value) + void ProtoSendMode(void* uv, TargetTypeFlags, void*, const std::vector& result, const std::vector&) { - User* user = static_cast(opaque); - ServerInstance->DumpText(user, std::string(":") + ServerInstance->Config->ServerName + " 304 " + std::string(user->nick) - + " :CHECK meta:" + name + " " + value); - mycommand.meta_seen.insert(name); + 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); } - virtual std::string ProtoTranslate(Extensible* item) + Version GetVersion() { - User* u = dynamic_cast(item); - Channel* c = dynamic_cast(item); - if (u) - return u->nick; - if (c) - return c->name; - return "?"; + return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON); } };