-/* +------------------------------------+
- * | 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 <danieldg@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
*
- * 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"
-/* $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
*/
{
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 dumpExt(User* user, std::string checkstr, Extensible* ext)
+ 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->key + " " + value);
- else if (!item->key.empty())
- dumpkeys << " " << item->key;
+ user->SendText(checkstr + " meta:" + item->name + " " + value);
+ else if (!item->name.empty())
+ dumpkeys << " " << item->name;
}
if (!dumpkeys.str().empty())
user->SendText(checkstr + " metadata", dumpkeys);
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]);
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 + " uid " + targuser->uuid);
user->SendText(checkstr + " signon " + timestring(targuser->signon));
user->SendText(checkstr + " nickts " + timestring(targuser->age));
- if (IS_LOCAL(targuser))
+ if (loctarg)
user->SendText(checkstr + " lastmsg " + timestring(targuser->idle_lastmsg));
if (IS_AWAY(targuser))
if (IS_OPER(targuser))
{
+ OperInfo* oper = targuser->oper;
/* user is an oper of type ____ */
- user->SendText(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<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);
+ }
}
- LocalUser* loctarg = IS_LOCAL(targuser);
if (loctarg)
{
- user->SendText(checkstr + " clientaddr " + irc::sockets::satouser(&loctarg->client_sa));
- user->SendText(checkstr + " serveraddr " + irc::sockets::satouser(&loctarg->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 = loctarg->GetClass()->name;
if (!classname.empty())
/* /check on a channel */
user->SendText(checkstr + " 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 + " member " + tmpbuf);
}
+ irc::modestacker modestack(true);
+ for(BanList::iterator b = targchan->bans.begin(); b != targchan->bans.end(); ++b)
+ {
+ modestack.Push('b', b->data);
+ }
+ std::vector<std::string> stackresult;
+ std::vector<TranslateType> 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
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());
+ 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. */
- user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
+ user->SendText(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost() + " " + a->second->GetIPString() + " " + a->second->fullname);
}
}
public:
ModuleCheck() : mycommand(this)
{
- ServerInstance->AddCommand(&mycommand);
+ }
+
+ void init()
+ {
+ ServerInstance->Modules->AddService(mycommand);
}
~ModuleCheck()
{
}
+ 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()
{
- return Version("CHECK command, view user/channel details", VF_VENDOR|VF_OPTCOMMON);
+ return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON);
}
};