* | 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
* ---------------------------------------------------
*/
-#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 */
-class BanRedirectEntry
+/* Originally written by Om, January 2008
+ */
+
+class BanRedirectEntry : public classbase
{
public:
std::string targetchan;
};
typedef std::vector<BanRedirectEntry> BanRedirectList;
+typedef std::deque<std::string> StringDeque;
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
std::string mask[4];
enum { NICK, IDENT, HOST, CHAN } current = NICK;
std::string::iterator start_pos = param.begin();
+ long maxbans = channel->GetMaxBans();
+ if(adding && (channel->bans.size() > static_cast<unsigned>(maxbans)))
+ {
+ source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick, channel->name, channel->name, maxbans);
+ return false;
+ }
+
for(std::string::iterator curr = start_pos; curr != param.end(); curr++)
{
switch(*curr)
{
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++)
{
}
}
- param.assign(mask[NICK]).append("!").append(mask[IDENT]).append("@").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());
+ param.assign(mask[NICK]).append(1, '!').append(mask[IDENT]).append(1, '@').append(mask[HOST]);
if(mask[CHAN].length())
{
{
if(irc::string(channel->name) == irc::string(mask[CHAN].c_str()))
{
- 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, channel->name);
return false;
}
else
channel->Shrink("banredirects");
}
- /* Append the channel so the default +b handler can remove the entry too */
- param.append(mask[CHAN]);
-
break;
}
}
}
+
+ /* Append the channel so the default +b handler can remove the entry too */
+ param.append(mask[CHAN]);
}
}
}
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, channel->name, mask[CHAN].c_str());
return false;
}
}
-
- Srv->Log(DEBUG, "Changed param to: %s", param.c_str());
}
return true;
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->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);
}
{
if(target_type == TYPE_CHANNEL)
{
- chanrec* chan = static_cast<chanrec*>(item);
+ Channel* chan = static_cast<Channel*>(item);
BanRedirectList* redirects;
if(chan->GetExt("banredirects", redirects))
{
+ irc::modestacker modestack(false);
+ StringDeque stackresult;
+ const char* mode_junk[MAXMODES+2];
+
+ mode_junk[0] = 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();
+ }
+
+ ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);
+ }
+
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)
+ {
+ /* 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)
{
{
/* 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->ident).append('@', 1).append(user->GetIPString());
+ ipmask.append(1, '!').append(user->MakeHostIP());
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 = Srv->FindChan(redir->targetchan);
+ Channel* destchan = ServerInstance->FindChan(redir->targetchan);
- if(destchan && Srv->FindModule("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit))
+ if(destchan && ServerInstance->Modules->Find("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);
+ user->WriteNumeric(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->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick, chan->name);
+ user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str());
+ nofollow = true;
+ Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
+ nofollow = false;
return 1;
}
}
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);
}
-};
-
-
-class ModuleBanRedirectFactory : public ModuleFactory
-{
- public:
- ModuleBanRedirectFactory()
- {
- }
-
- ~ModuleBanRedirectFactory()
- {
- }
- virtual Module * CreateModule(InspIRCd* Me)
+ void Prioritize()
{
- return new ModuleBanRedirect(Me);
+ Module* banex = ServerInstance->Modules->Find("m_banexception.so");
+ ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIO_BEFORE, &banex);
}
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleBanRedirectFactory;
-}
+MODULE_INIT(ModuleBanRedirect)