From 87b70b3b59fb3031c2f05571683f5b7e1c8eb431 Mon Sep 17 00:00:00 2001 From: Joel Wurtz Date: Wed, 2 Apr 2025 17:33:54 +0200 Subject: [PATCH] fix(validator): only check for puny code in tld --- .../Component/Validator/Constraints/UrlValidator.php | 11 ++++++++--- .../Validator/Tests/Constraints/UrlValidatorTest.php | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Validator/Constraints/UrlValidator.php b/src/Symfony/Component/Validator/Constraints/UrlValidator.php index 09173835d6926..53acd6a969295 100644 --- a/src/Symfony/Component/Validator/Constraints/UrlValidator.php +++ b/src/Symfony/Component/Validator/Constraints/UrlValidator.php @@ -26,9 +26,14 @@ class UrlValidator extends ConstraintValidator (((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+:)?((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+)@)? # basic auth ( (?: - (?:xn--[a-z0-9-]++\.)*+xn--[a-z0-9-]++ # a domain name using punycode - | - (?:[\pL\pN\pS\pM\-\_]++\.)+[\pL\pN\pM]++ # a multi-level domain name + (?: + (?:[\pL\pN\pS\pM\-\_]++\.)+ + (?: + (?:xn--[a-z0-9-]++) # punycode in tld + | + (?:[\pL\pN\pM]++) # no punycode in tld + ) + ) # a multi-level domain name | [a-z0-9\-\_]++ # a single-level domain name )\.? diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php index e2ffcb4ae130f..27866b021742b 100644 --- a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php @@ -186,6 +186,8 @@ public static function getValidUrls() ['http://xn--e1afmkfd.xn--80akhbyknj4f.xn--e1afmkfd/'], ['http://xn--espaa-rta.xn--ca-ol-fsay5a/'], ['http://xn--d1abbgf6aiiy.xn--p1ai/'], + ['http://example.xn--p1ai/'], + ['http://xn--d1abbgf6aiiy.example.xn--p1ai/'], ['http://☎.com/'], ['http://username:password@symfony.com'], ['http://user.name:password@symfony.com'],