X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_banredirect.cpp;h=eaeb90ea82eb98b9ba765a7eeb78b19c75f01f84;hb=26dd7011744e38cfd61089c23d148c5b10654522;hp=773badb57764621d54b5f948311c332dc99835b6;hpb=be60154f885d7b53e63759cd01391521bf14017f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 773badb57..eaeb90ea8 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,15 +11,16 @@ * --------------------------------------------------- */ -#include "mode.h" -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" +#include "u_listmode.h" /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */ +/* $ModDep: ../../include/u_listmode.h */ -class BanRedirectEntry +/* Originally written by Om, January 2008 + */ + +class BanRedirectEntry : public classbase { public: std::string targetchan; @@ -44,32 +45,33 @@ class BanRedirect : public ModeWatcher { } - bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶m, bool adding, ModeType type) + bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type, bool) { - // Srv->Log(DEBUG, "BeforeMode(%s, %s, %s, %s, %s, %s)", ((source && source->nick) ? source->nick : "NULL"), ((dest && dest->nick) ? dest->nick : "NULL"), ((channel && channel->name) ? channel->name : "NULL"), param.c_str(), (adding ? "true" : "false"), ((type == MODETYPE_CHANNEL) ? "MODETYPE_CHANNEL" : "MODETYPE_USER")); - /* nick!ident@host -> nick!ident@host * nick!ident@host#chan -> nick!ident@host#chan * nick@host#chan -> nick!*@host#chan * 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(channel->bans.size() > static_cast(maxbans)) + + if (param.length() >= 2 && param[1] == ':') + return true; + + if(adding && (channel->bans.size() > static_cast(maxbans))) { - source->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)", source->nick, 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) @@ -91,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()) @@ -111,18 +113,16 @@ class BanRedirect : public ModeWatcher mask[i].assign("*"); } } - + param.assign(mask[NICK]).append(1, '!').append(mask[IDENT]).append(1, '@').append(mask[HOST]); - - // Srv->Log(DEBUG, "mask[NICK] = '%s', mask[IDENT] = '%s', mask[HOST] = '%s', mask[CHAN] = '%s'", mask[NICK].c_str(), mask[IDENT].c_str(), mask[HOST].c_str(), mask[CHAN].c_str()); - + 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->WriteServ("690 %s %s :You cannot set a ban redirection to the channel the ban is on", source->nick, 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 @@ -135,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]); } @@ -148,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); + delete redirects; channel->Shrink("banredirects"); } - + break; } } } - + /* Append the channel so the default +b handler can remove the entry too */ param.append(mask[CHAN]); } @@ -174,14 +174,12 @@ class BanRedirect : public ModeWatcher } else { - source->WriteServ("403 %s %s :Invalid channel name in redirection (%s)", source->nick, 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; } } - - Srv->Log(DEBUG, "Changed param to: %s", param.c_str()); } - + return true; } }; @@ -189,109 +187,135 @@ class BanRedirect : public ModeWatcher class ModuleBanRedirect : public Module { BanRedirect* re; - InspIRCd* Srv; - + bool nofollow; + Module* ExceptionModule; + public: ModuleBanRedirect(InspIRCd* Me) - : Module::Module(Me), Srv(Me) + : Module(Me) { re = new BanRedirect(Me); - - if(!Srv->AddModeWatcher(re)) + nofollow = false; + + if(!ServerInstance->Modes->AddModeWatcher(re)) + { + delete re; throw ModuleException("Could not add mode watcher"); + } + + OnRehash(NULL, ""); + + Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete, I_OnCleanup }; + Me->Modules->Attach(list, this, 4); + } - - void Implements(char* List) - { - List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1; - } - - virtual void OnChannelDelete(chanrec* chan) + + virtual void OnChannelDelete(Channel* chan) { OnCleanup(TYPE_CHANNEL, chan); } - + virtual void OnCleanup(int target_type, void* item) { if(target_type == TYPE_CHANNEL) { - chanrec* chan = static_cast(item); + Channel* chan = static_cast(item); BanRedirectList* redirects; - + if(chan->GetExt("banredirects", redirects)) { - irc::modestacker modestack(false); + irc::modestacker modestack(ServerInstance, false); StringDeque stackresult; - const char* mode_junk[MAXMODES+1]; - userrec* myhorriblefakeuser = new userrec(Srv); - myhorriblefakeuser->SetFd(FD_MAGIC_NUMBER); - - mode_junk[0] = chan->name; - + 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[i+1] = stackresult[i].c_str(); + mode_junk.push_back(stackresult[i]); } - - Srv->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser); + + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); } - - DELETE(myhorriblefakeuser); - DELETE(redirects); + + delete redirects; chan->Shrink("banredirects"); } } } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + virtual void OnRehash(User* user, const std::string ¶m) + { + ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); + } + + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven) { + /* This prevents recursion when a user sets multiple ban redirects in a chain + * (thanks Potter) + */ + if (nofollow) + return 0; + /* Return 1 to prevent the join, 0 to allow it */ 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? */ + + if (ExceptionModule) + { + ListModeRequest n(this, ExceptionModule, user, chan); + /* Users with ban exceptions are allowed to join without being redirected */ + if (n.Send()) + return 0; + } + std::string ipmask(user->nick); ipmask.append(1, '!').append(user->MakeHostIP()); - Srv->Log(DEBUG, "Matching against %s, %s and %s", user->GetFullRealHost(), user->GetFullHost(), ipmask.c_str()); - + for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++) { - if(Srv->MatchText(user->GetFullRealHost(), redir->banmask) || Srv->MatchText(user->GetFullHost(), redir->banmask) || Srv->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 */ - Srv->Log(DEBUG, "%s matches ban on %s -- might transferred to %s", user->nick, chan->name, redir->targetchan.c_str()); - - chanrec* destchan = Srv->FindChan(redir->targetchan); - - if(destchan && Srv->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) + Channel* destchan = ServerInstance->FindChan(redir->targetchan); + 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->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, 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->WriteServ("470 %s :You are banned from %s. You are being automatically redirected to %s", user->nick, chan->name, redir->targetchan.c_str()); - chanrec::JoinUser(Srv, user, redir->targetchan.c_str(), false); + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str()); + user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick.c_str(), redir->targetchan.c_str()); + nofollow = true; + Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time()); + nofollow = false; return 1; } } @@ -303,37 +327,20 @@ class ModuleBanRedirect : public Module virtual ~ModuleBanRedirect() { - Srv->Modes->DelModeWatcher(re); - DELETE(re); + 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); } -}; - -class ModuleBanRedirectFactory : public ModuleFactory -{ - public: - ModuleBanRedirectFactory() - { - } - - ~ModuleBanRedirectFactory() + void Prioritize() { + Module* banex = ServerInstance->Modules->Find("m_banexception.so"); + ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIO_BEFORE, &banex); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleBanRedirect(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleBanRedirectFactory; -} +MODULE_INIT(ModuleBanRedirect)