X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=f9e706906b3f4bbe3339b22b36088680a035bf6d;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=ccd2e9ec177ef88b6185e3480e3a196b7d265d77;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/wildcard.cpp b/src/wildcard.cpp index ccd2e9ec1..f9e706906 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -1,161 +1,126 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2012 Robby + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008, 2010 Craig Edwards + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007-2008 Dennis Friis * - * 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 . */ -/* $Core */ #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 != mask.end() && *wild == '*') + if (*wild == '*') { - if (++wild == mask.end()) + if (!*++wild) + { return 1; - + } mp = wild; - cp = string; - - if (cp != str.end()) - cp++; + cp = string+1; } else - if ((string != str.end() && wild != mask.end()) && ((*wild == *string) || (*wild == '?'))) - { - wild++; - string++; - } - else - { - wild = mp; - if (cp == str.end()) - cp = str.end(); + 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 != mask.end() && *wild == '*') - { - if (++wild == mask.end()) - return 1; - - mp = wild; - cp = string; + return !*wild; +} - if (cp != str.end()) - cp++; +// Below here is all wrappers around MatchInternal - } - else - if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?'))) - { - wild++; - string++; - } - else - { - wild = mp; - if (cp == str.end()) - string = str.end(); - else - string = cp++; - } +bool InspIRCd::Match(const std::string& str, const std::string& mask, unsigned const char* map) +{ + if (!map) + map = national_case_insensitive_map; - } + return MatchInternal((const unsigned char*)str.c_str(), (const unsigned char*)mask.c_str(), map); +} - while ((wild != mask.end()) && (*wild == '*')) - wild++; +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; } -