Skip to content
This repository was archived by the owner on Jul 25, 2022. It is now read-only.

Change Domain and Label Validation Logic #27

Open
samizdam wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change Domain and Label Validation Logic #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27d326
Fix domains validation.
Aug 31, 2018
9ae08d4
Merge pull request #1 from timeweb/fix-domains-validation
samizdam Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/Punycode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ public function encode($input)
throw new LabelOutOfBoundsException(sprintf('The length of any one label is limited to between 1 and 63 octets, but %s given.', $length));
}
$part = $this->encodePart($part);

$length = strlen($part);
if ($length > 63 || $length < 1) {
throw new LabelOutOfBoundsException(sprintf('The length of any one label is limited to between 1 and 63 octets, but %s given.', $length));
}
}
$output = implode('.', $parts);
$length = strlen($output);
Expand Down Expand Up @@ -159,10 +164,6 @@ protected function encodePart($input)
$n++;
}
$out = static::PREFIX . $output;
$length = strlen($out);
if ($length > 63 || $length < 1) {
throw new LabelOutOfBoundsException(sprintf('The length of any one label is limited to between 1 and 63 octets, but %s given.', $length));
}

return $out;
}
Expand All @@ -176,6 +177,12 @@ protected function encodePart($input)
public function decode($input)
{
$input = strtolower($input);

$length = strlen($input);
if ($length > 255) {
throw new DomainOutOfBoundsException(sprintf('A full domain name is limited to 255 octets (including the separators), %s given.', $length));
}

$parts = explode('.', $input);
foreach ($parts as &$part) {
$length = strlen($part);
Expand All @@ -190,10 +197,6 @@ public function decode($input)
$part = $this->decodePart($part);
}
$output = implode('.', $parts);
$length = strlen($output);
if ($length > 255) {
throw new DomainOutOfBoundsException(sprintf('A full domain name is limited to 255 octets (including the separators), %s given.', $length));
}

return $output;
}
Expand Down
23 changes: 11 additions & 12 deletions tests/PunycodeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ public function domainNamesProvider()
'άέήίΰαβγδεζηθικλμνξοπρσστυφχ.com',
'xn--hxacdefghijklmnopqrstuvw0caz0a1a2a.com'
),
array(
'абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаежзи.абвгдаеж.рф',
'xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgiijk.xn--80aacefgii.xn--p1ai'
),
);
}

Expand Down Expand Up @@ -187,14 +191,14 @@ public function invalidUtf8DomainNamesProvider()
{
return array(
array(
'äöüßáàăâåãąāæćĉčċçďđéèĕêěëėęēğĝġģĥħíìĭîïĩįīıĵķĺľļłńňñņŋóòŏôőõøōœĸŕřŗśŝšşťţŧúùŭûůűũųūŵýŷÿźžżðþ.de',
'äöüßáàăâåãąāæćĉčċçďđéèĕêěëėęēğĝġģĥħì.de',
'\TrueBV\Exception\LabelOutOfBoundsException',
'The length of any one label is limited to between 1 and 63 octets, but 167 given.',
'The length of any one label is limited to between 1 and 63 octets, but 64 given.',
),
array(
'aaaaa.aaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaa.äöüßáàăâåãąāæćĉčċçďđéèĕêěëėęēğĝġģĥ.ħíìĭîïĩįīıĵķĺľļłńňñņŋóòŏôőõ.øōœĸŕřŗśŝšşťţŧúùŭûůűũųū.ŵýŷÿźžżðþ.de',
'aaa.aaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaa.äöüßáàăâåãąāæćĉčċçďđéèĕêěëėęēğĝġģĥ.ħíìĭîïĩįīıĵķĺľļłńňñņŋóòŏôőõ.øōœĸŕřŗśŝšşťţŧúùŭûůűũųū.ŵýŷÿźžżðþ.de',
'\TrueBV\Exception\DomainOutOfBoundsException',
'A full domain name is limited to 255 octets (including the separators), 258 given.',
'A full domain name is limited to 255 octets (including the separators), 256 given.',
),
array(
'aa..aa.de',
Expand Down Expand Up @@ -239,17 +243,12 @@ public function invalidAsciiDomainNameProvider()
{
return array(
array(
'xn--zcaccffbljjkknnoorrssuuxxd5e0a0a3ae9c6a4a9bzdzdxdudwdxd2d2d8d0dse7d6dwe9dxeueweye4eyewe9e5ewkkewc9ftfpfplwexfwf4infvf2f6f6f7f8fpg8fmgngrgrgvgzgygxg3gyg1g3g5gykqg9g.de',
'\TrueBV\Exception\LabelOutOfBoundsException',
'The length of any one label is limited to between 1 and 63 octets, but 167 given.',
),
array(
'xn--zcaccffbljjkknnoorrssuuxxd5e0a0a3ae9c8c1b0dxdvdvdxdvd3d0d6dyd8d5d4due7dveseuewe2eweue7e3esk9dxc7frf9e7kuevfuf1ilftf5f4f4f5f6fng6f8f9fpgpgtgxgwgvg1g2gzg1g3gvkog7g.xn--vda.de',
'xn--90aaaaaaqbbbbb4bccccc3fdddddeeeeee2hffffflggggg5khhhhh6siiii.xn--p1ai',
'\TrueBV\Exception\LabelOutOfBoundsException',
'The length of any one label is limited to between 1 and 63 octets, but 165 given.',
'The length of any one label is limited to between 1 and 63 octets, but 64 given.',
),
array(
'aaaaa.aaaaaaaaaaaaaaa.aaaaaaaaaaaaa.aaaaaaaaaaaaaaaa.aaaaaaaaaa.xn--zcaccffbljjkknn6lsd0d4a3b2b2b4b4byc8b0c8b4c0czcwd3c9c8c8c.xn--ddabeekggjj50c0ayw5a5a8d8a6cxb1bzfzb8b7bze8e8b.xn--pdaccf61ajetbrstxy0a1a5a5a9a2b0bzb6b5b8b.xn--hdazec20dnawqr.de',
'aaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaa.aaaaaaaaaaaaa.aaaaaaaaaaaaaaaa.aaaaaaaaaa.xn--zcaccffbljjkknn6lsd0d4a3b2b2b4b4byc8b0c8b4c0czcwd3c9c8c8c.xn--ddabeekggjj50c0ayw5a5a8d8a6cxb1bzfzb8b7bze8e8b.xn--pdaccf61ajetbrstxy0a1a5a5a9a2b0bzb6b5b8b.xn--hdazec20dnawqr.de',
'\TrueBV\Exception\DomainOutOfBoundsException',
'A full domain name is limited to 255 octets (including the separators), 256 given.',
),
Expand Down