diff options
| -rw-r--r-- | docs/conf/helpop-full.conf.example | 3 | ||||
| -rw-r--r-- | docs/conf/helpop.conf.example | 3 | ||||
| -rw-r--r-- | docs/conf/modules.conf.example | 5 | ||||
| -rw-r--r-- | src/modules/m_gecosban.cpp | 27 |
4 files changed, 32 insertions, 6 deletions
diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example index c33b80fd7..17e9ee37d 100644 --- 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 89c2716a6..8456346d9 100644 --- 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 7823e2d30..8a22a8c71 100644 --- 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 ae399a81f..09f3c9dc7 100644 --- 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'); } }; |