X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fwildcard.cpp;h=f9e706906b3f4bbe3339b22b36088680a035bf6d;hb=fe41ae3e8194d531e6e7427ec30d3fb58871498c;hp=270117b65f01113d35eeec17fc4e955ef6d3d7cd;hpb=33a86261992ac0ea82840e0e0656bf5b5c853469;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/wildcard.cpp b/src/wildcard.cpp index 270117b65..f9e706906 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -1,117 +1,126 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * 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 * - * 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 . */ -/* $Core */ #include "inspircd.h" -#include "hashcomp.h" -#include "inspstring.h" -/* - * Wildcard matching! - * - * Iteration 1) - * Slow, horrible, etc. - * Iteration 2) - * The vastly available 'public domain' one - * Iteration 3) - * ZNC's, thought to be faster than ours, but it turned out that we could do better ;-) - * Iteration 4) - * Largely from work by peavey and myself (w00t) :) - * Iteration 5) - * peavey: Fix glob scan similar to 1.1, but scan ahead on glob in inner loop to retain speedup - * this fixes another case which we forgot to test. Add early return for obvious fail condition. - */ -static bool match_internal(const unsigned char *string, const unsigned char *wild, unsigned const char *map) +static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map) { - const unsigned char *s, *m; m = wild; + unsigned char* cp = NULL; + unsigned char* mp = NULL; + unsigned char* string = (unsigned char*)str; + unsigned char* wild = (unsigned char*)mask; - if (*string && !*wild) - return false; - - if (!map) - map = lowermap; + while ((*string) && (*wild != '*')) + { + if ((map[*wild] != map[*string]) && (*wild != '?')) + { + return 0; + } + wild++; + string++; + } while (*string) { if (*wild == '*') { - while (*wild && *wild == '*') - wild++; - - m = wild; - - if (!*wild) - return true; - else if (*wild != '?') + if (!*++wild) { - s = string; - while (*s) - { - if ((map[*wild] == map[*s])) - { - string = s; - if (*(wild+1) || !*(s+1)) - wild++; - break; - } - s++; - } + return 1; } + mp = wild; + cp = string+1; } - else if ( (map[*wild] == map[*string]) || (*wild == '?') ) - wild++; else - wild = m; + if ((map[*wild] == map[*string]) || (*wild == '?')) + { + wild++; + string++; + } + else + { + wild = mp; + string = cp++; + } - string++; } - while (*wild && *wild == '*') + while (*wild == '*') + { wild++; + } return !*wild; } -/******************************************************************** - * Below here is all wrappers around match_internal - ********************************************************************/ +// Below here is all wrappers around MatchInternal -CoreExport bool InspIRCd::Match(const std::string &str, const std::string &mask, unsigned const char *map) +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; +}