bug #43388 [Validator] Fixes URL validation for single-char subdomains (DfKimera)

fabpot · fabpot · commit 27b1153cc495 · 2021-10-12T06:41:34.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Validator] Fixes URL validation for single-char subdomains | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #43038 | License | MIT | Doc PR | This fixes an issue with failing validations for valid URLs that have a single char in subdomains. This bug was originally introduced on this commit: 074539d Some additional test cases with this scenario for valid and invalid URLs were added. Commits ------- d28c3ff bug #43038 [Validator] Fixes URL validation for single-char subdomains.
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -26,7 +26,7 @@ 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\pS\-\_]+)+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
+                ([\pL\pN\pS\-\_]+\.)*(([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a 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
@@ -106,6 +106,10 @@ public function getValidUrls()
             ['http://a.pl'],
             ['http://www.example.com'],
             ['http://tt.example.com'],
+            ['http://m.example.com'],
+            ['http://m.m.m.example.com'],
+            ['http://example.m.example.com'],
+            ['https://long-string_with+symbols.m.example.com'],
             ['http://www.example.com.'],
             ['http://www.example.museum'],
             ['https://example.com/'],
@@ -268,6 +272,8 @@ public function getInvalidUrls()
             ['http://'],
             ['http://www..com'],
             ['http://www..example.com'],
+            ['http://www..m.example.com'],
+            ['http://.m.example.com'],
             ['http://wwww.example..com'],
             ['http://.www.example.com'],
         ];

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class UrlValidator extends ConstraintValidator`
`26`	`26`	`(%s):// # protocol`
`27`	`27`	`(((?:[\_\.\pL\pN-]\|%%[0-9A-Fa-f]{2})+:)?((?:[\_\.\pL\pN-]\|%%[0-9A-Fa-f]{2})+)@)? # basic auth`
`28`	`28`	`(`
`29`		`- ([\pL\pN\pS]+\.?[\pL\pN\pS\-\_]+)+(\.?([\pL\pN]\|xn\-\-[\pL\pN-]+)+\.?) # a domain name`
	`29`	`+ ([\pL\pN\pS\-\_]+\.)*(([\pL\pN]\|xn\-\-[\pL\pN-]+)+\.?) # a domain name`
`30`	`30`	`\| # or`
`31`	`31`	`\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # an IP address`
`32`	`32`	`\| # or`