Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / cidr.cpp

diff --git a/src/cidr.cpp b/src/cidr.cpp
index 31101836c930375484df444e007d7545910fb25f..b245a15527e7a25077f855ceae2df3c0be33e52c 100644 (file)
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -1,39 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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 */
 
 #include "inspircd.h"
 
-/* Used when comparing CIDR masks for the modulus bits left over.
- * A lot of ircd's seem to do this:
- * ((-1) << (8 - (mask % 8)))
- * But imho, it sucks in comparison to a nice neat lookup table.
- */
-const unsigned char inverted_bits[8] = {       0x00, /* 00000000 - 0 bits - never actually used */
-                               0x80, /* 10000000 - 1 bits */
-                               0xC0, /* 11000000 - 2 bits */
-                               0xE0, /* 11100000 - 3 bits */
-                               0xF0, /* 11110000 - 4 bits */
-                               0xF8, /* 11111000 - 5 bits */
-                               0xFC, /* 11111100 - 6 bits */
-                               0xFE  /* 11111110 - 7 bits */
-};
-
-
 /* Match CIDR strings, e.g. 127.0.0.1 to 127.0.0.0/8 or 3ffe:1:5:6::8 to 3ffe:1::0/32
- * If you have a lot of hosts to match, youre probably better off building your mask once
- * and then using the lower level MatchCIDRBits directly.
  *
  * This will also attempt to match any leading usernames or nicknames on the mask, using
  * match(), when match_with_username is true.
@@ -75,6 +65,15 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
                cidr_copy.assign(cidr_mask);
        }
 
+       const std::string::size_type per_pos = cidr_copy.rfind('/');
+       if ((per_pos == std::string::npos) || (per_pos == cidr_copy.length()-1)
+               || (cidr_copy.find_first_not_of("0123456789", per_pos+1) != std::string::npos)
+               || (cidr_copy.find_first_not_of("0123456789abcdefABCDEF.:") < per_pos))
+       {
+               // The CIDR mask is invalid
+               return false;
+       }
+
        irc::sockets::sockaddrs addr;
        irc::sockets::aptosa(address_copy, 0, addr);
 
@@ -82,7 +81,6 @@ bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr
        irc::sockets::cidr_mask mask2(addr, mask.length);
 
        return mask == mask2;
-
 }