From d93df965b74111df4a15f5d41f596fb3d43cbae4 Mon Sep 17 00:00:00 2001 From: ozh Date: Thu, 30 Oct 2014 00:20:41 +0100 Subject: [PATCH 1/2] Fix IRI "normalization" --- library/Requests/IRI.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/library/Requests/IRI.php b/library/Requests/IRI.php index b8dceae43..26f215b6a 100755 --- a/library/Requests/IRI.php +++ b/library/Requests/IRI.php @@ -115,11 +115,9 @@ class Requests_IRI ), 'http' => array( 'port' => 80, - 'ipath' => '/' ), 'https' => array( 'port' => 443, - 'ipath' => '/' ), ); @@ -743,6 +741,10 @@ protected function scheme_normalization() { $this->ipath = ''; } + if (isset($this->ihost) && empty($this->ipath)) + { + $this->ipath = '/'; + } if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) { $this->iquery = null; @@ -1060,7 +1062,6 @@ protected function set_path($ipath) $cache[$ipath] = array($valid, $removed); $this->ipath = ($this->scheme !== null) ? $removed : $valid; } - $this->scheme_normalization(); return true; } From aca2b1e44d25594d73a1f00caea13013802daf32 Mon Sep 17 00:00:00 2001 From: ozh Date: Sat, 22 Nov 2014 10:31:01 +0100 Subject: [PATCH 2/2] Update IRI tests --- tests/IRI.php | 82 +++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/tests/IRI.php b/tests/IRI.php index db0fef4f3..8df8567d2 100755 --- a/tests/IRI.php +++ b/tests/IRI.php @@ -51,7 +51,7 @@ public static function rfc3986_tests() array('./g', 'http://a/b/c/g'), array('g/', 'http://a/b/c/g/'), array('/g', 'http://a/g'), - array('//g', 'http://g'), + array('//g', 'http://g/'), array('?y', 'http://a/b/c/d;p?y'), array('g?y', 'http://a/b/c/g?y'), array('#s', 'http://a/b/c/d;p?q#s'), @@ -66,8 +66,8 @@ public static function rfc3986_tests() array('..', 'http://a/b/'), array('../', 'http://a/b/'), array('../g', 'http://a/b/g'), - array('../..', 'http://a'), - array('../../', 'http://a'), + array('../..', 'http://a/'), + array('../../', 'http://a/'), array('../../g', 'http://a/g'), // Abnormal array('../../../g', 'http://a/g'), @@ -132,14 +132,14 @@ public static function sp_tests() array('http://a/b', 'c', 'http://a/c'), array('http://a/b/', "c\x0Ad", 'http://a/b/c%0Ad'), array('http://a/b/', "c\x0A\x0B", 'http://a/b/c%0A%0B'), - array('http://a/b/c', '//0', 'http://0'), + array('http://a/b/c', '//0', 'http://0/'), array('http://a/b/c', '0', 'http://a/b/0'), array('http://a/b/c', '?0', 'http://a/b/c?0'), array('http://a/b/c', '#0', 'http://a/b/c#0'), array('http://0/b/c', 'd', 'http://0/b/d'), array('http://a/b/c?0', 'd', 'http://a/b/d'), array('http://a/b/c#0', 'd', 'http://a/b/d'), - array('http://example.com', '//example.net', 'http://example.net'), + array('http://example.com', '//example.net', 'http://example.net/'), array('http:g', 'a', 'http:a'), ); } @@ -168,7 +168,7 @@ public static function absolutize_tests() { return array( array('http://example.com/', 'foo/111:bar', 'http://example.com/foo/111:bar'), - array('http://example.com/#foo', '', 'http://example.com'), + array('http://example.com/#foo', '', 'http://example.com/'), ); } @@ -201,38 +201,38 @@ public static function normalization_tests() array('example://A/', 'example://a/'), array('example://a/', 'example://a/'), array('example://%25A/', 'example://%25a/'), - array('HTTP://EXAMPLE.com/', 'http://example.com'), - array('http://example.com/', 'http://example.com'), - array('http://example.com:', 'http://example.com'), - array('http://example.com:80', 'http://example.com'), - array('http://@example.com', 'http://@example.com'), - array('http://', 'http://'), - array('http://example.com?', 'http://example.com?'), - array('http://example.com#', 'http://example.com#'), - array('https://example.com/', 'https://example.com'), - array('https://example.com:', 'https://example.com'), - array('https://@example.com', 'https://@example.com'), - array('https://example.com?', 'https://example.com?'), - array('https://example.com#', 'https://example.com#'), + array('HTTP://EXAMPLE.com/', 'http://example.com/'), + array('http://example.com/', 'http://example.com/'), + array('http://example.com:', 'http://example.com/'), + array('http://example.com:80', 'http://example.com/'), + array('http://@example.com', 'http://@example.com/'), + array('http://', 'http:///'), + array('http://example.com?', 'http://example.com/?'), + array('http://example.com#', 'http://example.com/#'), + array('https://example.com/', 'https://example.com/'), + array('https://example.com:', 'https://example.com/'), + array('https://@example.com', 'https://@example.com/'), + array('https://example.com?', 'https://example.com/?'), + array('https://example.com#', 'https://example.com/#'), array('file://localhost/foobar', 'file:/foobar'), - array('http://[0:0:0:0:0:0:0:1]', 'http://[::1]'), - array('http://[2001:db8:85a3:0000:0000:8a2e:370:7334]', 'http://[2001:db8:85a3::8a2e:370:7334]'), - array('http://[0:0:0:0:0:ffff:c0a8:a01]', 'http://[::ffff:c0a8:a01]'), - array('http://[ffff:0:0:0:0:0:0:0]', 'http://[ffff::]'), - array('http://[::ffff:192.0.2.128]', 'http://[::ffff:192.0.2.128]'), + array('http://[0:0:0:0:0:0:0:1]', 'http://[::1]/'), + array('http://[2001:db8:85a3:0000:0000:8a2e:370:7334]', 'http://[2001:db8:85a3::8a2e:370:7334]/'), + array('http://[0:0:0:0:0:ffff:c0a8:a01]', 'http://[::ffff:c0a8:a01]/'), + array('http://[ffff:0:0:0:0:0:0:0]', 'http://[ffff::]/'), + array('http://[::ffff:192.0.2.128]', 'http://[::ffff:192.0.2.128]/'), array('http://[invalid]', 'http:'), - array('http://[0:0:0:0:0:0:0:1]:', 'http://[::1]'), - array('http://[0:0:0:0:0:0:0:1]:80', 'http://[::1]'), - array('http://[0:0:0:0:0:0:0:1]:1234', 'http://[::1]:1234'), + array('http://[0:0:0:0:0:0:0:1]:', 'http://[::1]/'), + array('http://[0:0:0:0:0:0:0:1]:80', 'http://[::1]/'), + array('http://[0:0:0:0:0:0:0:1]:1234', 'http://[::1]:1234/'), // Punycode decoding helps with normalisation of IRIs, but is not // needed for URIs, so we don't really care about it for Requests - //array('http://xn--tdali-d8a8w.lv', 'http://tūdaliņ.lv'), - //array('http://t%C5%ABdali%C5%86.lv', 'http://tūdaliņ.lv'), - array('http://Aa@example.com', 'http://Aa@example.com'), - array('http://example.com?Aa', 'http://example.com?Aa'), + //array('http://xn--tdali-d8a8w.lv', 'http://tūdaliņ.lv/'), + //array('http://t%C5%ABdali%C5%86.lv', 'http://tūdaliņ.lv/'), + array('http://Aa@example.com', 'http://Aa@example.com/'), + array('http://example.com?Aa', 'http://example.com/?Aa'), array('http://example.com/Aa', 'http://example.com/Aa'), - array('http://example.com#Aa', 'http://example.com#Aa'), - array('http://[0:0:0:0:0:0:0:0]', 'http://[::]'), + array('http://example.com#Aa', 'http://example.com/#Aa'), + array('http://[0:0:0:0:0:0:0:0]', 'http://[::]/'), array('http:.', 'http:'), array('http:..', 'http:'), array('http:./', 'http:'), @@ -249,15 +249,15 @@ public static function normalization_tests() array("http://example.com/\xF3\xB0\x80\x80", 'http://example.com/%F3%B0%80%80'), array("http://example.com/\xF3\xB0\x80\x80%00", 'http://example.com/%F3%B0%80%80%00'), array("http://example.com/\xF3\xB0\x80\x80a", 'http://example.com/%F3%B0%80%80a'), - array("http://example.com?\xF3\xB0\x80\x80", "http://example.com?\xF3\xB0\x80\x80"), - array("http://example.com?\xF3\xB0\x80\x80%00", "http://example.com?\xF3\xB0\x80\x80%00"), - array("http://example.com?\xF3\xB0\x80\x80a", "http://example.com?\xF3\xB0\x80\x80a"), + array("http://example.com?\xF3\xB0\x80\x80", "http://example.com/?\xF3\xB0\x80\x80"), + array("http://example.com?\xF3\xB0\x80\x80%00", "http://example.com/?\xF3\xB0\x80\x80%00"), + array("http://example.com?\xF3\xB0\x80\x80a", "http://example.com/?\xF3\xB0\x80\x80a"), array("http://example.com/\xEE\x80\x80", 'http://example.com/%EE%80%80'), array("http://example.com/\xEE\x80\x80%00", 'http://example.com/%EE%80%80%00'), array("http://example.com/\xEE\x80\x80a", 'http://example.com/%EE%80%80a'), - array("http://example.com?\xEE\x80\x80", "http://example.com?\xEE\x80\x80"), - array("http://example.com?\xEE\x80\x80%00", "http://example.com?\xEE\x80\x80%00"), - array("http://example.com?\xEE\x80\x80a", "http://example.com?\xEE\x80\x80a"), + array("http://example.com?\xEE\x80\x80", "http://example.com/?\xEE\x80\x80"), + array("http://example.com?\xEE\x80\x80%00", "http://example.com/?\xEE\x80\x80%00"), + array("http://example.com?\xEE\x80\x80a", "http://example.com/?\xEE\x80\x80a"), array("http://example.com/\xC2", 'http://example.com/%C2'), array("http://example.com/\xC2a", 'http://example.com/%C2a'), array("http://example.com/\xC2\x00", 'http://example.com/%C2%00'), @@ -268,8 +268,8 @@ public static function normalization_tests() array("http://example.com/\xFF%00", 'http://example.com/%FF%00'), array("http://example.com/\xFFa", 'http://example.com/%FFa'), array('http://example.com/%61', 'http://example.com/a'), - array('http://example.com?%26', 'http://example.com?%26'), - array('http://example.com?%61', 'http://example.com?a'), + array('http://example.com?%26', 'http://example.com/?%26'), + array('http://example.com?%61', 'http://example.com/?a'), array('///', '///'), ); }