X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_gecosban.cpp;h=2bbc4ad61f9c15b9bfe0b342bfff572493e73e3d;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=49ca17fe0cc72a94cd40a14636df65433e1c3f60;hpb=432bfa9dfab698d35c618e648340567bdd17610c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 49ca17fe0..2bbc4ad61 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -1,66 +1,71 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2015 Renegade334 <contact.caaeed4f@renegade334.me.uk>
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Implements extban +b r: - realname (gecos) bans */
+#include "inspircd.h"
 
-class ModuleNickBan : public Module
+class ModuleGecosBan : public Module
 {
- private:
  public:
-	ModuleNickBan(InspIRCd* Me) : Module(Me)
-	{
-		Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	virtual ~ModuleNickBan()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("Adds the r extended ban which checks whether users have a real name (gecos) matching the specified glob pattern.", VF_OPTCOMMON|VF_VENDOR);
 	}
 
-	virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key)
+	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE
 	{
-		if (!IS_LOCAL(user))
-			return 0;
+		if ((mask.length() > 2) && (mask[1] == ':'))
+		{
+			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;
 
-		if (!c)
-			return 0;
+				// Check whether the user's mask matches.
+				if (!c->CheckBan(user, mask.substr(2, divider - 2)))
+					return MOD_RES_PASSTHRU;
 
-		if (c->IsExtBanned(user->fullname, 'r'))
-		{
-			// XXX: send a numeric here
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot join " + c->name + ", as you match a ban");
-			return 1;
+				// Check whether the user's real name matches.
+				if (InspIRCd::Match(user->GetRealName(), mask.substr(divider + 1)))
+					return MOD_RES_DENY;
+			}
 		}
-
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		if (output.find(" EXTBAN=:") == std::string::npos)
-			output.append(" EXTBAN=:r");
-		else
-			output.insert(output.find(" EXTBAN=:") + 9, "r");
+		tokens["EXTBAN"].push_back('a');
+		tokens["EXTBAN"].push_back('r');
 	}
 };
 
-
-MODULE_INIT(ModuleNickBan)
-
+MODULE_INIT(ModuleGecosBan)