X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channames.cpp;h=c5315b3077d446e9848d2fe90260a0e162589fbc;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=01f176e3be0828dba779f26bada1aa306850f978;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index 01f176e3b..c5315b307 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -1,136 +1,159 @@ -/* +------------------------------------+ - * | 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) 2013, 2017 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012-2014 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2010 Craig Edwards + * 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 */ +#include "inspircd.h" -static bool allowedmap[256]; +static std::bitset<256> allowedmap; -class NewIsChannelHandler : public HandlerBase2 +class NewIsChannelHandler { public: - NewIsChannelHandler() { } - virtual ~NewIsChannelHandler() { } - virtual bool Call(const char*, size_t); + static 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; + TR1NS::function rememberer; bool badchan; + ChanModeReference permchannelmode; public: - ModuleChannelNames() : rememberer(ServerInstance->IsChannel) + ModuleChannelNames() + : rememberer(ServerInstance->IsChannel) + , badchan(false) + , permchannelmode(this, "permanent") { - ServerInstance->IsChannel = &myhandler; - badchan = false; - Implementation eventlist[] = { I_OnRehash, I_OnUserKick }; - ServerInstance->Modules->Attach(eventlist, this, 2); - OnRehash(NULL); + } + + void init() CXX11_OVERRIDE + { + ServerInstance->IsChannel = NewIsChannelHandler::Call; } void ValidateChans() { + Modes::ChangeList removepermchan; + badchan = true; - 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)) - chanvec.push_back(i->second); - } - std::vector::reverse_iterator c2 = chanvec.rbegin(); - while (c2 != chanvec.rend()) + const chan_hash& chans = ServerInstance->GetChans(); + for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ) { - Channel* c = *c2++; - if (c->IsModeSet('P') && c->GetUserCounter()) - { - std::vector modes; - modes.push_back(c->name); - modes.push_back("-P"); + Channel* c = i->second; + // Move iterator before we begin kicking + ++i; + if (ServerInstance->IsChannel(c->name)) + continue; // The name of this channel is still valid - ServerInstance->SendMode(modes, ServerInstance->FakeClient); - ServerInstance->PI->SendMode(c->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate()); + if (c->IsModeSet(permchannelmode) && c->GetUserCounter()) + { + removepermchan.clear(); + removepermchan.push_remove(*permchannelmode); + ServerInstance->Modes->Process(ServerInstance->FakeClient, c, NULL, removepermchan); } - const UserMembList* users = c->GetUsers(); - for(UserMembCIter j = users->begin(); j != users->end(); ++j) + + Channel::MemberMap& users = c->userlist; + for (Channel::MemberMap::iterator 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 + Channel::MemberMap::iterator it = j++; + c->KickUser(ServerInstance->FakeClient, it, "Channel name no longer valid"); + } + else + ++j; + } } badchan = false; } - virtual void OnRehash(User* user) + void ReadConfig(ConfigStatus& status) 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"); + + if (!denyToken.compare(0, 2, "0-")) + denyToken[0] = '1'; + if (!allowToken.compare(0, 2, "0-")) + allowToken[0] = '1'; + + 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[7] = false; - allowedmap[' '] = false; - allowedmap[','] = false; + allowedmap[0x07] = false; // BEL + allowedmap[0x20] = false; // ' ' + allowedmap[0x2C] = false; // ',' 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) { - const UserMembList* users = memb->chan->GetUsers(); - for(UserMembCIter i = users->begin(); i != users->end(); i++) + const Channel::MemberMap& users = memb->chan->GetUsers(); + for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i) if (i->first != memb->user) except_list.insert(i->first); } } - virtual ~ModuleChannelNames() + CullResult cull() CXX11_OVERRIDE { ServerInstance->IsChannel = rememberer; ValidateChans(); + return Module::cull(); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR); + return Version("Allows the server administrator to define what characters are allowed in channel names.", VF_VENDOR); } };