X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_check.cpp;h=714f0bddd86b073575231226c417396d1d20577d;hb=HEAD;hp=ecfe4dcb4ab7942f2abadf39e5acdf8ddcecf698;hpb=f434c03f518d8aa9e7ee088e28125a947e6c95a5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index ecfe4dcb4..714f0bddd 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -1,10 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2020 Matt Schatz + * Copyright (C) 2013-2016 Attila Molnar + * Copyright (C) 2013, 2017-2021 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2006-2007 Robin Burchell - * Copyright (C) 2006 Craig Edwards + * Copyright (C) 2006-2008 Robin Burchell * * 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 @@ -67,16 +72,21 @@ class CheckContext User* GetUser() const { return user; } - void DumpListMode(const ListModeBase::ModeList* list) + void DumpListMode(ListModeBase* mode, Channel* chan) { + const ListModeBase::ModeList* list = mode->GetList(chan); 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(); + { + CheckContext::List listmode(*this, "listmode"); + listmode.Add(ConvToStr(mode->GetModeChar())); + listmode.Add(i->mask); + listmode.Add(i->setter); + listmode.Add(FormatTime(i->time)); + listmode.Flush(); + } } void DumpExt(Extensible* ext) @@ -85,7 +95,7 @@ class CheckContext 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); + std::string value = item->ToHuman(ext, i->second); if (!value.empty()) Write("meta:" + item->name, value); else if (!item->name.empty()) @@ -136,12 +146,22 @@ class CommandCheck : public Command return ret; } + static std::string GetAllowedOperOnlySnomasks(LocalUser* user) + { + std::string ret; + for (unsigned char sno = 'A'; sno <= 'z'; ++sno) + if (ServerInstance->SNO->IsSnomaskUsable(sno) && user->HasSnomaskPermission(sno)) + ret.push_back(sno); + return ret; + } + public: CommandCheck(Module* parent) : Command(parent,"CHECK", 1) , snomaskmode(parent, "snomask") { - flags_needed = 'o'; syntax = "||| "; + flags_needed = 'o'; + syntax = "||| []"; } CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE @@ -151,7 +171,6 @@ class CommandCheck : public Command User *targuser; Channel *targchan; - std::string chliststr; targuser = ServerInstance->FindNick(parameters[0]); targchan = ServerInstance->FindChan(parameters[0]); @@ -196,16 +215,11 @@ class CommandCheck : public Command context.Write("opertype", oper->name); if (loctarg) { - std::string umodes = GetAllowedOperOnlyModes(loctarg, MODETYPE_USER); - std::string cmodes = GetAllowedOperOnlyModes(loctarg, MODETYPE_CHANNEL); - context.Write("modeperms", "user=" + umodes + " channel=" + cmodes); - - CheckContext::List opcmdlist(context, "commandperms"); - opcmdlist.Add(oper->AllowedOperCommands.ToString()); - opcmdlist.Flush(); - CheckContext::List privlist(context, "permissions"); - privlist.Add(oper->AllowedPrivs.ToString()); - privlist.Flush(); + context.Write("chanmodeperms", GetAllowedOperOnlyModes(loctarg, MODETYPE_CHANNEL)); + context.Write("usermodeperms", GetAllowedOperOnlyModes(loctarg, MODETYPE_USER)); + context.Write("snomaskperms", GetAllowedOperOnlySnomasks(loctarg)); + context.Write("commandperms", oper->AllowedOperCommands.ToString()); + context.Write("permissions", oper->AllowedPrivs.ToString()); } } @@ -217,6 +231,8 @@ class CommandCheck : public Command std::string classname = loctarg->GetClass()->name; if (!classname.empty()) context.Write("connectclass", classname); + + context.Write("exempt", loctarg->exempt ? "yes" : "no"); } else context.Write("onip", targuser->GetIPString()); @@ -225,13 +241,7 @@ class CommandCheck : public Command for (User::ChanList::iterator i = targuser->chans.begin(); i != targuser->chans.end(); i++) { 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(); + chanlist.Add(memb->GetAllPrefixChars() + memb->chan->name); } chanlist.Flush(); @@ -241,7 +251,7 @@ class CommandCheck : public Command else if (targchan) { /* /check on a channel */ - context.Write("timestamp", targchan->age); + context.Write("createdat", targchan->age); if (!targchan->topic.empty()) { @@ -262,17 +272,17 @@ class CommandCheck : public Command 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 - */ + * Unlike Asuka, I define a clone as coming from the same host. --w00t + */ 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().c_str(), i->first->nick.c_str(), - i->first->ident.c_str(), i->first->GetDisplayedHost().c_str(), i->first->GetRealName().c_str())); + context.Write("member", InspIRCd::Format("%u %s%s (%s)", clonecount.global, + i->second->GetAllPrefixChars().c_str(), i->first->GetFullHost().c_str(), + i->first->GetRealName().c_str())); } const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes(); for (ModeParser::ListModeList::const_iterator i = listmodes.begin(); i != listmodes.end(); ++i) - context.DumpListMode((*i)->GetList(targchan)); + context.DumpListMode(*i, targchan); context.DumpExt(targchan); } @@ -323,7 +333,7 @@ class ModuleCheck : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("CHECK command, view user, channel, IP address or hostname information", VF_VENDOR|VF_OPTCOMMON); + return Version("Adds the /CHECK command which allows server operators to look up details about a channel, user, IP address, or hostname.", VF_VENDOR|VF_OPTCOMMON); } };