X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=9fa36b5169b045572bb69d8e98505180e05fc0aa;hb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;hp=a185b8c4875a30e4a365bb5d5d05444e018cc83c;hpb=bac6b35d70223e230f4a7f38663aed17be3ebdc2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index a185b8c48..9fa36b516 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -11,14 +11,14 @@ * --------------------------------------------------- */ -#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 */ +/* Originally written by Om, January 2007 + */ + class BanRedirectEntry { public: @@ -46,8 +46,6 @@ class BanRedirect : public ModeWatcher bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶m, bool adding, ModeType type) { - // 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 @@ -64,7 +62,7 @@ class BanRedirect : public ModeWatcher std::string::iterator start_pos = param.begin(); long maxbans = channel->GetMaxBans(); - if(channel->bans.size() > static_cast(maxbans)) + 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); return false; @@ -96,6 +94,13 @@ class BanRedirect : public ModeWatcher { 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++) { @@ -106,8 +111,6 @@ class BanRedirect : public ModeWatcher } 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()) { @@ -151,7 +154,7 @@ class BanRedirect : public ModeWatcher if(redirects->empty()) { - delete redirects; + DELETE(redirects); channel->Shrink("banredirects"); } @@ -171,8 +174,6 @@ class BanRedirect : public ModeWatcher return false; } } - - Srv->Log(DEBUG, "Changed param to: %s", param.c_str()); } return true; @@ -182,21 +183,25 @@ 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); + nofollow = false; - if(!Srv->AddModeWatcher(re)) + if(!ServerInstance->AddModeWatcher(re)) throw ModuleException("Could not add mode watcher"); + + OnRehash(NULL, ""); } void Implements(char* List) { - List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1; + List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnChannelDelete] = List[I_OnCleanup] = 1; } virtual void OnChannelDelete(chanrec* chan) @@ -215,8 +220,8 @@ class ModuleBanRedirect : public Module { irc::modestacker modestack(false); StringDeque stackresult; - const char* mode_junk[MAXMODES+1]; - userrec* myhorriblefakeuser = new userrec(Srv); + const char* mode_junk[MAXMODES+2]; + userrec* myhorriblefakeuser = new userrec(ServerInstance); myhorriblefakeuser->SetFd(FD_MAGIC_NUMBER); mode_junk[0] = chan->name; @@ -239,18 +244,29 @@ class ModuleBanRedirect : public Module mode_junk[i+1] = stackresult[i].c_str(); } - Srv->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser); + ServerInstance->SendMode(mode_junk, stackresult.size() + 1, myhorriblefakeuser); } - delete myhorriblefakeuser; - delete redirects; + DELETE(myhorriblefakeuser); + DELETE(redirects); chan->Shrink("banredirects"); } } } + virtual void OnRehash(userrec* user, const std::string ¶m) + { + ExceptionModule = ServerInstance->FindModule("m_banexception.so"); + } + virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { + /* 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) { @@ -263,28 +279,37 @@ class ModuleBanRedirect : public Module /* 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(ServerInstance->MatchText(user->GetFullRealHost(), redir->banmask) || ServerInstance->MatchText(user->GetFullHost(), redir->banmask) || ServerInstance->MatchText(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 = ServerInstance->FindChan(redir->targetchan); - chanrec* destchan = Srv->FindChan(redir->targetchan); - - if(destchan && Srv->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) + if(destchan && ServerInstance->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) { user->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name); 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->WriteServ("474 %s %s :Cannot join channel (You are banned)", user->nick, chan->name); + user->WriteServ("470 %s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str()); + nofollow = true; + chanrec::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", ServerInstance->Time(true)); + nofollow = false; return 1; } } @@ -296,7 +321,7 @@ class ModuleBanRedirect : public Module virtual ~ModuleBanRedirect() { - Srv->Modes->DelModeWatcher(re); + ServerInstance->Modes->DelModeWatcher(re); DELETE(re); } @@ -304,29 +329,12 @@ class ModuleBanRedirect : public Module { return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } -}; - - -class ModuleBanRedirectFactory : public ModuleFactory -{ - public: - ModuleBanRedirectFactory() - { - } - - ~ModuleBanRedirectFactory() - { - } - virtual Module * CreateModule(InspIRCd* Me) + Priority Prioritize() { - return new ModuleBanRedirect(Me); + return (Priority)ServerInstance->PriorityBefore("m_banexception.so"); } - }; -extern "C" void * init_module( void ) -{ - return new ModuleBanRedirectFactory; -} +MODULE_INIT(ModuleBanRedirect)