Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/uri-validation' of https://github.com/Maks3w/zf2 …
Browse files Browse the repository at this point in the history 
…into hotfix/uri-ipv6
  • Loading branch information
@weierophinney
weierophinney committed Jun 27, 2012
65 parents b6ad313 + f726ae3 + 7ad284f + 93b2293 + 6b9f3a9 + 8651985 + ed49c8f + 861b59b + ab368b3 + 42e779e + e446b23 + a77df97 + 83bebb3 + fac5fe1 + 0ecf55e + 6c9ab93 + d1576fd + 452dcfd + a5c8053 + 47591a8 + 4632b67 + 93389c9 + 59d4a69 + 6d7b139 + d060759 + a69361e + 65d2077 + ab34f04 + 16dc336 + 5ee0e7c + a3c5b47 + 0482e7d + 7349022 + 870fdc6 + 41980d5 + 8191f6d + 28e1f24 + c13913c + a787df2 + 700bec3 + 6279a0a + 59e1371 + 384145a + 2186cf3 + 266dd39 + 58cda5f + 6880bda + 9c58077 + f0a7ffa + af9ffb6 + 3a4f745 + f6ee3fa + ab1f64f + 37055aa + 785b6c6 + 965cde0 + b50b4db + cdc3a1d + d0638c2 + d2d69cb + f47f0b9 + c9b215a + 29a471c + 0110db8 + d8fbbe0 commit 1914f43
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 20 deletions.
8 changes: 4 additions & 4 deletions src/Http.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Http extends Uri
/**
* @see Uri::$validHostTypes
*/
protected $validHostTypes = self::HOST_DNSORIPV6;
protected $validHostTypes = self::HOST_DNS_OR_IPV4_OR_IPV6;

/**
* User name as provided in authority of URI
Expand All @@ -56,7 +56,7 @@ class Http extends Uri
/**
* Check if the URI is a valid HTTP URI
*
* This applys additional HTTP specific validation rules beyond the ones
* This applies additional HTTP specific validation rules beyond the ones
* required by the generic URI syntax
*
* @return boolean
Expand Down Expand Up @@ -124,14 +124,14 @@ public function setPassword($password)
/**
* Validate the host part of an HTTP URI
*
* This overrides the common URI validation method with a DNS or IPv4 only
* This overrides the common URI validation method with a DNS or IP only
* default. Users may still enforce allowing other host types.
*
* @param string $host
* @param integer $allowed
* @return boolean
*/
public static function validateHost($host, $allowed = self::HOST_DNSORIPV4)
public static function validateHost($host, $allowed = self::HOST_DNS_OR_IPV4_OR_IPV6)
{
return parent::validateHost($host, $allowed);
}
Expand Down
32 changes: 19 additions & 13 deletions src/Uri.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,23 @@ class Uri
const CHAR_RESERVED = ':\/\?#\[\]@!\$&\'\(\)\*\+,;=';

/**
* Host part types
* Host part types represented as binary masks
* The binary mask consists of 5 bits in the following order:
* <RegName> | <DNS> | <IPvFuture> | <IPv6> | <IPv4>
* Place 1 or 0 in the different positions for enable or disable the part.
* Finally use a hexadecimal representation.
*/
const HOST_IPV4 = 1;
const HOST_IPV6 = 2;
const HOST_IPVF = 4;
const HOST_IPVANY = 7;
const HOST_DNSNAME = 8;
const HOST_DNSORIPV4 = 9;
const HOST_DNSORIPV6 = 10;
const HOST_REGNAME = 16;
const HOST_ALL = 31;
const HOST_IPV4 = 0x01; //00001
const HOST_IPV6 = 0x02; //00010
const HOST_IPVFUTURE = 0x04; //00100
const HOST_IPVANY = 0x07; //00111
const HOST_DNS = 0x08; //01000
const HOST_DNS_OR_IPV4 = 0x09; //01001
const HOST_DNS_OR_IPV6 = 0x0A; //01010
const HOST_DNS_OR_IPV4_OR_IPV6 = 0x0B; //01011
const HOST_DNS_OR_IPVANY = 0x0F; //01111
const HOST_REGNAME = 0x10; //10000
const HOST_ALL = 0x1F; //11111

/**
* URI scheme
Expand Down Expand Up @@ -835,7 +841,7 @@ public static function validateHost($host, $allowed = self::HOST_ALL)
}
}

if ($allowed & self::HOST_DNSNAME) {
if ($allowed & self::HOST_DNS) {
if (static::isValidDnsHostname($host)) {
return true;
}
Expand Down Expand Up @@ -1105,7 +1111,7 @@ protected static function isValidIpAddress($host, $allowed)
'allowipv6' => (bool) ($allowed & self::HOST_IPV6),
);

if ($allowed & (self::HOST_IPV6 | self::HOST_IPVF)) {
if ($allowed & (self::HOST_IPV6 | self::HOST_IPVFUTURE)) {
if (preg_match('/^\[(.+)\]$/', $host, $match)) {
$host = $match[1];
$validatorParams['allowipv4'] = false;
Expand All @@ -1119,7 +1125,7 @@ protected static function isValidIpAddress($host, $allowed)
}
}

if ($allowed & self::HOST_IPVF) {
if ($allowed & self::HOST_IPVFUTURE) {
$regex = '/^v\.[[:xdigit:]]+[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . ':]+$/';
return (bool) preg_match($regex, $host);
}
Expand Down
46 changes: 43 additions & 3 deletions test/HttpTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class HttpTest extends TestCase
*
* @return array
*/
static public function validSchemeProvider()
public function validSchemeProvider()
{
return array(
array('http'),
Expand All @@ -55,12 +55,39 @@ static public function validSchemeProvider()
);
}

public function validHostProvider()
{
return array(
array('', false),
array('http', true),
array('http:', false),
array('http:/', false),
array('http://', false),
array('http:///', false),
array('http://www.example.org/', false),
array('www.example.org:80', false),
array('www.example.org', true),
array('http://foo', false),
array('foo', true),
array('ftp://user:[email protected]/', false),
array('www.fi/', false),
array('http://1.1.1.1/', false),
array('1.1.1.1', true),
array('1.256.1.1', true), // Hostnames can be only numbers
array('http://[::1]/', false),
array('[::1]', true),
array('http://[2620:0:1cfe:face:b00c::3]/', false),
array('[2620:0:1cfe:face:b00c::3]:80', false),
array('[2620:0:1cfe:face:b00c::3]', true),
);
}

/**
* Invalid HTTP schemes
*
* @return array
*/
static public function invalidSchemeProvider()
public function invalidSchemeProvider()
{
return array(
array('file'),
Expand All @@ -70,7 +97,7 @@ static public function invalidSchemeProvider()
);
}

static public function portNormalizationTestsProvider()
public function portNormalizationTestsProvider()
{
return array(
array('http://www.example.com:80/foo/bar', 'http://www.example.com/foo/bar'),
Expand Down Expand Up @@ -123,6 +150,19 @@ public function testValidateSchemeInvalid($scheme)
$this->assertFalse(HttpUri::validateScheme($scheme));
}

/**
* Test the validity of the hosts
*
* @param string $host
* @param boolean $expected
* @return void
* @dataProvider validHostProvider
*/
public function testValidateHost($host, $expected)
{
$this->assertEquals($expected, HttpUri::validateHost($host), "Wrong Host validation $host");
}

/**
* Test that normalizing an HTTP URL removes the port depending on scheme
*
Expand Down

0 comments on commit 1914f43

Please sign in to comment.