X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hostchange.cpp;h=20c7e5bc21b731d485448557c84bcaecfc471361;hb=8f915e5ddbab4e36bb08f9f9d726e953db1f601f;hp=ffc9d3635022a9f3dd6d65f850b480b7c26d0d69;hpb=ec7fc489a14af54738da17a94b162a9606df4756;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index ffc9d3635..20c7e5bc2 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -2,87 +2,133 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +#include "inspircd.h" /* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */ +/** Holds information on a host set by m_hostchange + */ +class Host +{ + public: + std::string action; + std::string newhost; + std::string ports; +}; + +typedef std::map hostchanges_t; + class ModuleHostChange : public Module { private: - - Server *Srv; - ConfigReader *Conf; + hostchanges_t hostchanges; std::string MySuffix; - + std::string MyPrefix; + std::string MySeparator; + public: ModuleHostChange() - { - // We must create an instance of the Server class to work with - Srv = new Server; - Conf = new ConfigReader; - MySuffix = Conf->ReadValue("host","suffix",0); + { + OnRehash(NULL); + Implementation eventlist[] = { I_OnRehash, I_OnUserConnect }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - + virtual ~ModuleHostChange() { - // not really neccessary, but free it anyway - delete Srv; - delete Conf; + for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) + { + delete i->second; + } + hostchanges.clear(); } - virtual void OnRehash() + void Prioritize() { - delete Conf; - Conf = new ConfigReader; - MySuffix = Conf->ReadValue("host","suffix",0); + Module* cloak = ServerInstance->Modules->Find("m_cloaking.so"); + ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &cloak); } - + + + virtual void OnRehash(User* user) + { + ConfigReader Conf; + MySuffix = Conf.ReadValue("host","suffix",0); + MyPrefix = Conf.ReadValue("host","prefix","",0); + MySeparator = Conf.ReadValue("host","separator",".",0); + for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) + { + delete i->second; + } + hostchanges.clear(); + for (int index = 0; index < Conf.Enumerate("hostchange"); index++) + { + std::string mask = Conf.ReadValue("hostchange", "mask", index); + std::string ports = Conf.ReadValue("hosthange", "ports", index); + std::string action = Conf.ReadValue("hostchange", "action", index); + std::string newhost = Conf.ReadValue("hostchange", "value", index); + Host* x = new Host; + x->action = action; + x->ports = ports; + x->newhost = newhost; + hostchanges[mask] = x; + } + } + virtual Version GetVersion() { // returns the version number of the module to be // listed in /MODULES - return Version(1,0,0,1,VF_VENDOR); + return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR); } - - virtual void OnUserConnect(userrec* user) + + virtual void OnUserConnect(LocalUser* user) { - for (int index = 0; index < Conf->Enumerate("hostchange"); index++) + for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) { - std::string mask = Conf->ReadValue("hostchange","mask",index); - if (Srv->MatchText(std::string(user->ident)+"@"+std::string(user->host),mask)) + if (((InspIRCd::MatchCIDR(user->MakeHost(), i->first)) || (InspIRCd::MatchCIDR(user->MakeHostIP(), i->first)))) { - std::string newhost = ""; + Host* h = i->second; + + if (!h->ports.empty()) + { + irc::portparser portrange(h->ports, false); + long portno = -1; + bool foundany = false; + + while ((portno = portrange.GetToken())) + if (portno == user->GetServerPort()) + foundany = true; + + if (!foundany) + continue; + } + // host of new user matches a hostchange tag's mask - std::string action = Conf->ReadValue("hostchange","action",index); - if (action == "set") + std::string newhost; + if (h->action == "set") { - newhost = Conf->ReadValue("hostchange","value",index); + newhost = h->newhost; } - else if (action == "suffix") + else if (h->action == "suffix") { newhost = MySuffix; } - else if (action == "addnick") + else if (h->action == "addnick") { // first take their nick and strip out non-dns, leaving just [A-Z0-9\-] - std::string complete = ""; + std::string complete; std::string old = user->nick; - for (int j = 0; j < old.length(); j++) + for (unsigned int j = 0; j < old.length(); j++) { if (((old[j] >= 'A') && (old[j] <= 'Z')) || ((old[j] >= 'a') && (old[j] <= 'z')) || @@ -92,14 +138,19 @@ class ModuleHostChange : public Module complete = complete + old[j]; } } - if (complete == "") + if (complete.empty()) complete = "i-have-a-lame-nick"; - newhost = complete + "." + MySuffix; + + if (!MyPrefix.empty()) + newhost = MyPrefix + MySeparator + complete; + else + newhost = complete + MySeparator + MySuffix; } - if (newhost != "") + if (!newhost.empty()) { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Setting your VHost: " + newhost); - Srv->ChangeHost(user,newhost); + user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your virtual host: " + newhost); + if (!user->ChangeDisplayedHost(newhost.c_str())) + user->WriteServ("NOTICE "+std::string(user->nick)+" :Could not set your virtual host: " + newhost); return; } } @@ -107,29 +158,4 @@ class ModuleHostChange : public Module } }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleHostChangeFactory : public ModuleFactory -{ - public: - ModuleHostChangeFactory() - { - } - - ~ModuleHostChangeFactory() - { - } - - virtual Module * CreateModule() - { - return new ModuleHostChange; - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleHostChangeFactory; -} - +MODULE_INIT(ModuleHostChange)