X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=80beaa450425da9c15138d2245294864e6224265;hb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;hp=eaa25c1bea6142969f5c6881cc509320678a3387;hpb=e21ee18e62aecee6d27a0f9ba497a52688cb8349;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index eaa25c1be..80beaa450 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -19,7 +19,7 @@ /* Originally written by Om, January 2008 */ -class BanRedirectEntry +class BanRedirectEntry : public classbase { public: std::string targetchan; @@ -52,22 +52,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->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) @@ -89,19 +92,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 +112,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->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 @@ -131,10 +134,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 +147,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 +173,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; } } } - + return true; } }; @@ -192,7 +195,7 @@ class ModuleBanRedirect : public Module { re = new BanRedirect(Me); nofollow = false; - + if(!ServerInstance->Modes->AddModeWatcher(re)) { delete re; @@ -205,48 +208,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; - const char* mode_junk[MAXMODES+2]; - - 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]); } - - ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient); + + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); } - + delete redirects; chan->Shrink("banredirects"); } @@ -258,7 +260,7 @@ class ModuleBanRedirect : public Module ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); } - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) + 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) @@ -270,11 +272,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? */ @@ -289,25 +291,29 @@ 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)) { /* 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->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("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()); + 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(true)); + Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time()); nofollow = false; return 1; } @@ -323,12 +329,12 @@ 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); } - + void Prioritize() { Module* banex = ServerInstance->Modules->Find("m_banexception.so");