X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=f9e706906b3f4bbe3339b22b36088680a035bf6d;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=2243bc88217578b4607650a0c00e081aaaa407a4;hpb=0c828ad6d498a15f42b1d281ea979135a91b87e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 2243bc882..f9e706906 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,42 +1,39 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *
- * 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 <string>
+
 #include "inspircd.h"
-#include "hashcomp.h"
-#include "inspstring.h"
-
-using irc::sockets::MatchCIDR;
-
-// Wed 27 Apr 2005 - Brain
-// I've taken our our old wildcard routine -
-// although comprehensive, it was topheavy and very
-// slow, and ate masses of cpu when doing lots of
-// comparisons. This is the 'de-facto' routine used
-// by many, nobody really knows who wrote it first
-// or what license its under, i've seen examples of it
-// (unattributed to any author) all over the 'net.
-// For now, we'll just consider this public domain.
-
-bool csmatch(const char *str, const char *mask)
+
+static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map)
 {
-	unsigned char *cp = NULL, *mp = NULL;
+	unsigned char* cp = NULL;
+	unsigned char* mp = NULL;
 	unsigned char* string = (unsigned char*)str;
 	unsigned char* wild = (unsigned char*)mask;
 
 	while ((*string) && (*wild != '*'))
 	{
-		if ((*wild != *string) && (*wild != '?'))
+		if ((map[*wild] != map[*string]) && (*wild != '?'))
 		{
 			return 0;
 		}
@@ -56,16 +53,16 @@ bool csmatch(const char *str, const char *mask)
 			cp = string+1;
 		}
 		else
-		if ((*wild == *string) || (*wild == '?'))
-		{
-			wild++;
-			string++;
-		}
-		else
-		{
-			wild = mp;
-			string = cp++;
-		}
+			if ((map[*wild] == map[*string]) || (*wild == '?'))
+			{
+				wild++;
+				string++;
+			}
+			else
+			{
+				wild = mp;
+				string = cp++;
+			}
 
 	}
 
@@ -77,66 +74,53 @@ bool csmatch(const char *str, const char *mask)
 	return !*wild;
 }
 
-bool match(const char *str, const char *mask)
+// Below here is all wrappers around MatchInternal
+
+bool InspIRCd::Match(const std::string& str, const std::string& mask, unsigned const char* map)
 {
-	unsigned char *cp = NULL, *mp = NULL;
-	unsigned char* string = (unsigned char*)str;
-	unsigned char* wild = (unsigned char*)mask;
+	if (!map)
+		map = national_case_insensitive_map;
 
-	while ((*string) && (*wild != '*'))
-	{
-		if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?'))
-		{
-			return 0;
-		}
-		wild++;
-		string++;
-	}
+	return MatchInternal((const unsigned char*)str.c_str(), (const unsigned char*)mask.c_str(), map);
+}
 
-	while (*string)
-	{
-		if (*wild == '*')
-		{
-			if (!*++wild)
-			{
-				return 1;
-			}
-			mp = wild;
-			cp = string+1;
-		}
-		else
-		if ((lowermap[*wild] == lowermap[*string]) || (*wild == '?'))
-		{
-			wild++;
-			string++;
-		}
-		else
-		{
-			wild = mp;
-			string = cp++;
-		}
+bool InspIRCd::Match(const char* str, const char* mask, unsigned const char* map)
+{
+	if (!map)
+		map = national_case_insensitive_map;
 
-	}
+	return MatchInternal((const unsigned char*)str, (const unsigned char*)mask, map);
+}
 
-	while (*wild == '*')
-	{
-		wild++;
-	}
+bool InspIRCd::MatchCIDR(const std::string& str, const std::string& mask, unsigned const char* map)
+{
+	if (irc::sockets::MatchCIDR(str, mask, true))
+		return true;
 
-	return !*wild;
+	// Fall back to regular match
+	return InspIRCd::Match(str, mask, map);
 }
 
-/* Overloaded function that has the option of using cidr */
-bool match(const char *str, const char *mask, bool use_cidr_match)
+bool InspIRCd::MatchCIDR(const char* str, const char* mask, unsigned const char* map)
 {
-	if (use_cidr_match && MatchCIDR(str, mask, true))
+	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
-	return match(str, mask);
+
+	// Fall back to regular match
+	return InspIRCd::Match(str, mask, map);
 }
 
-bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match)
+bool InspIRCd::MatchMask(const std::string& masks, const std::string& hostname, const std::string& ipaddr)
 {
-	if (use_cidr_match && MatchCIDR(str, mask, true))
-		return true;
-	return csmatch(str, mask);
+	irc::spacesepstream masklist(masks);
+	std::string mask;
+	while (masklist.GetToken(mask))
+	{
+		if (InspIRCd::Match(hostname, mask, ascii_case_insensitive_map) ||
+			InspIRCd::MatchCIDR(ipaddr, mask, ascii_case_insensitive_map))
+		{
+			return true;
+		}
+	}
+	return false;
 }