[Validator] Fix validation for single level domains

HypeMC · HypeMC · commit 829372b4767c · 2021-11-29T08:28:51.000+01:00
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -26,7 +26,11 @@ class UrlValidator extends ConstraintValidator
             (%s)://                                 # protocol
             (((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+:)?((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+)@)?  # basic auth
             (
-                ([\pL\pN\pS\-\_]+\.)*(([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                (
+                    ([\pL\pN\pS\-\_]+\.)*([\pL\pN\-\_]+[\pL\pN]\.?)   # a multi-level domain name
+                        |
+                    [\pL\pN\pS\-\_]+\.?                               # a single-level domain name
+                )
                     |                                                 # or
                 \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}                    # an IP address
                     |                                                 # or
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -128,6 +128,12 @@ public function getValidUrls()
             ['http://very.long.domain.name.com/'],
             ['http://localhost/'],
             ['http://myhost123/'],
+            ['http://internal-api'],
+            ['http://internal-api.'],
+            ['http://internal-api/'],
+            ['http://☎'],
+            ['http://☎.'],
+            ['http://☎/'],
             ['http://127.0.0.1/'],
             ['http://127.0.0.1:80/'],
             ['http://[::1]/'],
@@ -259,6 +265,8 @@ public function getInvalidUrls()
             ['http://127.0.0.1:aa/'],
             ['ftp://[::1]/'],
             ['http://[::1'],
+            ['http://hello.☎'],
+            ['http://hello.☎.'],
             ['http://hello.☎/'],
             ['http://:password@symfony.com'],
             ['http://:password@@symfony.com'],
@@ -276,6 +284,8 @@ public function getInvalidUrls()
             ['http://.m.example.com'],
             ['http://wwww.example..com'],
             ['http://.www.example.com'],
+            ['http://example.co-'],
+            ['http:///path'],
         ];
     }
 
