-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
-#include "helperfuncs.h"
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * 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.
+ *
+ * ---------------------------------------------------
+ */
+
#include "inspircd.h"
#include "u_listmode.h"
/* $ModDesc: Provides support for the +e channel mode */
+/* $ModDep: ../../include/u_listmode.h */
/* Written by Om<om@inspircd.org>, April 2005. */
/* Rewritten to use the listmode utility by Om, December 2005 */
// The +e channel mode takes a nick!ident@host, glob patterns allowed,
// and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them
+// Now supports CIDR and IP addresses -- Brain
-extern InspIRCd* ServerInstance;
+/** Handles +e channel mode
+ */
class BanException : public ListModeBase
{
public:
- BanException(InspIRCd* Instance, Server* serv) : ListModeBase(Instance, serv, 'e', "End of Channel Exception List", "348", "349", true) { }
+ BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { }
};
class ModuleBanException : public Module
{
- BanException* be;
- Server* Srv;
+ BanException be;
public:
- ModuleBanException(Server* serv)
- : Module::Module(serv)
- {
- be = new BanException(ServerInstance, serv);
- Srv = serv;
- Srv->AddMode(be, 'e');
- }
-
- virtual void Implements(char* List)
+ ModuleBanException(InspIRCd* Me) : Module(Me), be(Me)
{
- be->DoImplements(List);
- List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+ if (!ServerInstance->Modes->AddMode(&be))
+ throw ModuleException("Could not add new modes!");
+ ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+ be.DoImplements(this);
+ Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan };
+ Me->Modules->Attach(list, this, 6);
+
}
-
+
virtual void On005Numeric(std::string &output)
{
output.append(" EXCEPTS=e");
- ServerInstance->ModeGrok->InsertMode(output, "e", 1);
}
- virtual int OnCheckBan(userrec* user, chanrec* chan)
+ virtual int OnCheckExtBan(User *user, Channel *chan, char type)
{
- if(chan != NULL)
+ if (chan != NULL)
{
- modelist* list;
- chan->GetExt(be->GetInfoKey(), list);
-
- if(list)
- {
- for (modelist::iterator it = list->begin(); it != list->end(); it++)
- if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
- // They match an entry on the list, so let them in.
- return 1;
+ modelist *list;
+ chan->GetExt(be.GetInfoKey(), list);
+
+ if (!list)
return 0;
+
+ std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
+ for (modelist::iterator it = list->begin(); it != list->end(); it++)
+ {
+ if (it->mask[0] != type || it->mask[1] != ':')
+ continue;
+
+ std::string maskptr = it->mask.substr(2);
+
+ if (InspIRCd::Match(user->GetFullRealHost(), maskptr) || InspIRCd::Match(user->GetFullHost(), maskptr) || (InspIRCd::MatchCIDR(mask, maskptr)))
+ {
+ // They match an entry on the list, so let them pass this.
+ return 1;
+ }
}
- // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
}
- return 0;
+
+ return 0;
}
- virtual void OnCleanup(int target_type, void* item)
+ virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
{
- be->DoCleanup(target_type, item);
+ if (chan != NULL)
+ {
+ modelist *list;
+ chan->GetExt(be.GetInfoKey(), list);
+
+ if (!list)
+ return 0;
+ for (modelist::iterator it = list->begin(); it != list->end(); it++)
+ {
+ if (it->mask[0] != type || it->mask[1] != ':')
+ continue;
+
+ std::string maskptr = it->mask.substr(2);
+ if (InspIRCd::Match(str, maskptr))
+ // They match an entry on the list, so let them in.
+ return 1;
+ }
+ }
+
+ return 0;
}
- virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+ virtual int OnCheckBan(User* user, Channel* chan)
{
- be->DoSyncChannel(chan, proto, opaque);
+ if (chan != NULL)
+ {
+ modelist* list;
+ chan->GetExt(be.GetInfoKey(), list);
+
+ if (!list)
+ {
+ // No list, proceed normally
+ return 0;
+ }
+
+ std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
+ for (modelist::iterator it = list->begin(); it != list->end(); it++)
+ {
+ if (InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
+ {
+ // They match an entry on the list, so let them in.
+ return 1;
+ }
+ }
+ }
+ return 0;
}
- virtual void OnChannelDelete(chanrec* chan)
+ virtual void OnCleanup(int target_type, void* item)
{
- be->DoChannelDelete(chan);
+ be.DoCleanup(target_type, item);
}
- virtual void OnRehash(const std::string ¶m)
+ virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
{
- be->DoRehash();
+ be.DoSyncChannel(chan, proto, opaque);
}
-
- virtual Version GetVersion()
+
+ virtual void OnChannelDelete(Channel* chan)
{
- return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
+ be.DoChannelDelete(chan);
}
-
- virtual ~ModuleBanException()
+
+ virtual void OnRehash(User* user)
{
- DELETE(be);
+ be.DoRehash();
}
-};
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
- ModuleBanExceptionFactory()
+ virtual const char* OnRequest(Request* request)
{
+ return be.DoOnRequest(request);
}
-
- ~ModuleBanExceptionFactory()
+
+ virtual Version GetVersion()
{
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
-
- virtual Module* CreateModule(Server* serv)
+
+ virtual ~ModuleBanException()
{
- return new ModuleBanException(serv);
+ ServerInstance->Modes->DelMode(&be);
+ ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
}
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)
projects / user / henk / code / inspircd.git / blobdiff