X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=1397692672813811f1667f7bb6c016166ed386e8;hb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;hp=22c7c03b40be5394b39cfe55ff56a944c92bbb56;hpb=fd355973486299b3db37a4ec46125476f59db0ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 22c7c03b4..139769267 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -15,8 +15,9 @@ #include "u_listmode.h" /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */ +/* $ModDep: ../../include/u_listmode.h */ -/* Originally written by Om, January 2008 +/* Originally written by Om, January 2009 */ class BanRedirectEntry : public classbase @@ -52,22 +53,25 @@ class BanRedirect : public ModeWatcher * nick!ident#chan -> nick!ident@*#chan * nick#chan -> nick!*@*#chan */ - + if(channel && (type == MODETYPE_CHANNEL) && param.length()) { BanRedirectList* redirects; - + std::string mask[4]; enum { NICK, IDENT, HOST, CHAN } current = NICK; std::string::iterator start_pos = param.begin(); long maxbans = channel->GetMaxBans(); - + + if (param.length() >= 2 && param[1] == ':') + return true; + if(adding && (channel->bans.size() > static_cast(maxbans))) { - source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name, channel->name, maxbans); + source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans); return false; } - + for(std::string::iterator curr = start_pos; curr != param.end(); curr++) { switch(*curr) @@ -89,19 +93,19 @@ class BanRedirect : public ModeWatcher break; } } - + if(mask[current].empty()) { - mask[current].assign(start_pos, param.end()); + mask[current].assign(start_pos, param.end()); } - + /* nick@host wants to be changed to *!nick@host rather than nick!*@host... */ if(mask[NICK].length() && mask[HOST].length() && mask[IDENT].empty()) { /* std::string::swap() is fast - it runs in constant time */ mask[NICK].swap(mask[IDENT]); } - + for(int i = 0; i < 3; i++) { if(mask[i].empty()) @@ -109,16 +113,16 @@ class BanRedirect : public ModeWatcher mask[i].assign("*"); } } - + param.assign(mask[NICK]).append(1, '!').append(mask[IDENT]).append(1, '@').append(mask[HOST]); - + if(mask[CHAN].length()) { - if(Srv->IsChannel(mask[CHAN].c_str())) + if(!IS_LOCAL(source) || Srv->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax)) { - if(irc::string(channel->name) == irc::string(mask[CHAN].c_str())) + if (assign(channel->name) == mask[CHAN]) { - source->WriteNumeric(690, "%s %s :You cannot set a ban redirection to the channel the ban is on", source->nick.c_str(), channel->name); + source->WriteNumeric(690, "%s %s :You cannot set a ban redirection to the channel the ban is on", source->nick.c_str(), channel->name.c_str()); return false; } else @@ -131,10 +135,10 @@ class BanRedirect : public ModeWatcher redirects = new BanRedirectList; channel->Extend("banredirects", redirects); } - + /* Here 'param' doesn't have the channel on it yet */ redirects->push_back(BanRedirectEntry(mask[CHAN].c_str(), param.c_str())); - + /* Now it does */ param.append(mask[CHAN]); } @@ -144,25 +148,25 @@ class BanRedirect : public ModeWatcher if(channel->GetExt("banredirects", redirects)) { /* But there were, so we need to remove the matching one if there is one */ - + for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++) { /* Ugly as fuck */ if((irc::string(redir->targetchan.c_str()) == irc::string(mask[CHAN].c_str())) && (irc::string(redir->banmask.c_str()) == irc::string(param.c_str()))) { redirects->erase(redir); - + if(redirects->empty()) { delete redirects; channel->Shrink("banredirects"); } - + break; } } } - + /* Append the channel so the default +b handler can remove the entry too */ param.append(mask[CHAN]); } @@ -170,12 +174,12 @@ class BanRedirect : public ModeWatcher } else { - source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick.c_str(), channel->name, mask[CHAN].c_str()); + source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick.c_str(), channel->name.c_str(), mask[CHAN].c_str()); return false; } } } - + return true; } }; @@ -192,7 +196,7 @@ class ModuleBanRedirect : public Module { re = new BanRedirect(Me); nofollow = false; - + if(!ServerInstance->Modes->AddModeWatcher(re)) { delete re; @@ -205,47 +209,47 @@ class ModuleBanRedirect : public Module Me->Modules->Attach(list, this, 4); } - + virtual void OnChannelDelete(Channel* chan) { OnCleanup(TYPE_CHANNEL, chan); } - + virtual void OnCleanup(int target_type, void* item) { if(target_type == TYPE_CHANNEL) { Channel* chan = static_cast(item); BanRedirectList* redirects; - + if(chan->GetExt("banredirects", redirects)) { - irc::modestacker modestack(false); + irc::modestacker modestack(ServerInstance, false); StringDeque stackresult; std::vector mode_junk; mode_junk.push_back(chan->name); - + for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++) { modestack.Push('b', i->targetchan.insert(0, i->banmask)); } - + for(BanRedirectList::iterator i = redirects->begin(); i != redirects->end(); i++) { modestack.PushPlus(); modestack.Push('b', i->banmask); } - + while(modestack.GetStackedLine(stackresult)) { for(StringDeque::size_type i = 0; i < stackresult.size(); i++) { mode_junk.push_back(stackresult[i]); } - + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); } - + delete redirects; chan->Shrink("banredirects"); } @@ -269,11 +273,11 @@ class ModuleBanRedirect : public Module if (chan) { BanRedirectList* redirects; - + if(chan->GetExt("banredirects", redirects)) { /* We actually had some ban redirects to check */ - + /* This was replaced with user->MakeHostIP() when I had a snprintf(), but MakeHostIP() doesn't seem to add the nick. * Maybe we should have a GetFullIPHost() or something to match GetFullHost() and GetFullRealHost? */ @@ -288,23 +292,27 @@ class ModuleBanRedirect : public Module std::string ipmask(user->nick); ipmask.append(1, '!').append(user->MakeHostIP()); - + for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++) { - if(ServerInstance->MatchText(user->GetFullRealHost(), redir->banmask) || ServerInstance->MatchText(user->GetFullHost(), redir->banmask) || ServerInstance->MatchText(ipmask, redir->banmask)) + if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask)) { /* tell them they're banned and are being transferred */ Channel* destchan = ServerInstance->FindChan(redir->targetchan); - - if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) + std::string destlimit; + + if (destchan) + destlimit = destchan->GetModeParameter('l'); + + if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str()))) { - user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name); + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); return 1; } else { - user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name); - user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick.c_str(), redir->targetchan.c_str()); + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); + user->WriteNumeric(470, "%s %s %s :You are banned from this channel, so you are automatically transfered to the redirected channel.", user->nick.c_str(), chan->name.c_str(), redir->targetchan.c_str()); nofollow = true; Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time()); nofollow = false; @@ -322,16 +330,16 @@ class ModuleBanRedirect : public Module ServerInstance->Modes->DelModeWatcher(re); delete re; } - + virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON|VF_VENDOR, API_VERSION); } - + void Prioritize() { Module* banex = ServerInstance->Modules->Find("m_banexception.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIO_BEFORE, &banex); + ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_BEFORE, &banex); } };