X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=f9e706906b3f4bbe3339b22b36088680a035bf6d;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=29454108997a33430f5ae5f36702e84e64b3eab2;hpb=2e27c8a945e73d0f128d0f8677a7b0390e586ff1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/wildcard.cpp b/src/wildcard.cpp index 294541089..f9e706906 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -1,43 +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 + * 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: libIRCDwildcard */ #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. - -CoreExport 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; } @@ -57,16 +53,16 @@ CoreExport 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++; + } } @@ -78,73 +74,53 @@ CoreExport bool csmatch(const char *str, const char *mask) return !*wild; } -CoreExport bool match(const char *str, const char *mask) -{ - unsigned char *cp = NULL, *mp = NULL; - unsigned char* string = (unsigned char*)str; - unsigned char* wild = (unsigned char*)mask; - - while ((*string) && (*wild != '*')) - { - if ((lowermap[*wild] != lowermap[*string]) && (*wild != '?')) - { - return 0; - } - wild++; - string++; - } +// Below here is all wrappers around MatchInternal - 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 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 == '*') - { - wild++; - } +bool InspIRCd::Match(const char* str, const char* mask, unsigned const char* map) +{ + if (!map) + map = national_case_insensitive_map; - return !*wild; + return MatchInternal((const unsigned char*)str, (const unsigned char*)mask, map); } -/* Overloaded function that has the option of using cidr */ -CoreExport bool match(const char *str, const char *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 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 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 char *str, const char *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; } -