diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #41801 [Uid] Fix fromString() with low base58 values (fancyweb)

Browse Source 
This PR was merged into the 5.2 branch.

Discussion
----------

[Uid] Fix fromString() with low base58 values

| Q             | A
| ------------- | ---
| Branch?       | 5.2
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

When converting base58 values to binary, we forgot to pad the result with null byte, so if the result is too "short", the code breaks.

Commits
-------

cd129210ce [Uid] Fix fromString() with low base58 values
This commit is contained in:
Nicolas Grekas 2021-06-23 20:30:41 +02:00
commit 67c3ffaae5
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Uid/AbstractUid.php
View File

@ -43,7 +43,7 @@ abstract class AbstractUid implements \JsonSerializable
abstract public function toBinary(): string;
/**
* Returns the identifier as a base-58 case sensitive string.
* Returns the identifier as a base58 case sensitive string.
*/
public function toBase58(): string
{
@ -51,7 +51,7 @@ abstract class AbstractUid implements \JsonSerializable
}
/**
* Returns the identifier as a base-32 case insensitive string.
* Returns the identifier as a base32 case insensitive string.
*/
public function toBase32(): string
{

5
src/Symfony/Component/Uid/Tests/UlidTest.php
View File

@ -124,4 +124,9 @@ class UlidTest extends TestCase
{
$this->assertInstanceOf(CustomUlid::class, CustomUlid::fromString((new CustomUlid())->toBinary()));
}
public function testFromStringBase58Padding()
{
$this->assertInstanceOf(Ulid::class, Ulid::fromString('111111111u9QRyVM94rdmZ'));
}
}

19
src/Symfony/Component/Uid/Tests/UuidTest.php
View File

@ -187,14 +187,24 @@ class UuidTest extends TestCase
$this->assertSame([$a, $b, $c, $d], $uuids);
}
public function testNilUuid()
/**
* @testWith ["00000000-0000-0000-0000-000000000000"]
* ["1111111111111111111111"]
* ["00000000000000000000000000"]
*/
public function testNilUuid(string $uuid)
{
$uuid = Uuid::fromString('00000000-0000-0000-0000-000000000000');
$uuid = Uuid::fromString($uuid);
$this->assertInstanceOf(NilUuid::class, $uuid);
$this->assertSame('00000000-0000-0000-0000-000000000000', (string) $uuid);
}
public function testNewNilUuid()
{
$this->assertSame('00000000-0000-0000-0000-000000000000', (string) new NilUuid());
}
public function testFromStringOnExtendedClassReturnsStatic()
{
$this->assertInstanceOf(CustomUuid::class, CustomUuid::fromString(self::A_UUID_V4));
@ -208,4 +218,9 @@ class UuidTest extends TestCase
$this->assertSame(-0.0000001, (new UuidV1('13813fff-1dd2-11b2-a456-426655440000'))->getTime());
$this->assertSame(-12219292800.0, ((new UuidV1('00000000-0000-1000-a456-426655440000'))->getTime()));
}
public function testFromStringBase58Padding()
{
$this->assertInstanceOf(Uuid::class, Uuid::fromString('111111111u9QRyVM94rdmZ'));
}
}

2
src/Symfony/Component/Uid/Ulid.php
View File

@ -61,7 +61,7 @@ class Ulid extends AbstractUid
if (36 === \strlen($ulid) && Uuid::isValid($ulid)) {
$ulid = (new Uuid($ulid))->toBinary();
} elseif (22 === \strlen($ulid) && 22 === strspn($ulid, BinaryUtil::BASE58[''])) {
$ulid = BinaryUtil::fromBase($ulid, BinaryUtil::BASE58);
$ulid = str_pad(BinaryUtil::fromBase($ulid, BinaryUtil::BASE58), 16, "\0", \STR_PAD_LEFT);
}
if (16 !== \strlen($ulid)) {

2
src/Symfony/Component/Uid/Uuid.php
View File

@ -37,7 +37,7 @@ class Uuid extends AbstractUid
public static function fromString(string $uuid): parent
{
if (22 === \strlen($uuid) && 22 === strspn($uuid, BinaryUtil::BASE58[''])) {
$uuid = BinaryUtil::fromBase($uuid, BinaryUtil::BASE58);
$uuid = str_pad(BinaryUtil::fromBase($uuid, BinaryUtil::BASE58), 16, "\0", \STR_PAD_LEFT);
}
if (16 === \strlen($uuid)) {