Changeset 715 for trunk/lib

Timestamp:

Feb 13, 2020 4:49:10 AM (4 years ago)

Author:

anonymous

Message:

Use a simpler test for IP in CIDR notation

File:

• trunk/lib/Utilities.inc.php (modified) (2 diffs)

trunk/lib/Utilities.inc.php

@@ -279 +279 @@
     // Capture the full URL into the first match and only the first X characters into the second match.
     // This will match URLs not preceded by " ' or = (URLs inside an attribute) or ` (Markdown quoted) or double-scheme (http://http://www.asdf.com)
-    // Valid URL characters: ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=
+    // https://stackoverflow.com/questions/1547899/which-characters-make-a-url-invalid/1547940#1547940
     $regex = '@
         \b                                 # Start with a word-boundary.
@@ -1370 +1370 @@
     $addr_binary = sprintf('%032b', ip2long($addr));
     foreach ($networks as $network) {
-        if (preg_match('![\d\.]{7,15}/\d{1,2}!', $network)) {
+        if (mb_strpos($network, '/') !== false) {
             // IP is in CIDR notation.
             list($cidr_ip, $cidr_bitmask) = explode('/', $network);