bug #36180 [Uid] work around buggy libuuid (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit f18294ba4bcd · 2020-03-23T16:19:39.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [Uid] work around buggy libuuid | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As found while working on the polyfill, fixed upstream in util-linux/util-linux@d6ddf07 Commits ------- ebf601b [Uid] work around buggy libuuid
diff --git a/src/Symfony/Component/Uid/Tests/UuidTest.php b/src/Symfony/Component/Uid/Tests/UuidTest.php
@@ -59,6 +59,7 @@ public function testV3()
         $uuid = Uuid::v3(new UuidV4(self::A_UUID_V4), 'the name');
 
         $this->assertInstanceOf(UuidV3::class, $uuid);
+        $this->assertSame('8dac64d3-937a-3e7c-aa1d-d5d6c06a61f5', (string) $uuid);
     }
 
     public function testV4()
@@ -70,9 +71,10 @@ public function testV4()
 
     public function testV5()
     {
-        $uuid = Uuid::v5(new UuidV4(self::A_UUID_V4), 'the name');
+        $uuid = Uuid::v5(new UuidV4('ec07aa88-f84e-47b9-a581-1c6b30a2f484'), 'the name');
 
         $this->assertInstanceOf(UuidV5::class, $uuid);
+        $this->assertSame('851def0c-b9c7-55aa-a991-130e769ec0a9', (string) $uuid);
     }
 
     public function testV6()
diff --git a/src/Symfony/Component/Uid/Uuid.php b/src/Symfony/Component/Uid/Uuid.php
@@ -74,7 +74,14 @@ final public static function v1(): UuidV1
 
     final public static function v3(self $namespace, string $name): UuidV3
     {
-        return new UuidV3(uuid_generate_md5($namespace->uid, $name));
+        // don't use uuid_generate_md5(), some versions are buggy
+        $uuid = md5(hex2bin(str_replace('-', '', $namespace->uid)).$name, true);
+        $uuid[8] = $uuid[8] & "\x3F" | "\x80";
+        $uuid = substr_replace(bin2hex($uuid), '-', 8, 0);
+        $uuid = substr_replace($uuid, '-3', 13, 1);
+        $uuid = substr_replace($uuid, '-', 18, 0);
+
+        return new UuidV3(substr_replace($uuid, '-', 23, 0));
     }
 
     final public static function v4(): UuidV4
@@ -84,7 +91,14 @@ final public static function v4(): UuidV4
 
     final public static function v5(self $namespace, string $name): UuidV5
     {
-        return new UuidV5(uuid_generate_sha1($namespace->uid, $name));
+        // don't use uuid_generate_sha1(), some versions are buggy
+        $uuid = substr(sha1(hex2bin(str_replace('-', '', $namespace->uid)).$name, true), 0, 16);
+        $uuid[8] = $uuid[8] & "\x3F" | "\x80";
+        $uuid = substr_replace(bin2hex($uuid), '-', 8, 0);
+        $uuid = substr_replace($uuid, '-5', 13, 1);
+        $uuid = substr_replace($uuid, '-', 18, 0);
+
+        return new UuidV5(substr_replace($uuid, '-', 23, 0));
     }
 
     final public static function v6(): UuidV6

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public function testV3()`
`59`	`59`	`$uuid = Uuid::v3(new UuidV4(self::A_UUID_V4), 'the name');`
`60`	`60`
`61`	`61`	`$this->assertInstanceOf(UuidV3::class, $uuid);`
	`62`	`+ $this->assertSame('8dac64d3-937a-3e7c-aa1d-d5d6c06a61f5', (string) $uuid);`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`public function testV4()`
`@@ -70,9 +71,10 @@ public function testV4()`
`70`	`71`
`71`	`72`	`public function testV5()`
`72`	`73`	`{`
`73`		`- $uuid = Uuid::v5(new UuidV4(self::A_UUID_V4), 'the name');`
	`74`	`+ $uuid = Uuid::v5(new UuidV4('ec07aa88-f84e-47b9-a581-1c6b30a2f484'), 'the name');`
`74`	`75`
`75`	`76`	`$this->assertInstanceOf(UuidV5::class, $uuid);`
	`77`	`+ $this->assertSame('851def0c-b9c7-55aa-a991-130e769ec0a9', (string) $uuid);`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`public function testV6()`