X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channames.cpp;h=f1a4981c8c95d74404c4859275bebc293c57fdf5;hb=3624c137a6db85eaab0372550c9dca79d6d21e55;hp=0826fa56a91354e40e933241ff3ef43d346d3de5;hpb=6140520fef91f8ddd0c86a2222a17ba66c142233;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index 0826fa56a..f1a4981c8 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -1,59 +1,67 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf * - * 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" /* $ModDesc: Implements config tags which allow changing characters allowed in channel names */ -static bool allowedmap[256]; +static std::bitset<256> allowedmap; -class NewIsChannelHandler : public HandlerBase2 +class NewIsChannelHandler : public HandlerBase1 { public: NewIsChannelHandler() { } - virtual ~NewIsChannelHandler() { } - virtual bool Call(const char*, size_t); + ~NewIsChannelHandler() { } + bool Call(const std::string&); }; -bool NewIsChannelHandler::Call(const char* chname, size_t max) +bool NewIsChannelHandler::Call(const std::string& channame) { - const char *c = chname + 1; + if (channame.empty() || channame.length() > ServerInstance->Config->Limits.ChanMax || channame[0] != '#') + return false; - /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */ - if (!chname || *chname != '#') + for (std::string::const_iterator c = channame.begin(); c != channame.end(); ++c) + { + unsigned int i = *c & 0xFF; + if (!allowedmap[i]) return false; + } - while (*c) - if (!allowedmap[(unsigned int)(*c++)]) return false; - - size_t len = c - chname; - return len <= max; + return true; } class ModuleChannelNames : public Module { - private: NewIsChannelHandler myhandler; - caller2 rememberer; + caller1 rememberer; bool badchan; public: - ModuleChannelNames() : rememberer(ServerInstance->IsChannel) + ModuleChannelNames() : rememberer(ServerInstance->IsChannel), badchan(false) + { + } + + void init() CXX11_OVERRIDE { ServerInstance->IsChannel = &myhandler; - badchan = false; Implementation eventlist[] = { I_OnRehash, I_OnUserKick }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); OnRehash(NULL); } @@ -63,7 +71,7 @@ class ModuleChannelNames : public Module std::vector chanvec; for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ++i) { - if (!ServerInstance->IsChannel(i->second->name.c_str(), MAXBUF)) + if (!ServerInstance->IsChannel(i->second->name)) chanvec.push_back(i->second); } std::vector::reverse_iterator c2 = chanvec.rbegin(); @@ -76,32 +84,40 @@ class ModuleChannelNames : public Module modes.push_back(c->name); modes.push_back("-P"); - ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient); + ServerInstance->Modes->Process(modes, ServerInstance->FakeClient); } const UserMembList* users = c->GetUsers(); - for(UserMembCIter j = users->begin(); j != users->end(); ++j) + for(UserMembCIter j = users->begin(); j != users->end(); ) + { if (IS_LOCAL(j->first)) - c->KickUser(ServerInstance->FakeClient, j->first, "Channel name no longer valid"); + { + // KickUser invalidates the iterator + UserMembCIter it = j++; + c->KickUser(ServerInstance->FakeClient, it->first, "Channel name no longer valid"); + } + else + ++j; + } } badchan = false; } - virtual void OnRehash(User* user) + void OnRehash(User* user) CXX11_OVERRIDE { - ConfigReader Conf; - std::string denyToken = Conf.ReadValue("channames", "denyrange", 0); - std::string allowToken = Conf.ReadValue("channames", "allowrange", 0); - memset(allowedmap, 1, sizeof(allowedmap)); + ConfigTag* tag = ServerInstance->Config->ConfValue("channames"); + std::string denyToken = tag->getString("denyrange"); + std::string allowToken = tag->getString("allowrange"); + allowedmap.set(); irc::portparser denyrange(denyToken, false); int denyno = -1; while (0 != (denyno = denyrange.GetToken())) - allowedmap[(unsigned char)(denyno)] = false; + allowedmap[denyno & 0xFF] = false; irc::portparser allowrange(allowToken, false); int allowno = -1; while (0 != (allowno = allowrange.GetToken())) - allowedmap[(unsigned char)(allowno)] = true; + allowedmap[allowno & 0xFF] = true; allowedmap[0x07] = false; // BEL allowedmap[0x20] = false; // ' ' @@ -110,7 +126,7 @@ class ModuleChannelNames : public Module ValidateChans(); } - virtual void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) CXX11_OVERRIDE { if (badchan) { @@ -121,13 +137,13 @@ class ModuleChannelNames : public Module } } - virtual ~ModuleChannelNames() + ~ModuleChannelNames() { ServerInstance->IsChannel = rememberer; ValidateChans(); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR); }