mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Fixed GH-16944: Refactor IP ranges by using the tables from RFC 6890
This commit is contained in:
Derick Rethans
parent
f2fdcfc8c3
commit
d25aac29ce
3 changed files with 145 additions and 81 deletions
4
NEWS
4
NEWS
|
|
@ -15,6 +15,10 @@ PHP NEWS
|
||||||
- FFI:
|
- FFI:
|
||||||
. Fixed bug #79075 (FFI header parser chokes on comments). (nielsdos)
|
. Fixed bug #79075 (FFI header parser chokes on comments). (nielsdos)
|
||||||
|
|
||||||
|
- Filter:
|
||||||
|
. Fixed bug GH-16944 (Fix filtering special IPv4 and IPv6 ranges, by using
|
||||||
|
information from RFC 6890). (Derick)
|
||||||
|
|
||||||
- FPM:
|
- FPM:
|
||||||
. Fixed bug GH-13437 (FPM: ERROR: scoreboard: failed to lock (already
|
. Fixed bug GH-13437 (FPM: ERROR: scoreboard: failed to lock (already
|
||||||
locked)). (Jakub Zelenka)
|
locked)). (Jakub Zelenka)
|
||||||
|
|
|
||||||
|
|
@ -869,15 +869,115 @@ fixup_ip:
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
|
/* From the tables in RFC 6890 - Special-Purpose IP Address Registries */
|
||||||
|
static bool ipv4_get_status_flags(const int ip[8], bool *global, bool *reserved, bool *private)
|
||||||
|
{
|
||||||
|
*global = false;
|
||||||
|
*reserved = false;
|
||||||
|
*private = false;
|
||||||
|
|
||||||
|
if (ip[0] == 0) {
|
||||||
|
/* RFC 1122 - This host on this network */
|
||||||
|
*reserved = true;
|
||||||
|
} else if (ip[0] == 10) {
|
||||||
|
/* RFC 1918 - Private Use */
|
||||||
|
*private = true;
|
||||||
|
} else if (ip[0] == 100 && ip[1] >= 64 && ip[1] <= 127) {
|
||||||
|
/* RFC 6598 - Shared Address Space */
|
||||||
|
} else if (ip[0] == 127) {
|
||||||
|
/* RFC 1122 - Loopback */
|
||||||
|
*reserved = true;
|
||||||
|
} else if (ip[0] == 169 && ip[1] == 254) {
|
||||||
|
/* RFC 3927 - Link Local */
|
||||||
|
*reserved = true;
|
||||||
|
} else if (ip[0] == 172 && ip[1] >= 16 && ip[1] <= 31) {
|
||||||
|
/* RFC 1918 - Private Use */
|
||||||
|
*private = true;
|
||||||
|
} else if (ip[0] == 192 && ip[1] == 0 && ip[2] == 0) {
|
||||||
|
/* RFC 6890 - IETF Protocol Assignments */
|
||||||
|
} else if (ip[0] == 192 && ip[1] == 0 && ip[2] == 0 && ip[3] >= 0 && ip[3] <= 7) {
|
||||||
|
/* RFC 6333 - DS-Lite */
|
||||||
|
} else if (ip[0] == 192 && ip[1] == 0 && ip[2] == 2) {
|
||||||
|
/* RFC 5737 - Documentation */
|
||||||
|
} else if (ip[0] == 192 && ip[1] == 88 && ip[2] == 99) {
|
||||||
|
/* RFC 3068 - 6to4 Relay Anycast */
|
||||||
|
*global = true;
|
||||||
|
} else if (ip[0] == 192 && ip[1] == 168) {
|
||||||
|
/* RFC 1918 - Private Use */
|
||||||
|
*private = true;
|
||||||
|
} else if (ip[0] == 198 && ip[1] >= 18 && ip[1] <= 19) {
|
||||||
|
/* RFC 2544 - Benchmarking */
|
||||||
|
} else if (ip[0] == 198 && ip[1] == 51 && ip[2] == 100) {
|
||||||
|
/* RFC 5737 - Documentation */
|
||||||
|
} else if (ip[0] == 203 && ip[1] == 0 && ip[2] == 113) {
|
||||||
|
/* RFC 5737 - Documentation */
|
||||||
|
} else if (ip[0] >= 240 && ip[1] <= 255) {
|
||||||
|
/* RFC 1122 - Reserved */
|
||||||
|
*reserved = true;
|
||||||
|
} else if (ip[0] == 255 && ip[1] == 255 && ip[2] == 255 && ip[3] == 255) {
|
||||||
|
/* RFC 0919 - Limited Broadcast */
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* From the tables in RFC 6890 - Special-Purpose IP Address Registries */
|
||||||
|
static bool ipv6_get_status_flags(const int ip[8], bool *global, bool *reserved, bool *private)
|
||||||
|
{
|
||||||
|
*global = false;
|
||||||
|
*reserved = false;
|
||||||
|
*private = false;
|
||||||
|
|
||||||
|
if (ip[0] == 0 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0 && ip[4] == 0 && ip[5] == 0 && ip[6] == 0 && ip[7] == 0) {
|
||||||
|
/* RFC 4291 - Unspecified Address */
|
||||||
|
*reserved = true;
|
||||||
|
} else if (ip[0] == 0 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0 && ip[4] == 0 && ip[5] == 0 && ip[6] == 0 && ip[7] == 1) {
|
||||||
|
/* RFC 4291 - Loopback Address */
|
||||||
|
*reserved = true;
|
||||||
|
} else if (ip[0] == 0x0064 && ip[1] == 0xff9b) {
|
||||||
|
/* RFC 6052 - IPv4-IPv6 Translation */
|
||||||
|
*global = true;
|
||||||
|
} else if (ip[0] == 0 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0 && ip[4] == 0 && ip[5] == 0xffff) {
|
||||||
|
/* RFC 4291 - IPv4-mapped Address */
|
||||||
|
*reserved = true;
|
||||||
|
} else if (ip[0] == 0x0100 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0) {
|
||||||
|
/* RFC 6666 - Discard-Only Address Block */
|
||||||
|
} else if (ip[0] == 0x2001 && ip[1] == 0x0000) {
|
||||||
|
/* RFC 4380 - TEREDO */
|
||||||
|
} else if (ip[0] == 0x2001 && ip[1] <= 0x01ff) {
|
||||||
|
/* RFC 2928 - IETF Protocol Assignments */
|
||||||
|
} else if (ip[0] == 0x2001 && ip[1] == 0x0002 && ip[2] == 0) {
|
||||||
|
/* RFC 5180 - Benchmarking */
|
||||||
|
} else if (ip[0] == 0x2001 && ip[1] == 0x0db8) {
|
||||||
|
/* RFC 3849 - Documentation */
|
||||||
|
} else if (ip[0] == 0x2001 && ip[1] >= 0x0010 && ip[1] <= 0x001f) {
|
||||||
|
/* RFC 4843 - ORCHID */
|
||||||
|
} else if (ip[0] == 0x2002) {
|
||||||
|
/* RFC 3056 - 6to4 */
|
||||||
|
} else if (ip[0] >= 0xfc00 && ip[0] <= 0xfdff) {
|
||||||
|
/* RFC 4193 - Unique-Local */
|
||||||
|
*private = true;
|
||||||
|
} else if (ip[0] >= 0xfe80 && ip[0] <= 0xfebf) {
|
||||||
|
/* RFC 4291 - Linked-Scoped Unicast */
|
||||||
|
*reserved = true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Validates an ipv4 or ipv6 IP, based on the flag (4, 6, or both) add a flag
|
||||||
|
* to throw out reserved ranges; multicast ranges... etc. If both allow_ipv4
|
||||||
|
* and allow_ipv6 flags flag are used, then the first dot or colon determine
|
||||||
|
* the format */
|
||||||
void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
|
void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
|
||||||
{
|
{
|
||||||
/* validates an ipv4 or ipv6 IP, based on the flag (4, 6, or both) add a
|
int ip[8];
|
||||||
* flag to throw out reserved ranges; multicast ranges... etc. If both
|
int mode;
|
||||||
* allow_ipv4 and allow_ipv6 flags flag are used, then the first dot or
|
bool flag_global, flag_reserved, flag_private; /* flags for ranges as determined by RFC 6890 */
|
||||||
* colon determine the format */
|
|
||||||
|
|
||||||
int ip[8];
|
|
||||||
int mode;
|
|
||||||
|
|
||||||
if (memchr(Z_STRVAL_P(value), ':', Z_STRLEN_P(value))) {
|
if (memchr(Z_STRVAL_P(value), ':', Z_STRLEN_P(value))) {
|
||||||
mode = FORMAT_IPV6;
|
mode = FORMAT_IPV6;
|
||||||
|
|
@ -895,85 +995,35 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
|
||||||
RETURN_VALIDATION_FAILED
|
RETURN_VALIDATION_FAILED
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (mode) {
|
if (mode == FORMAT_IPV4) {
|
||||||
case FORMAT_IPV4:
|
if (!_php_filter_validate_ipv4(Z_STRVAL_P(value), Z_STRLEN_P(value), ip)) {
|
||||||
if (!_php_filter_validate_ipv4(Z_STRVAL_P(value), Z_STRLEN_P(value), ip)) {
|
RETURN_VALIDATION_FAILED
|
||||||
RETURN_VALIDATION_FAILED
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* Check flags */
|
if (!ipv4_get_status_flags(ip, &flag_global, &flag_reserved, &flag_private)) {
|
||||||
if (flags & FILTER_FLAG_NO_PRIV_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
|
return; /* no special block */
|
||||||
if (
|
}
|
||||||
(ip[0] == 10) ||
|
}
|
||||||
(ip[0] == 172 && ip[1] >= 16 && ip[1] <= 31) ||
|
else if (mode == FORMAT_IPV6) {
|
||||||
(ip[0] == 192 && ip[1] == 168)
|
if (_php_filter_validate_ipv6(Z_STRVAL_P(value), Z_STRLEN_P(value), ip) < 1) {
|
||||||
) {
|
RETURN_VALIDATION_FAILED
|
||||||
RETURN_VALIDATION_FAILED
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flags & FILTER_FLAG_NO_RES_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
|
if (!ipv6_get_status_flags(ip, &flag_global, &flag_reserved, &flag_private)) {
|
||||||
if (
|
return; /* no special block */
|
||||||
(ip[0] == 0) ||
|
}
|
||||||
(ip[0] >= 240) ||
|
}
|
||||||
(ip[0] == 127) ||
|
|
||||||
(ip[0] == 169 && ip[1] == 254)
|
|
||||||
) {
|
|
||||||
RETURN_VALIDATION_FAILED
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flags & FILTER_FLAG_GLOBAL_RANGE) {
|
if ((flags & FILTER_FLAG_GLOBAL_RANGE) && flag_global != true) {
|
||||||
if (
|
RETURN_VALIDATION_FAILED
|
||||||
(ip[0] == 100 && ip[1] >= 64 && ip[1] <= 127 ) ||
|
}
|
||||||
(ip[0] == 192 && ip[1] == 0 && ip[2] == 0 ) ||
|
|
||||||
(ip[0] == 192 && ip[1] == 0 && ip[2] == 2 ) ||
|
|
||||||
(ip[0] == 198 && ip[1] >= 18 && ip[1] <= 19 ) ||
|
|
||||||
(ip[0] == 198 && ip[1] == 51 && ip[2] == 100 ) ||
|
|
||||||
(ip[0] == 203 && ip[1] == 0 && ip[2] == 113 )
|
|
||||||
) {
|
|
||||||
RETURN_VALIDATION_FAILED
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
if ((flags & FILTER_FLAG_NO_PRIV_RANGE) && flag_private == true) {
|
||||||
|
RETURN_VALIDATION_FAILED
|
||||||
|
}
|
||||||
|
|
||||||
case FORMAT_IPV6:
|
if ((flags & FILTER_FLAG_NO_RES_RANGE) && flag_reserved == true) {
|
||||||
{
|
RETURN_VALIDATION_FAILED
|
||||||
int res = 0;
|
|
||||||
res = _php_filter_validate_ipv6(Z_STRVAL_P(value), Z_STRLEN_P(value), ip);
|
|
||||||
if (res < 1) {
|
|
||||||
RETURN_VALIDATION_FAILED
|
|
||||||
}
|
|
||||||
/* Check flags */
|
|
||||||
if (flags & FILTER_FLAG_NO_PRIV_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
|
|
||||||
if (ip[0] >= 0xfc00 && ip[0] <= 0xfdff) {
|
|
||||||
RETURN_VALIDATION_FAILED
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flags & FILTER_FLAG_NO_RES_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
|
|
||||||
if (
|
|
||||||
(ip[0] == 0 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0 && ip[4] == 0 && ip[5] == 0 && ip[6] == 0 && (ip[7] == 0 || ip[7] == 1)) ||
|
|
||||||
(ip[0] >= 0xfe80 && ip[0] <= 0xfebf) ||
|
|
||||||
(ip[0] == 0x2001 && (ip[1] == 0x0db8 || (ip[1] >= 0x0010 && ip[1] <= 0x001f)))
|
|
||||||
|
|
||||||
) {
|
|
||||||
RETURN_VALIDATION_FAILED
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (flags & FILTER_FLAG_GLOBAL_RANGE) {
|
|
||||||
if (
|
|
||||||
(ip[0] == 0 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0 && ip[4] == 0 && ip[5] == 0xffff) ||
|
|
||||||
(ip[0] == 0x0100 && ip[1] == 0 && ip[2] == 0 && ip[3] == 0) ||
|
|
||||||
(ip[0] == 0x2001 && ip[1] <= 0x01ff) ||
|
|
||||||
(ip[0] == 0x2001 && ip[1] == 0x0002 && ip[2] == 0) ||
|
|
||||||
(ip[0] >= 0xfc00 && ip[0] <= 0xfdff)
|
|
||||||
) {
|
|
||||||
RETURN_VALIDATION_FAILED
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
|
||||||
10
ext/filter/tests/gh16944.phpt
Normal file
10
ext/filter/tests/gh16944.phpt
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
--TEST--
|
||||||
|
Bug GH-16944 (Invalid filtering of IPv6 with FILTER_FLAG_NO_RES_RANGE)
|
||||||
|
--EXTENSIONS--
|
||||||
|
filter
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
var_dump(filter_var("::ffff:0:1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
|
||||||
|
?>
|
||||||
|
--EXPECT--
|
||||||
|
bool(false)
|
||||||
Loading…
Add table
Add a link
Reference in a new issue