Use FindNickOnly in a few commands to prevent enumerating users via UID walking

[user/henk/code/inspircd.git] / src / modules / m_inviteexception.cpp

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 0b3621af7606abff054dc85f3d4258044ef5dc04..2e6f6db6533f98ea5cc7384ee73c5612f87e3448 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,28 +27,25 @@
  * Now supports CIDR and IP addresses -- Brain
  */
 
-class InspIRCd* ServerInstance;
-
 /** Handles channel mode +I
  */
 class InviteException : public ListModeBase
 {
  public:
-       InviteException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'I', "End of Channel Invite Exception List", 346, 347, true) { }
+       InviteException(Module* Creator) : ListModeBase(Creator, "invex", 'I', "End of Channel Invite Exception List", 346, 347, true) { }
 };
 
 class ModuleInviteException : public Module
 {
        InviteException ie;
 public:
-       ModuleInviteException(InspIRCd* Me) : Module(Me), ie(Me, this)
+       ModuleInviteException() : ie(this)
        {
                if (!ServerInstance->Modes->AddMode(&ie))
                        throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
                ie.DoImplements(this);
-               Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
+               Implementation eventlist[] = { I_On005Numeric, I_OnCheckInvite, I_OnCheckKey };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
@@ -64,25 +61,24 @@ public:
                        modelist* list = ie.extItem.get(chan);
                        if (list)
                        {
-                               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)))
+                                       if (chan->CheckBan(user, it->mask))
                                        {
-                                               // They match an entry on the list, so let them in.
-                                               return MOD_RES_DENY;
+                                               return MOD_RES_ALLOW;
                                        }
                                }
                        }
-                       // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
                }
 
                return MOD_RES_PASSTHRU;
        }
 
-       const char* OnRequest(Request* request)
+       ModResult OnCheckKey(User* user, Channel* chan, const std::string& key)
        {
-               return ie.DoOnRequest(request);
+               if (ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true))
+                       return OnCheckInvite(user, chan);
+               return MOD_RES_PASSTHRU;
        }
 
        void OnCleanup(int target_type, void* item)
@@ -102,13 +98,7 @@ public:
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
-       }
-
-       ~ModuleInviteException()
-       {
-               ServerInstance->Modes->DelMode(&ie);
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +I channel mode", VF_VENDOR);
        }
 };