X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_check.cpp;h=4b960e18b6b6e8dddd94fefa7f0b88274997ec4c;hb=fa452641bf37077fcda964d59e404a76e1fb13e5;hp=5e7b4847cf0ee7968b31cafb8a9e16964ee54556;hpb=33ed72a1dfae595132dd50c760b6a312ef2ce8fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 5e7b4847c..4b960e18b 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -2,58 +2,67 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "message.h" -#include "commands.h" #include "inspircd.h" -#include "helperfuncs.h" /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */ -extern user_hash clientlist; -extern bool match(const char *, const char *); - -static Server *Srv; - -class cmd_check : public command_t +/** Handle /CHECK + */ +class CommandCheck : public Command { public: - cmd_check() : command_t("CHECK", 'o', 1) + CommandCheck(Module* parent) : Command(parent,"CHECK", 1) { - this->source = "m_check.so"; + flags_needed = 'o'; syntax = "||| "; } - void Handle (char **parameters, int pcnt, userrec *user) + std::string timestring(time_t time) { - userrec *targuser; - chanrec *targchan; - std::string checkstr; - std::string chliststr; - char timebuf[60]; - struct tm *mytime; + 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, 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()) + ServerInstance->DumpText(user, checkstr + " meta:" + item->key + " " + value); + else if (!item->key.empty()) + dumpkeys << " " << item->key; + } + if (!dumpkeys.str().empty()) + ServerInstance->DumpText(user,checkstr + " metadata", dumpkeys); + } + + CmdResult Handle (const std::vector ¶meters, User *user) + { + if (parameters.size() > 1 && parameters[1] != ServerInstance->Config->ServerName.c_str()) + return CMD_SUCCESS; + User *targuser; + Channel *targchan; + std::string checkstr; + std::string chliststr; - checkstr = "304 " + std::string(user->nick) + " :CHECK"; + checkstr = std::string(":") + ServerInstance->Config->ServerName + " 304 " + std::string(user->nick) + " :CHECK"; - targuser = Srv->FindNick(std::string(parameters[0])); - targchan = Srv->FindChannel(std::string(parameters[0])); + targuser = ServerInstance->FindNick(parameters[0]); + targchan = ServerInstance->FindChan(parameters[0]); /* * Syntax of a /check reply: @@ -62,187 +71,149 @@ class cmd_check : public command_t * :server.name 304 target :CHECK END */ - Srv->SendTo(NULL, user, checkstr + " START " + parameters[0]); + ServerInstance->DumpText(user, checkstr + " START " + parameters[0]); if (targuser) { /* /check on a user */ - Srv->SendTo(NULL, user, checkstr + " nuh " + targuser->GetFullHost()); - Srv->SendTo(NULL, user, checkstr + " realnuh " + targuser->GetFullRealHost()); - Srv->SendTo(NULL, user, checkstr + " realname " + targuser->fullname); - Srv->SendTo(NULL, user, checkstr + " modes +" + targuser->FormatModes()); - Srv->SendTo(NULL, user, checkstr + " server " + targuser->server); - if (targuser->awaymsg[0] != 0) + 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)); + + if (IS_AWAY(targuser)) { /* user is away */ - Srv->SendTo(NULL, user, checkstr + " awaymsg " + targuser->awaymsg); + ServerInstance->DumpText(user, checkstr + " awaytime " + timestring(targuser->awaytime)); + ServerInstance->DumpText(user, checkstr + " awaymsg " + targuser->awaymsg); } - if (targuser->oper[0] != 0) + + if (IS_OPER(targuser)) { /* user is an oper of type ____ */ - Srv->SendTo(NULL, user, checkstr + " opertype " + targuser->oper); + ServerInstance->DumpText(user, checkstr + " opertype " + irc::Spacify(targuser->oper.c_str())); } + if (IS_LOCAL(targuser)) { - /* port information is only held for a local user! */ - Srv->SendTo(NULL, user, checkstr + " onport " + ConvToStr(targuser->port)); + ServerInstance->DumpText(user, checkstr + " clientaddr " + irc::sockets::satouser(&targuser->client_sa)); + ServerInstance->DumpText(user, checkstr + " serveraddr " + irc::sockets::satouser(&targuser->server_sa)); + + std::string classname = targuser->GetClass()->name; + if (!classname.empty()) + ServerInstance->DumpText(user, checkstr + " connectclass " + classname); + } + else + ServerInstance->DumpText(user, 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 = chlist(targuser, targuser); std::stringstream dump(chliststr); - Srv->DumpText(user,checkstr + " onchans ", dump); + ServerInstance->DumpText(user,checkstr + " onchans", dump); + + dumpExt(user, checkstr, targuser); } else if (targchan) { /* /check on a channel */ - time_t creation_time = targchan->created; - time_t topic_time = targchan->topicset; - - mytime = gmtime(&creation_time); - strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime); - Srv->SendTo(NULL, user, checkstr + " created " + timebuf); + ServerInstance->DumpText(user, checkstr + " timestamp " + timestring(targchan->age)); if (targchan->topic[0] != 0) { /* there is a topic, assume topic related information exists */ - Srv->SendTo(NULL, user, checkstr + " topic " + targchan->topic); - Srv->SendTo(NULL, user, checkstr + " topic_setby " + targchan->setby); - mytime = gmtime(&topic_time); - strftime(timebuf, 59, "%Y/%m/%d - %H:%M:%S", mytime); - Srv->SendTo(NULL, user, checkstr + " topic_setat " + timebuf); + ServerInstance->DumpText(user, checkstr + " topic " + targchan->topic); + ServerInstance->DumpText(user, checkstr + " topic_setby " + targchan->setby); + ServerInstance->DumpText(user, checkstr + " topic_setat " + timestring(targchan->topicset)); } - Srv->SendTo(NULL, user, checkstr + " modes " + chanmodes(targchan, true)); - Srv->SendTo(NULL, user, checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); - + ServerInstance->DumpText(user, checkstr + " modes " + targchan->ChanModes(true)); + ServerInstance->DumpText(user, 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 list[MAXBUF]; char tmpbuf[MAXBUF]; - char* ptr = list; - int flags = cflags(i->second, targchan); /* - * find how many connections from this user's IP -- unlike Asuka, - * I define a clone as coming from the same host. --w00t + * Unlike Asuka, I define a clone as coming from the same host. --w00t */ - sprintf(ptr, "%lu ", FindMatchingGlobal(i->second)); - - if (flags & UCMODE_OP) - { - strcat(ptr, "@"); - } - - if (flags & UCMODE_HOP) - { - strcat(ptr, "%"); - } - - if (flags & UCMODE_VOICE) - { - strcat(ptr, "+"); - } - - sprintf(tmpbuf, "%s (%s@%s) %s ", i->second->nick, i->second->ident, i->second->dhost, i->second->fullname); - strcat(ptr, tmpbuf); - - Srv->SendTo(NULL, user, checkstr + " member " + ptr); + 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); } + + dumpExt(user, checkstr, targchan); } else { /* /check on an IP address, or something that doesn't exist */ - struct sockaddr_in addr; long x = 0; - if (inet_aton(parameters[0], &addr.sin_addr) == 0) + /* hostname or other */ + for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++) { - /* hostname or other */ - for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.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)) { - if (match(a->second->host, parameters[0]) || match(a->second->dhost, parameters[0])) - { - /* host or vhost matches mask */ - Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); - } + /* host or vhost matches mask */ + ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } - } - else - { /* IP address */ - for (user_hash::const_iterator a = clientlist.begin(); a != clientlist.end(); a++) + else if (InspIRCd::MatchCIDR(a->second->GetIPString(), parameters[0])) { - if (addr.sin_addr.s_addr == a->second->ip4.s_addr) - { - /* same IP. */ - Srv->SendTo(NULL, user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); - } + /* same IP. */ + ServerInstance->DumpText(user, checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost()); } } - Srv->SendTo(NULL, user, checkstr + " matches " + ConvToStr(x)); + ServerInstance->DumpText(user, checkstr + " matches " + ConvToStr(x)); } - Srv->SendTo(NULL, user, checkstr + " END " + std::string(parameters[0])); - } -}; + ServerInstance->DumpText(user, checkstr + " END " + parameters[0]); - -class ModuleCheck : public Module -{ - private: - cmd_check *mycommand; - public: - ModuleCheck(Server* Me) : Module::Module(Me) - { - Srv = Me; - mycommand = new cmd_check(); - Srv->AddCommand(mycommand); - } - - virtual ~ModuleCheck() - { - } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 0, VF_VENDOR); + return CMD_SUCCESS; } - void Implements(char* List) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - /* we don't hook anything, nothing required */ + if (parameters.size() > 1) + return ROUTE_OPT_UCAST(parameters[1]); + return ROUTE_LOCALONLY; } - }; - -class ModuleCheckFactory : public ModuleFactory +class ModuleCheck : public Module { + private: + CommandCheck mycommand; public: - ModuleCheckFactory() + ModuleCheck() : mycommand(this) { + ServerInstance->AddCommand(&mycommand); } - - ~ModuleCheckFactory() + + ~ModuleCheck() { } - - virtual Module * CreateModule(Server* Me) + + Version GetVersion() { - return new ModuleCheck(Me); + return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON); } - }; -extern "C" void * init_module( void ) -{ - return new ModuleCheckFactory; -} - +MODULE_INIT(ModuleCheck)