X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hostchange.cpp;h=7433fccd3e0195953f5ae9d1ad269bc0de868872;hb=4e24fb7c19cff866eda602349fbafce78b7e4c51;hp=2d4c72e639a6b916fc0ac95e7b6e4702167bf028;hpb=53afaa7cadcdf222dcf761441727305f79b4c557;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index 2d4c72e63..7433fccd3 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -1,32 +1,49 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2005-2007 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell * - * 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 "wildcard.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 classbase +class Host { public: - std::string action; + enum HostChangeAction + { + HCA_SET, + HCA_SUFFIX, + HCA_ADDNICK + }; + + HostChangeAction action; std::string newhost; std::string ports; + + Host(HostChangeAction Action, const std::string& Newhost, const std::string& Ports) : + action(Action), newhost(Newhost), ports(Ports) {} }; -typedef std::map hostchanges_t; +typedef std::vector > hostchanges_t; class ModuleHostChange : public Module { @@ -35,80 +52,74 @@ class ModuleHostChange : public Module std::string MySuffix; std::string MyPrefix; std::string MySeparator; - + public: - ModuleHostChange(InspIRCd* Me) - : Module(Me) + void init() { - OnRehash(NULL,""); + OnRehash(NULL); Implementation eventlist[] = { I_OnRehash, I_OnUserConnect }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - - virtual ~ModuleHostChange() + + virtual void OnRehash(User* user) { - for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) - { - delete i->second; - } + ConfigTag* host = ServerInstance->Config->ConfValue("host"); + MySuffix = host->getString("suffix"); + MyPrefix = host->getString("prefix"); + MySeparator = host->getString("separator", "."); hostchanges.clear(); - } - void Prioritize() - { - Module* cloak = ServerInstance->Modules->Find("m_cloaking.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &cloak); - } + std::set dupecheck; + ConfigTagList tags = ServerInstance->Config->ConfTags("hostchange"); + for (ConfigIter i = tags.first; i != tags.second; ++i) + { + ConfigTag* tag = i->second; + std::string mask = tag->getString("mask"); + if (!dupecheck.insert(mask).second) + throw ModuleException("Duplicate hostchange entry: " + mask); + Host::HostChangeAction act; + std::string newhost; + std::string action = tag->getString("action"); + if (!strcasecmp(action.c_str(), "set")) + { + act = Host::HCA_SET; + newhost = tag->getString("value"); + } + else if (!strcasecmp(action.c_str(), "suffix")) + act = Host::HCA_SUFFIX; + else if (!strcasecmp(action.c_str(), "addnick")) + act = Host::HCA_ADDNICK; + else + throw ModuleException("Invalid hostchange action: " + action); - virtual void OnRehash(User* user, const std::string ¶meter) - { - ConfigReader Conf(ServerInstance); - 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; + hostchanges.push_back(std::make_pair(mask, Host(act, newhost, tag->getString("ports")))); } } - + virtual Version GetVersion() { // returns the version number of the module to be // listed in /MODULES - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR); } - - virtual void OnUserConnect(User* user) + + virtual void OnUserConnect(LocalUser* user) { for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) { - if (((match(user->MakeHost(),i->first.c_str(),true)) || (match(user->MakeHostIP(),i->first.c_str())))) + if (((InspIRCd::MatchCIDR(user->MakeHost(), i->first)) || (InspIRCd::MatchCIDR(user->MakeHostIP(), i->first)))) { - Host* h = i->second; + const Host& h = i->second; - if (!h->ports.empty()) + if (!h.ports.empty()) { - irc::portparser portrange(h->ports, false); + irc::portparser portrange(h.ports, false); long portno = -1; bool foundany = false; while ((portno = portrange.GetToken())) - if (portno == user->GetPort()) + if (portno == user->GetServerPort()) foundany = true; if (!foundany) @@ -117,32 +128,31 @@ class ModuleHostChange : public Module // host of new user matches a hostchange tag's mask std::string newhost; - if (h->action == "set") + if (h.action == Host::HCA_SET) { - newhost = h->newhost; + newhost = h.newhost; } - else if (h->action == "suffix") + else if (h.action == Host::HCA_SUFFIX) { newhost = MySuffix; } - else if (h->action == "addnick") + else if (h.action == Host::HCA_ADDNICK) { // first take their nick and strip out non-dns, leaving just [A-Z0-9\-] std::string complete; - std::string old = user->nick; - for (unsigned int j = 0; j < old.length(); j++) + for (std::string::const_iterator j = user->nick.begin(); j != user->nick.end(); ++j) { - if (((old[j] >= 'A') && (old[j] <= 'Z')) || - ((old[j] >= 'a') && (old[j] <= 'z')) || - ((old[j] >= '0') && (old[j] <= '9')) || - (old[j] == '-')) + if (((*j >= 'A') && (*j <= 'Z')) || + ((*j >= 'a') && (*j <= 'z')) || + ((*j >= '0') && (*j <= '9')) || + (*j == '-')) { - complete = complete + old[j]; + complete = complete + *j; } } if (complete.empty()) complete = "i-have-a-lame-nick"; - + if (!MyPrefix.empty()) newhost = MyPrefix + MySeparator + complete; else @@ -150,9 +160,9 @@ class ModuleHostChange : public Module } if (!newhost.empty()) { - user->WriteServ("NOTICE "+std::string(user->nick)+" :Setting your virtual host: " + newhost); + user->WriteServ("NOTICE "+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); + user->WriteServ("NOTICE "+user->nick+" :Could not set your virtual host: " + newhost); return; } }