Add extban 'a' to m_gecosban.

This has the format a:nick!user@host+gecos.

e.g. a:*!*@abusive.host+*MegaBot?v2.0*

Closes #1023.
Closes #1026.

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index c33b80fd7f3bfb0ee95cf0cf93e557280d68bf42..17e9ee37dc8422c894cd5e71302ce0c617633da8 100644 (file)
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -1091,6 +1091,9 @@ setting +I <extban>.
 
 Matching extbans:
 
+ a:<mask>      Matches user with both a matching banmask and realname,
+               where <mask> is in the format nick!user@host+realname
+               (requires gecosban module).
  j:<channel>   Matches anyone in the given channel. Does not support
                wildcards (requires the channelban module).
  n:<class>     Matches users in a matching connect class (requires the

diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index 89c2716a6a185b7112727b6d81cf4fe49558fed9..8456346d98dd241da4719a94104e8d1dd618ee93 100644 (file)
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -277,6 +277,9 @@ setting +I <extban>.
 
 Matching extbans:
 
+ a:<mask>      Matches user with both a matching banmask and realname,
+               where <mask> is in the format nick!user@host+realname
+               (requires gecosban module).
  j:<channel>   Matches anyone in the given channel. Does not support
                wildcards (requires the channelban module).
  n:<class>     Matches users in a matching connect class (requires

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 7823e2d30f5ef138d849d51d2002ef195de3b90c..8a22a8c719b245920833a962eabecf0590dd7d46 100644 (file)
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -818,8 +818,9 @@
 #<module name="flashpolicyd">                                         #
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Real name ban: Implements extended ban 'r', which stops anyone
-# matching a mask like +b r:*realname?here* from joining a channel.
+# Real name ban: Implements two extended bans:                        #
+# 'a', which matches a n!u@h+realname mask like +b a:*!*@host+*real*  #
+# 'r', which matches a realname mask like +b r:*realname?here*        #
 #<module name="gecosban">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index ae399a81f713375ffae6c982dcd9ff2d074e6fd3..09f3c9dc7f4870fcfb0aa33b40cb8547b76153e8 100644 (file)
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -24,21 +24,40 @@ class ModuleGecosBan : public Module
  public:
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Extban 'r' - real name ban", VF_OPTCOMMON|VF_VENDOR);
+               return Version("Provides a way to ban users by their real name with the 'a' and 'r' extbans", VF_OPTCOMMON|VF_VENDOR);
        }
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
        {
-               if ((mask.length() > 2) && (mask[0] == 'r') && (mask[1] == ':'))
+               if ((mask.length() > 2) && (mask[1] == ':'))
                {
-                       if (InspIRCd::Match(user->GetRealName(), mask.substr(2)))
-                               return MOD_RES_DENY;
+                       if (mask[0] == 'r')
+                       {
+                               if (InspIRCd::Match(user->GetRealName(), mask.substr(2)))
+                                       return MOD_RES_DENY;
+                       }
+                       else if (mask[0] == 'a')
+                       {
+                               // Check that the user actually specified a real name.
+                               const size_t divider = mask.find('+', 1);
+                               if (divider == std::string::npos)
+                                       return MOD_RES_PASSTHRU;
+
+                               // Check whether the user's mask matches.
+                               if (!c->CheckBan(user, mask.substr(2, divider - 2)))
+                                       return MOD_RES_PASSTHRU;
+
+                               // Check whether the user's real name matches.
+                               if (InspIRCd::Match(user->GetRealName(), mask.substr(divider + 1)))
+                                       return MOD_RES_DENY;
+                       }
                }
                return MOD_RES_PASSTHRU;
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
+               tokens["EXTBAN"].push_back('a');
                tokens["EXTBAN"].push_back('r');
        }
 };