bug #34832 [3.4][Validator] Allow underscore character "_" in URL username and password (romainneutron)

fabpot · fabpot · commit ffcb691698f9 · 2019-12-05T17:05:19.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [3.4][Validator] Allow underscore character "_" in URL username and password | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Hello! It's been a long time since my last push on Symfony :) Here's a bug fix. I think URL usernames and password may contain an underscore. Let me know! Commits ------- 869518b [Validator] Allow underscore character "_" in URL username and password
diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php
@@ -23,7 +23,7 @@ class UrlValidator extends ConstraintValidator
 {
     const PATTERN = '~^
             (%s)://                                 # protocol
-            (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)?      # basic auth
+            (([\_\.\pL\pN-]+:)?([\_\.\pL\pN-]+)@)?  # basic auth
             (
                 ([\pL\pN\pS\-\_\.])+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
                     |                                                 # or
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -117,9 +117,11 @@ public function getValidUrls()
             ['http://☎.com/'],
             ['http://username:password@symfony.com'],
             ['http://user.name:password@symfony.com'],
+            ['http://user_name:pass_word@symfony.com'],
             ['http://username:pass.word@symfony.com'],
             ['http://user.name:pass.word@symfony.com'],
             ['http://user-name@symfony.com'],
+            ['http://user_name@symfony.com'],
             ['http://symfony.com?'],
             ['http://symfony.com?query=1'],
             ['http://symfony.com/?query=1'],

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class UrlValidator extends ConstraintValidator`
`23`	`23`	`{`
`24`	`24`	`const PATTERN = '~^`
`25`	`25`	`(%s):// # protocol`
`26`		`- (([\.\pL\pN-]+:)?([\.\pL\pN-]+)@)? # basic auth`
	`26`	`+ (([\_\.\pL\pN-]+:)?([\_\.\pL\pN-]+)@)? # basic auth`
`27`	`27`	`(`
`28`	`28`	`([\pL\pN\pS\-\_\.])+(\.?([\pL\pN]\|xn\-\-[\pL\pN-]+)+\.?) # a domain name`
`29`	`29`	`\| # or`
-Original file line number
+Diff line change
             ['http://☎.com/'],
             ['http://username:[email protected]'],
             ['http://user.name:[email protected]'],
 +            ['http://user_name:[email protected]'],
             ['http://username:[email protected]'],
             ['http://user.name:[email protected]'],
             ['http://[email protected]'],
 +            ['http://[email protected]'],
             ['http://symfony.com?'],
             ['http://symfony.com?query=1'],
             ['http://symfony.com/?query=1'],