X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=8276f610f1ae1e3a787c85534e9a138bf811de81;hb=87b1461e2a4710a38b32186c2582da9fe9bb3804;hp=7ba046983e45b8807085cd848ec134409fbb72b1;hpb=dc8f5d02f77aeabefaefe88005b99c8b47030ab7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index 7ba046983..6c420ca3a 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -1,248 +1,165 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2007 John Brooks + * Copyright (C) 2005-2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * --------------------------------------------------- + * 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 "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -/* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ +#include "inspircd.h" +#include "modules/whois.h" -class cmd_swhois : public command_t +enum { - Server* Srv; - public: - cmd_swhois(Server* server) : command_t("SWHOIS",'o',2) - { - this->Srv = server; - this->source = "m_swhois.so"; - syntax = " "; - } - - void Handle(const char** parameters, int pcnt, userrec* user) - { - userrec* dest = Srv->FindNick(std::string(parameters[0])); - if(dest) - { - std::string line; - for(int i = 1; i < pcnt; i++) - { - if (i != 1) - line.append(" "); - - line.append(parameters[i]); - } - - std::string* text; - dest->GetExt("swhois", text); - - if(text) - { - // We already had it set... - - if (!Srv->IsUlined(user->server)) - // Ulines set SWHOISes silently - WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str()); - - dest->Shrink("swhois"); - DELETE(text); - } - else if(!Srv->IsUlined(user->server)) - { - // Ulines set SWHOISes silently - WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str()); - } - - text = new std::string(line); - dest->Extend("swhois", text); - } - } + // From UnrealIRCd. + RPL_WHOISSPECIAL = 320 }; -class ModuleSWhois : public Module +/** Handle /SWHOIS + */ +class CommandSwhois : public Command { - cmd_swhois* mycommand; - Server* Srv; - ConfigReader* Conf; - public: - ModuleSWhois(Server* Me) : Module::Module(Me) + LocalIntExt operblock; + StringExtItem swhois; + CommandSwhois(Module* Creator) + : Command(Creator, "SWHOIS", 2, 2) + , operblock("swhois_operblock", ExtensionItem::EXT_USER, Creator) + , swhois("swhois", ExtensionItem::EXT_USER, Creator) { - Srv = Me; - Conf = new ConfigReader(); - mycommand = new cmd_swhois(Srv); - Srv->AddCommand(mycommand); + flags_needed = 'o'; syntax = " :"; + TRANSLATE2(TR_NICK, TR_TEXT); } - void OnRehash(const std::string ¶meter) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - DELETE(Conf); - Conf = new ConfigReader(); - } + User* dest = ServerInstance->FindNick(parameters[0]); - void Implements(char* List) - { - List[I_OnWhois] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnRehash] = List[I_OnOper] = 1; - } - - // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. - virtual void OnWhois(userrec* source, userrec* dest) - { - std::string* swhois; - dest->GetExt("swhois", swhois); - if (swhois) + if (!dest) // allow setting swhois using SWHOIS before reg { - WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str()); + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); + return CMD_FAILURE; } - } - // Whenever the linking module wants to send out data, but doesnt know what the data - // represents (e.g. it is metadata, added to a userrec or chanrec by a module) then - // this method is called. We should use the ProtoSendMetaData function after we've - // corrected decided how the data should look, to send the metadata on its way if - // it is ours. - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname) - { - // check if the linking module wants to know about OUR metadata - if (extname == "swhois") + std::string* text = swhois.get(dest); + if (text) { - // check if this user has an swhois field to send - std::string* swhois; - user->GetExt("swhois", swhois); - if (swhois) - { - // call this function in the linking module, let it format the data how it - // sees fit, and send it on its way. We dont need or want to know how. - proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*swhois); - } + // We already had it set... + if (!user->server->IsULine()) + // Ulines set SWHOISes silently + ServerInstance->SNO->WriteGlobalSno('a', "%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick.c_str(), dest->nick.c_str(), text->c_str(), parameters[1].c_str()); } - } - - // when a user quits, tidy up their metadata - virtual void OnUserQuit(userrec* user, const std::string &message) - { - std::string* swhois; - user->GetExt("swhois", swhois); - if (swhois) + else if (!user->server->IsULine()) { - user->Shrink("swhois"); - DELETE(swhois); + // Ulines set SWHOISes silently + ServerInstance->SNO->WriteGlobalSno('a', "%s used SWHOIS to set %s's extra whois to '%s'", user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str()); } + + operblock.set(user, 0); + if (parameters[1].empty()) + swhois.unset(dest); + else + swhois.set(dest, parameters[1]); + + /* Bug #376 - feature request - + * To cut down on the amount of commands services etc have to recognise, this only sends METADATA across the network now + * not an actual SWHOIS command. Any SWHOIS command sent from services will be automatically translated to METADATA by this. + * Sorry w00t i know this was your fix, but i got bored and wanted to clear down the tracker :) + * -- Brain + */ + ServerInstance->PI->SendMetaData(dest, "swhois", parameters[1]); + + return CMD_SUCCESS; } - // if the module is unloaded, tidy up all our dangling metadata - virtual void OnCleanup(int target_type, void* item) +}; + +class ModuleSWhois : public Module, public Whois::LineEventListener +{ + CommandSwhois cmd; + + public: + ModuleSWhois() + : Whois::LineEventListener(this) + , cmd(this) { - if (target_type == TYPE_USER) - { - userrec* user = (userrec*)item; - std::string* swhois; - user->GetExt("swhois", swhois); - if (swhois) - { - user->Shrink("swhois"); - DELETE(swhois); - } - } } - // Whenever the linking module receives metadata from another server and doesnt know what - // to do with it (of course, hence the 'meta') it calls this method, and it is up to each - // module in turn to figure out if this metadata key belongs to them, and what they want - // to do with it. - // In our case we're only sending a single string around, so we just construct a std::string. - // Some modules will probably get much more complex and format more detailed structs and classes - // in a textual way for sending over the link. - virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) + // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games. + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE { - // check if its our metadata key, and its associated with a user - if ((target_type == TYPE_USER) && (extname == "swhois")) + /* We use this and not OnWhois because this triggers for remote, too */ + if (numeric.GetNumeric() == 312) { - userrec* dest = (userrec*)target; - // if they dont already have an swhois field, accept the remote server's - std::string* text; - if (!dest->GetExt("swhois", text)) + /* Insert our numeric before 312 */ + std::string* swhois = cmd.swhois.get(whois.GetTarget()); + if (swhois) { - std::string* text = new std::string(extdata); - dest->Extend("swhois",text); + whois.SendLine(RPL_WHOISSPECIAL, *swhois); } } + + /* Dont block anything */ + return MOD_RES_PASSTHRU; } - - virtual void OnOper(userrec* user, const std::string &opertype) - { - for(int i =0; i < Conf->Enumerate("type"); i++) - { - std::string type = Conf->ReadValue("type", "name", i); - - if(strcmp(type.c_str(), user->oper) == 0) - { - std::string swhois = Conf->ReadValue("type", "swhois", i); - - if(swhois.length()) - { - std::string* old; - if(user->GetExt("swhois", old)) - { - user->Shrink("swhois"); - DELETE(old); - } - - std::string* text = new std::string(swhois); - user->Extend("swhois", text); - - break; - } - } - } - } - - virtual ~ModuleSWhois() + + void OnPostOper(User* user, const std::string &opertype, const std::string &opername) CXX11_OVERRIDE { - DELETE(Conf); + if (!IS_LOCAL(user)) + return; + + std::string swhois = user->oper->getConfig("swhois"); + + if (!swhois.length()) + return; + + cmd.operblock.set(user, 1); + cmd.swhois.set(user, swhois); + ServerInstance->PI->SendMetaData(user, "swhois", swhois); } - - virtual Version GetVersion() + + void OnPostDeoper(User* user) CXX11_OVERRIDE { - return Version(1,0,0,0,VF_VENDOR); - } -}; + std::string* swhois = cmd.swhois.get(user); + if (!swhois) + return; + if (!cmd.operblock.get(user)) + return; -class ModuleSWhoisFactory : public ModuleFactory -{ - public: - ModuleSWhoisFactory() - { + cmd.operblock.set(user, 0); + cmd.swhois.unset(user); + ServerInstance->PI->SendMetaData(user, "swhois", ""); } - - ~ModuleSWhoisFactory() + + void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string&) CXX11_OVERRIDE { + User* dest = static_cast(target); + if (dest && (extname == "swhois")) + cmd.operblock.set(dest, 0); } - - virtual Module * CreateModule(Server* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSWhois(Me); + return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSWhoisFactory; -} - +MODULE_INIT(ModuleSWhois)