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

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

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 727ab15a39b05c898df0f2eea86c09c7771ad4ff..85f3fff7d18cc44523bf8e2c3d0d124ab9693782 100644 (file)
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.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
@@ -19,8 +19,7 @@ class ModuleBadChannelExtban : public Module
 {
  private:
  public:
-       ModuleBadChannelExtban(InspIRCd* Me) : Module(Me)
-       {
+       ModuleBadChannelExtban()        {
                Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -31,18 +30,37 @@ class ModuleBadChannelExtban : public Module
 
        Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
        }
 
-       ModResult OnCheckBan(User *user, Channel *c)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               ModResult rv;
-               for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+               if (mask[0] == 'j' && mask[1] == ':')
                {
-                       rv = rv + c->GetExtBanStatus((*i)->name, 'j');
+                       std::string rm = mask.substr(2);
+                       char status = 0;
+                       ModeHandler* mh = ServerInstance->Modes->FindPrefix(rm[0]);
+                       if (mh)
+                       {
+                               rm = mask.substr(3);
+                               status = mh->GetModeChar();
+                       }
+                       for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+                       {
+                               if (InspIRCd::Match((**i).name, rm))
+                               {
+                                       if (status)
+                                       {
+                                               Membership* memb = c->GetUser(user);
+                                               if (memb->hasMode(status))
+                                                       return MOD_RES_DENY;
+                                       }
+                                       else
+                                               return MOD_RES_DENY;
+                               }
+                       }
                }
-
-               return rv;
+               return MOD_RES_PASSTHRU;
        }
 
        void On005Numeric(std::string &output)