-/* +------------------------------------+
- * | 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) 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/>.
*/
-/* $Core: libIRCDwildcard */
#include "inspircd.h"
-#include "hashcomp.h"
-#include "inspstring.h"
-
-using irc::sockets::MatchCIDR;
-
-/* Rewritten to operate on more effective C++ std::string types
- * rather than char* to avoid data copies.
- * - Brain
- */
-CoreExport bool csmatch(const std::string &str, const std::string &mask)
+static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map)
{
- std::string::const_iterator cp, mp;
-
- //unsigned char *cp = NULL, *mp = NULL;
- //unsigned char* string = (unsigned char*)str;
- //unsigned char* wild = (unsigned char*)mask;
-
- std::string::const_iterator wild = mask.begin();
- std::string::const_iterator string = str.begin();
-
- if (mask.empty())
- return false;
+ unsigned char* cp = NULL;
+ unsigned char* mp = NULL;
+ unsigned char* string = (unsigned char*)str;
+ unsigned char* wild = (unsigned char*)mask;
- while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
+ while ((*string) && (*wild != '*'))
{
- if ((*wild != *string) && (*wild != '?'))
+ if ((map[*wild] != map[*string]) && (*wild != '?'))
+ {
return 0;
-
+ }
wild++;
string++;
}
- while (string != str.end())
+ while (*string)
{
if (*wild == '*')
{
- if (++wild == mask.end())
+ if (!*++wild)
+ {
return 1;
-
+ }
mp = wild;
- cp = string;
- cp++;
- }
- else
- if ((*wild == *string) || (*wild == '?'))
- {
- wild++;
- string++;
+ cp = string+1;
}
else
- {
- wild = mp;
- string = cp++;
- }
+ if ((map[*wild] == map[*string]) || (*wild == '?'))
+ {
+ wild++;
+ string++;
+ }
+ else
+ {
+ wild = mp;
+ string = cp++;
+ }
}
- while ((wild != mask.end()) && (*wild == '*'))
- wild++;
-
- return wild == mask.end();
-}
-
-CoreExport bool match(const std::string &str, const std::string &mask)
-{
- std::string::const_iterator cp, mp;
- std::string::const_iterator wild = mask.begin();
- std::string::const_iterator string = str.begin();
-
- if (mask.empty())
- return false;
-
- while ((string != str.end()) && (wild != mask.end()) && (*wild != '*'))
+ while (*wild == '*')
{
- if ((lowermap[(unsigned char)*wild] != lowermap[(unsigned char)*string]) && (*wild != '?'))
- return 0;
-
wild++;
- string++;
}
- while (string != str.end())
- {
- if (*wild == '*')
- {
- if (++wild == mask.end())
- return 1;
+ return !*wild;
+}
- mp = wild;
- cp = string;
- cp++;
- }
- else
- if ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?'))
- {
- wild++;
- string++;
- }
- else
- {
- wild = mp;
- string = cp++;
- }
+// Below here is all wrappers around MatchInternal
- }
+bool InspIRCd::Match(const std::string& str, const std::string& mask, unsigned const char* map)
+{
+ if (!map)
+ map = national_case_insensitive_map;
- while ((wild != mask.end()) && (*wild == '*'))
- wild++;
+ return MatchInternal((const unsigned char*)str.c_str(), (const unsigned char*)mask.c_str(), map);
+}
+
+bool InspIRCd::Match(const char* str, const char* mask, unsigned const char* map)
+{
+ if (!map)
+ map = national_case_insensitive_map;
- return wild == mask.end();
+ return MatchInternal((const unsigned char*)str, (const unsigned char*)mask, map);
}
-/* Overloaded function that has the option of using cidr */
-CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match)
+bool InspIRCd::MatchCIDR(const std::string& str, const std::string& 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);
}
-CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &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 case_sensitive ? csmatch(str, mask) : match(str, mask);
+ // Fall back to regular match
+ return InspIRCd::Match(str, mask, map);
}
-CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask)
+bool InspIRCd::MatchMask(const std::string& masks, const std::string& hostname, const std::string& ipaddr)
{
- return case_sensitive ? csmatch(str, mask) : match(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;
}
-
projects / user / henk / code / inspircd.git / blobdiff