bug #47529 [Routing] Reject v2 UUIDs (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit b3f34b002532 · 2022-09-09T11:35:19.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [Routing] Reject v2 UUIDs | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - We don't support them, they're legacy. Commits ------- 33a1479 [Routing] Reject v2 UUIDs
diff --git a/src/Symfony/Component/Routing/Requirement/Requirement.php b/src/Symfony/Component/Routing/Requirement/Requirement.php
@@ -24,7 +24,7 @@ enum Requirement
     public const UID_BASE58 = '[1-9A-HJ-NP-Za-km-z]{22}';
     public const UID_RFC4122 = '[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}';
     public const ULID = '[0-7][0-9A-HJKMNP-TV-Z]{25}';
-    public const UUID = '[0-9a-f]{8}-[0-9a-f]{4}-[1-6][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
+    public const UUID = '[0-9a-f]{8}-[0-9a-f]{4}-[13-6][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
     public const UUID_V1 = '[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
     public const UUID_V3 = '[0-9a-f]{8}-[0-9a-f]{4}-3[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
     public const UUID_V4 = '[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
diff --git a/src/Symfony/Component/Routing/Tests/Requirement/RequirementTest.php b/src/Symfony/Component/Routing/Tests/Requirement/RequirementTest.php
@@ -272,6 +272,7 @@ public function testUuidOK(string $uuid)
      *              ["e55a29be-ba25-46e0-a5e5-85b78a6f9a1"]
      *              ["e55a29bh-ba25-46e0-a5e5-85b78a6f9a11"]
      *              ["e55a29beba2546e0a5e585b78a6f9a11"]
+     *              ["21902510-bc96-21ec-8422-0242ac120002"]
      */
     public function testUuidKO(string $uuid)
     {

Original file line number	Diff line number	Diff line change
`@@ -272,6 +272,7 @@ public function testUuidOK(string $uuid)`
`272`	`272`	`* ["e55a29be-ba25-46e0-a5e5-85b78a6f9a1"]`
`273`	`273`	`* ["e55a29bh-ba25-46e0-a5e5-85b78a6f9a11"]`
`274`	`274`	`* ["e55a29beba2546e0a5e585b78a6f9a11"]`
	`275`	`+ * ["21902510-bc96-21ec-8422-0242ac120002"]`
`275`	`276`	`*/`
`276`	`277`	`public function testUuidKO(string $uuid)`
`277`	`278`	`{`