X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=f15760dca27f1db4a37e698f18fd14ce456ca442;hb=df4afba6c23c939af1013582c94138832017af4e;hp=0204ee77f0f0b4312e83fafda501cdea12bd2a7e;hpb=1200d6285b1d64699c6fa2c8241e2ee40f52d2a3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 0204ee77f..f15760dca 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -1,173 +1,204 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008-2009 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 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" -#include -#include -#include -/* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */ +enum +{ + RPL_ACCEPTLIST = 281, + RPL_ENDOFACCEPT = 282, + ERR_ACCEPTFULL = 456, + ERR_ACCEPTEXIST = 457, + ERR_ACCEPTNOT = 458, + ERR_TARGUMODEG = 716, + RPL_TARGNOTIFY = 717, + RPL_UMODEGMSG = 718 +}; -class callerid_data : public classbase +class callerid_data { public: time_t lastnotify; + + /** Users I accept messages from + */ std::set accepting; + /** Users who list me as accepted + */ + std::list wholistsme; + callerid_data() : lastnotify(0) { } - callerid_data(const std::string& str, InspIRCd* ServerInstance) - { - irc::commasepstream s(str); - std::string tok; - if (s.GetToken(tok)) - { - lastnotify = ConvToInt(tok); - } - while (s.GetToken(tok)) - { - if (tok.empty()) - { - continue; - } - User* u = ServerInstance->FindUUID(tok); - if (!u) - { - u = ServerInstance->FindNick(tok); - } - if (!u) - { - continue; - } - accepting.insert(u); - } - } - std::string ToString(bool displayable) const + std::string ToString(SerializeFormat format) const { std::ostringstream oss; oss << lastnotify; for (std::set::const_iterator i = accepting.begin(); i != accepting.end(); ++i) { + User* u = *i; // Encode UIDs. - oss << "," << (displayable ? (*i)->nick : (*i)->uuid); + oss << "," << (format == FORMAT_USER ? u->nick : u->uuid); } - oss << std::ends; return oss.str(); } }; -callerid_data* GetData(User* who, bool extend = true) +struct CallerIDExtInfo : public ExtensionItem { - callerid_data* dat; - if (who->GetExt("callerid_data", dat)) - return dat; - else + CallerIDExtInfo(Module* parent) + : ExtensionItem("callerid_data", parent) { - if (extend) + } + + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const + { + std::string ret; + if (format != FORMAT_NETWORK) { - dat = new callerid_data; - who->Extend("callerid_data", dat); - return dat; + callerid_data* dat = static_cast(item); + ret = dat->ToString(format); } - else - return NULL; + return ret; } -} -void RemoveData(User* who) -{ - callerid_data* dat; - who->GetExt("callerid_data", dat); + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + { + if (format == FORMAT_NETWORK) + return; - if (!dat) - return; + callerid_data* dat = new callerid_data; + irc::commasepstream s(value); + std::string tok; + if (s.GetToken(tok)) + dat->lastnotify = ConvToInt(tok); - who->Shrink("callerid_data"); - delete dat; -} + while (s.GetToken(tok)) + { + User *u = ServerInstance->FindNick(tok); + if ((u) && (u->registered == REG_ALL) && (!u->quitting) && (!IS_SERVER(u))) + { + if (dat->accepting.insert(u).second) + { + callerid_data* other = this->get(u, true); + other->wholistsme.push_back(dat); + } + } + } -void RemoveFromAllAccepts(InspIRCd* ServerInstance, User* who) -{ - for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); ++i) + void* old = set_raw(container, dat); + if (old) + this->free(old); + } + + callerid_data* get(User* user, bool create) { - callerid_data* dat = GetData(i->second, false); + callerid_data* dat = static_cast(get_raw(user)); + if (create && !dat) + { + dat = new callerid_data; + set_raw(user, dat); + } + return dat; + } - if (!dat) - continue; + void free(void* item) + { + callerid_data* dat = static_cast(item); - std::set::iterator iter = dat->accepting.find(who); + // We need to walk the list of users on our accept list, and remove ourselves from their wholistsme. + for (std::set::iterator it = dat->accepting.begin(); it != dat->accepting.end(); it++) + { + callerid_data *targ = this->get(*it, false); - if (iter == dat->accepting.end()) - continue; + if (!targ) + { + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)"); + continue; // shouldn't happen, but oh well. + } - dat->accepting.erase(iter); + std::list::iterator it2 = std::find(targ->wholistsme.begin(), targ->wholistsme.end(), dat); + if (it2 != targ->wholistsme.end()) + targ->wholistsme.erase(it2); + else + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)"); + } + delete dat; } -} +}; class User_g : public SimpleUserModeHandler { public: - User_g(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'g') { } + User_g(Module* Creator) : SimpleUserModeHandler(Creator, "callerid", 'g') { } }; class CommandAccept : public Command { -private: - unsigned int& maxaccepts; + /** Pair: first is the target, second is true to add, false to remove + */ + typedef std::pair ACCEPTAction; + + static ACCEPTAction GetTargetAndAction(std::string& tok, User* cmdfrom = NULL) + { + bool remove = (tok[0] == '-'); + if ((remove) || (tok[0] == '+')) + tok.erase(tok.begin()); + + User* target; + if (!cmdfrom || !IS_LOCAL(cmdfrom)) + target = ServerInstance->FindNick(tok); + else + target = ServerInstance->FindNickOnly(tok); + + if ((!target) || (target->registered != REG_ALL) || (target->quitting) || (IS_SERVER(target))) + target = NULL; + + return std::make_pair(target, !remove); + } + public: - CommandAccept(InspIRCd* Instance, unsigned int& max) : Command(Instance, "ACCEPT", 0, 1), maxaccepts(max) + CallerIDExtInfo extInfo; + unsigned int maxaccepts; + CommandAccept(Module* Creator) : Command(Creator, "ACCEPT", 1), + extInfo(Creator) { - source = "m_callerid.so"; - syntax = "{[+|-]}|*}"; - TRANSLATE2(TR_CUSTOM, TR_END); + allow_empty_last_param = false; + syntax = "*|(+|-)[,(+|-) ...]"; + TRANSLATE1(TR_CUSTOM); } - virtual void EncodeParameter(std::string& parameter, int index) + void EncodeParameter(std::string& parameter, int index) { - if (index != 0) + // Send lists as-is (part of 2.0 compat) + if (parameter.find(',') != std::string::npos) return; - std::string out = ""; - irc::commasepstream nicks(parameter); - std::string tok; - while (nicks.GetToken(tok)) - { - if (tok == "*") - { - continue; // Drop list requests, since remote servers ignore them anyway. - } - if (!out.empty()) - out.append(","); - bool dash = false; - if (tok[0] == '-') - { - dash = true; - tok.erase(0, 1); // Remove the dash. - } - User* u = ServerInstance->FindNick(tok); - if (u) - { - if (dash) - out.append("-"); - out.append(u->uuid); - } - else - { - if (dash) - out.append("-"); - out.append(tok); - } - } - parameter = out; + + // Convert a [+|-] into a [-] + ACCEPTAction action = GetTargetAndAction(parameter); + if (!action.first) + return; + + parameter = (action.second ? "" : "-") + action.first->uuid; } /** Will take any number of nicks (up to MaxTargets), which can be seperated by commas. @@ -177,253 +208,237 @@ public: */ CmdResult Handle(const std::vector ¶meters, User* user) { - if (ServerInstance->Parser->LoopCall(user, this, parameters, 0)) + if (CommandParser::LoopCall(user, this, parameters, 0)) return CMD_SUCCESS; + /* Even if callerid mode is not set, we let them manage their ACCEPT list so that if they go +g they can * have a list already setup. */ - std::string tok = parameters[0]; - - if (tok == "*") + if (parameters[0] == "*") { - if (IS_LOCAL(user)) - ListAccept(user); - return CMD_LOCALONLY; + ListAccept(user); + return CMD_SUCCESS; } - else if (tok[0] == '-') + + std::string tok = parameters[0]; + ACCEPTAction action = GetTargetAndAction(tok, user); + if (!action.first) { - User* whotoremove = ServerInstance->FindNick(tok.substr(1)); - if (whotoremove) - return (RemoveAccept(user, whotoremove, false) ? CMD_SUCCESS : CMD_FAILURE); - else - return CMD_FAILURE; + user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", tok.c_str()); + return CMD_FAILURE; } + + if ((!IS_LOCAL(user)) && (!IS_LOCAL(action.first))) + // Neither source nor target is local, forward the command to the server of target + return CMD_SUCCESS; + + // The second item in the pair is true if the first char is a '+' (or nothing), false if it's a '-' + if (action.second) + return (AddAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE); else - { - User* whotoadd = ServerInstance->FindNick(tok[0] == '+' ? tok.substr(1) : tok); - if (whotoadd) - return (AddAccept(user, whotoadd, false) ? CMD_SUCCESS : CMD_FAILURE); - else - { - user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), tok.c_str()); - return CMD_FAILURE; - } - } + return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE); + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + // There is a list in parameters[0] in two cases: + // Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists, + // we don't split those but broadcast them, as before. + // + // Or if the source is local then LoopCall() runs OnPostCommand() after each entry in the list, + // meaning the linking module has sent an ACCEPT already for each entry in the list to the + // appropiate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere. + if ((!IS_LOCAL(user)) && (parameters[0].find(',') != std::string::npos)) + return ROUTE_BROADCAST; + + // Find the target + std::string targetstring = parameters[0]; + ACCEPTAction action = GetTargetAndAction(targetstring, user); + if (!action.first) + // Target is a "*" or source is local and the target is a list of nicks + return ROUTE_LOCALONLY; + + // Route to the server of the target + return ROUTE_UNICAST(action.first->server); } void ListAccept(User* user) { - callerid_data* dat = GetData(user, false); + callerid_data* dat = extInfo.get(user, false); if (dat) { for (std::set::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i) - user->WriteNumeric(281, "%s %s", user->nick.c_str(), (*i)->nick.c_str()); + user->WriteNumeric(RPL_ACCEPTLIST, (*i)->nick); } - user->WriteNumeric(282, "%s :End of ACCEPT list", user->nick.c_str()); + user->WriteNumeric(RPL_ENDOFACCEPT, ":End of ACCEPT list"); } - bool AddAccept(User* user, User* whotoadd, bool quiet) + bool AddAccept(User* user, User* whotoadd) { - callerid_data* dat = GetData(user, true); + // Add this user to my accept list first, so look me up.. + callerid_data* dat = extInfo.get(user, true); if (dat->accepting.size() >= maxaccepts) { - if (!quiet) - user->WriteNumeric(456, "%s :Accept list is full (limit is %d)", user->nick.c_str(), maxaccepts); - + user->WriteNumeric(ERR_ACCEPTFULL, ":Accept list is full (limit is %d)", maxaccepts); return false; } if (!dat->accepting.insert(whotoadd).second) { - if (!quiet) - user->WriteNumeric(457, "%s %s :is already on your accept list", user->nick.c_str(), whotoadd->nick.c_str()); - + user->WriteNumeric(ERR_ACCEPTEXIST, "%s :is already on your accept list", whotoadd->nick.c_str()); return false; } - user->WriteServ("NOTICE %s :%s is now on your accept list", user->nick.c_str(), whotoadd->nick.c_str()); + // Now, look them up, and add me to their list + callerid_data *targ = extInfo.get(whotoadd, true); + targ->wholistsme.push_back(dat); + + user->WriteNotice(whotoadd->nick + " is now on your accept list"); return true; } - bool RemoveAccept(User* user, User* whotoremove, bool quiet) + bool RemoveAccept(User* user, User* whotoremove) { - callerid_data* dat = GetData(user, false); + // Remove them from my list, so look up my list.. + callerid_data* dat = extInfo.get(user, false); if (!dat) { - if (!quiet) - user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str()); - + user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str()); return false; } std::set::iterator i = dat->accepting.find(whotoremove); if (i == dat->accepting.end()) { - if (!quiet) - user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str()); - + user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str()); return false; } - user->WriteServ("NOTICE %s :%s is no longer on your accept list", user->nick.c_str(), whotoremove->nick.c_str()); dat->accepting.erase(i); + + // Look up their list to remove me. + callerid_data *dat2 = extInfo.get(whotoremove, false); + if (!dat2) + { + // How the fuck is this possible. + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)"); + return false; + } + + std::list::iterator it = std::find(dat2->wholistsme.begin(), dat2->wholistsme.end(), dat); + if (it != dat2->wholistsme.end()) + // Found me! + dat2->wholistsme.erase(it); + else + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)"); + + + user->WriteNotice(whotoremove->nick + " is no longer on your accept list"); return true; } }; class ModuleCallerID : public Module { -private: - CommandAccept *mycommand; - User_g* myumode; + CommandAccept cmd; + User_g myumode; // Configuration variables: - unsigned int maxaccepts; // Maximum ACCEPT entries. bool operoverride; // Operators can override callerid. bool tracknick; // Allow ACCEPT entries to update with nick changes. unsigned int notify_cooldown; // Seconds between notifications. -public: - ModuleCallerID(InspIRCd* Me) : Module(Me) + /** Removes a user from all accept lists + * @param who The user to remove from accepts + */ + void RemoveFromAllAccepts(User* who) { - OnRehash(NULL, ""); - mycommand = new CommandAccept(ServerInstance, maxaccepts); - myumode = new User_g(ServerInstance); + // First, find the list of people who have me on accept + callerid_data *userdata = cmd.extInfo.get(who, false); + if (!userdata) + return; - if (!ServerInstance->Modes->AddMode(myumode)) - { - delete mycommand; - delete myumode; - throw ModuleException("Could not add usermode +g"); - } - try - { - ServerInstance->AddCommand(mycommand); - } - catch (const ModuleException& e) + // Iterate over the list of people who accept me, and remove all entries + for (std::list::iterator it = userdata->wholistsme.begin(); it != userdata->wholistsme.end(); it++) { - delete mycommand; - delete myumode; - throw ModuleException("Could not add command!"); + callerid_data *dat = *(it); + + // Find me on their callerid list + std::set::iterator it2 = dat->accepting.find(who); + + if (it2 != dat->accepting.end()) + dat->accepting.erase(it2); + else + ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)"); } - Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnCleanup }; - ServerInstance->Modules->Attach(eventlist, this, 7); + userdata->wholistsme.clear(); } - virtual ~ModuleCallerID() +public: + ModuleCallerID() : cmd(this), myumode(this) { - ServerInstance->Modes->DelMode(myumode); - delete myumode; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR); } - virtual void On005Numeric(std::string& output) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output += " CALLERID=g"; + tokens["CALLERID"] = "g"; } - int PreText(User* user, User* dest, std::string& text, bool notice) + ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE { - if (!dest->IsModeSet('g')) - return 0; + if (!IS_LOCAL(user) || target_type != TYPE_USER) + return MOD_RES_PASSTHRU; + + User* dest = static_cast(voiddest); + if (!dest->IsModeSet(myumode) || (user == dest)) + return MOD_RES_PASSTHRU; - if (operoverride && IS_OPER(user)) - return 0; + if (operoverride && user->IsOper()) + return MOD_RES_PASSTHRU; - callerid_data* dat = GetData(dest, true); + callerid_data* dat = cmd.extInfo.get(dest, true); std::set::iterator i = dat->accepting.find(user); if (i == dat->accepting.end()) { - time_t now = time(NULL); + time_t now = ServerInstance->Time(); /* +g and *not* accepted */ - user->WriteNumeric(716, "%s %s :is in +g mode (server-side ignore).", user->nick.c_str(), dest->nick.c_str()); + user->WriteNumeric(ERR_TARGUMODEG, "%s :is in +g mode (server-side ignore).", dest->nick.c_str()); if (now > (dat->lastnotify + (time_t)notify_cooldown)) { - user->WriteNumeric(717, "%s %s :has been informed that you messaged them.", user->nick.c_str(), dest->nick.c_str()); - dest->WriteNumeric(718, "%s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.", dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str()); + user->WriteNumeric(RPL_TARGNOTIFY, "%s :has been informed that you messaged them.", dest->nick.c_str()); + dest->SendText(":%s %03d %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.", + ServerInstance->Config->ServerName.c_str(), RPL_UMODEGMSG, dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str()); dat->lastnotify = now; } - return 1; + return MOD_RES_DENY; } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList &exempt_list) - { - if (IS_LOCAL(user) && target_type == TYPE_USER) - return PreText(user, (User*)dest, text, true); - - return 0; - } - - virtual int OnUserPreNotice(User* user, void* dest, int target_type, std::string& text, char status, CUList &exempt_list) - { - if (IS_LOCAL(user) && target_type == TYPE_USER) - return PreText(user, (User*)dest, text, true); - - return 0; - } - - virtual void OnCleanup(int type, void* item) - { - if (type != TYPE_USER) - return; - - User* u = (User*)item; - /* Cleanup only happens on unload (before dtor), so keep this O(n) instead of O(n^2) which deferring to OnUserQuit would do. */ - RemoveData(u); - } - - virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string& extname, bool displayable) - { - if (extname == "callerid_data") - { - callerid_data* dat = GetData(user, false); - if (dat) - { - std::string str = dat->ToString(displayable); - proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, str); - } - } - } - - virtual void OnDecodeMetaData(int target_type, void* target, const std::string& extname, const std::string& extdata) - { - if (target_type == TYPE_USER && extname == "callerid_data") - { - User* u = (User*)target; - callerid_data* dat = new callerid_data(extdata, ServerInstance); - u->Extend("callerid_data", dat); - } - } - - virtual int OnUserPreNick(User* user, const std::string& newnick) + void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE { if (!tracknick) - RemoveFromAllAccepts(ServerInstance, user); - return 0; + RemoveFromAllAccepts(user); } - virtual void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) + void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE { - RemoveData(user); - RemoveFromAllAccepts(ServerInstance, user); + RemoveFromAllAccepts(user); } - virtual void OnRehash(User* user, const std::string& parameter) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader Conf(ServerInstance); - maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true); - operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0); - tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0); - notify_cooldown = Conf.ReadInteger("callerid", "cooldown", "60", 0, true); + ConfigTag* tag = ServerInstance->Config->ConfValue("callerid"); + cmd.maxaccepts = tag->getInt("maxaccepts", 16); + operoverride = tag->getBool("operoverride"); + tracknick = tag->getBool("tracknick"); + notify_cooldown = tag->getInt("cooldown", 60); } }; MODULE_INIT(ModuleCallerID) - -