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

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index e717b0ad4..f9e706906 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -1,45 +1,44 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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>
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
-/* $Core */
 
 #include "inspircd.h"
-#include "hashcomp.h"
-#include "inspstring.h"
 
-/*
- * Wildcard matching, the third (and probably final) iteration!
- *
- */
-static bool match_internal(const unsigned char *str, const unsigned char *mask, unsigned const char *map)
+static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map)
 {
-	const unsigned char *wild = str;
-	const unsigned char *string = mask;
-	const unsigned char *cp = NULL;
-	const unsigned char *mp = NULL;
-
-	if (!map)
-		map = lowermap; // default to case insensitive search
+	unsigned char* cp = NULL;
+	unsigned char* mp = NULL;
+	unsigned char* string = (unsigned char*)str;
+	unsigned char* wild = (unsigned char*)mask;
 
 	while ((*string) && (*wild != '*'))
 	{
-		if (map[*wild] != map[*string] && (*wild != '?'))
+		if ((map[*wild] != map[*string]) && (*wild != '?'))
 		{
-			return false;
+			return 0;
 		}
-
-		++wild;
-		++string;
+		wild++;
+		string++;
 	}
 
 	while (*string)
@@ -48,24 +47,23 @@ static bool match_internal(const unsigned char *str, const unsigned char *mask,
 		{
 			if (!*++wild)
 			{
-				return true;
+				return 1;
 			}
-
 			mp = wild;
 			cp = string+1;
 		}
-
-		// if mapped char == mapped wild AND wild is NOT ?
-		else if (map[*wild] == map[*string] && (*wild == '?'))
-		{
-			++wild;
-			++string;
-		}
 		else
-		{
-			wild = mp;
-			string = cp++;
-		}
+			if ((map[*wild] == map[*string]) || (*wild == '?'))
+			{
+				wild++;
+				string++;
+			}
+			else
+			{
+				wild = mp;
+				string = cp++;
+			}
+
 	}
 
 	while (*wild == '*')
@@ -73,35 +71,56 @@ static bool match_internal(const unsigned char *str, const unsigned char *mask,
 		wild++;
 	}
 
-	return (*wild == 0);
+	return !*wild;
 }
 
-CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map)
+// Below here is all wrappers around MatchInternal
+
+bool InspIRCd::Match(const std::string& str, const std::string& mask, unsigned const char* map)
 {
-	return match_internal((const unsigned char *)str.c_str(), (const unsigned char *)mask.c_str(), map);
+	if (!map)
+		map = national_case_insensitive_map;
+
+	return MatchInternal((const unsigned char*)str.c_str(), (const unsigned char*)mask.c_str(), map);
 }
 
-CoreExport bool InspIRCd::Match(const  char *str, const char *mask, unsigned const char *map)
+bool InspIRCd::Match(const char* str, const char* mask, unsigned const char* map)
 {
-	return match_internal((const unsigned char *)str, (const unsigned char *)mask, map);
-}
+	if (!map)
+		map = national_case_insensitive_map;
 
+	return MatchInternal((const unsigned char*)str, (const unsigned char*)mask, map);
+}
 
-CoreExport bool InspIRCd::MatchCIDR(const std::string &str, const std::string &mask, unsigned const char *map)
+bool InspIRCd::MatchCIDR(const std::string& str, const std::string& mask, unsigned const char* map)
 {
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
 	// Fall back to regular match
-	return InspIRCd::Match(str, mask, NULL);
+	return InspIRCd::Match(str, mask, map);
 }
 
-CoreExport bool InspIRCd::MatchCIDR(const  char *str, const char *mask, unsigned const char *map)
+bool InspIRCd::MatchCIDR(const char* str, const char* mask, unsigned const char* map)
 {
 	if (irc::sockets::MatchCIDR(str, mask, true))
 		return true;
 
 	// Fall back to regular match
-	return InspIRCd::Match(str, mask, NULL);
+	return InspIRCd::Match(str, mask, map);
 }
 
+bool InspIRCd::MatchMask(const std::string& masks, const std::string& hostname, const std::string& ipaddr)
+{
+	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;
+}