bug symfony#10275 [Validator] Fixed ACE domain checks on UrlValidator (symfony#10031) (aeoris)

fabpot · fabpot · commit 26d4db3e8ba2 · 2014-03-26T18:48:23.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Validator] Fixed ACE domain checks on UrlValidator (symfony#10031) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#10031 | License | MIT | Doc PR | I added some checks to allow internationalised domain names as per reported on symfony#10031 and some extra testcases to cover ACE domain names. Commits ------- 7a2f154 Fixed ACE domain checks on UrlValidator (symfony#10031)
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator
     const PATTERN = '~^
             (%s)://                                 # protocol
             (
-                ([\pL\pN\pS-]+\.)+[\pL]+                   # a domain name
+                ([\pL\pN\pS-]+\.)+([\pL]|xn\-\-[\pL\pN-]+)+                   # a domain name
                     |                                     #  or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}      # a IP address
                     |                                     #  or
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -91,15 +91,28 @@ public function getValidUrls()
             array('http://[::1]:80/'),
             array('http://[1:2:3::4:5:6:7]/'),
             array('http://sãopaulo.com/'),
+            array('http://xn--sopaulo-xwa.com/'),
             array('http://sãopaulo.com.br/'),
+            array('http://xn--sopaulo-xwa.com.br/'),
             array('http://пример.испытание/'),
+            array('http://xn--e1afmkfd.xn--80akhbyknj4f/'),
             array('http://مثال.إختبار/'),
+            array('http://xn--mgbh0fb.xn--kgbechtv/'),
             array('http://例子.测试/'),
+            array('http://xn--fsqu00a.xn--0zwm56d/'),
             array('http://例子.測試/'),
+            array('http://xn--fsqu00a.xn--g6w251d/'),
             array('http://例え.テスト/'),
+            array('http://xn--r8jz45g.xn--zckzah/'),
             array('http://مثال.آزمایشی/'),
+            array('http://xn--mgbh0fb.xn--hgbk6aj7f53bba/'),
             array('http://실례.테스트/'),
+            array('http://xn--9n2bp8q.xn--9t4b11yi5a/'),
             array('http://العربية.idn.icann.org/'),
+            array('http://xn--ogb.idn.icann.org/'),
+            array('http://xn--e1afmkfd.xn--80akhbyknj4f.xn--e1afmkfd/'),
+            array('http://xn--espaa-rta.xn--ca-ol-fsay5a/'),
+            array('http://xn--d1abbgf6aiiy.xn--p1ai/'),
             array('http://☎.com/'),
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator`
`25`	`25`	`const PATTERN = '~^`
`26`	`26`	`(%s):// # protocol`
`27`	`27`	`(`
`28`		`- ([\pL\pN\pS-]+\.)+[\pL]+ # a domain name`
	`28`	`+ ([\pL\pN\pS-]+\.)+([\pL]\|xn\-\-[\pL\pN-]+)+ # a domain name`
`29`	`29`	`\| # or`
`30`	`30`	`\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # a IP address`
`31`	`31`	`\| # or`