StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update random ID method to use str_random and not random_bytes

Browse source 
The use of random_bytes in combination with bin2hex was producing a lot of duplicate keys when tested in batches of 10k (anywhere from 2 to 6). The use of str_random yielded no duplicates even at scales of 100k keys that were 8 characters.
This commit is contained in:
Dane Everitt 2017-09-13 23:07:02 -05:00
parent 0e518be6ca
commit a8c4d6afdb
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
14 changed files with 50 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/Unit/Services/Servers/ServerCreationServiceTest.php
View file

@ -155,8 +155,8 @@ class ServerCreationServiceTest extends TestCase
$this->uuid = m::mock('overload:Ramsey\Uuid\Uuid');
$this->writer = m::mock(Writer::class);
$this->getFunctionMock('\\Pterodactyl\\Services\\Servers', 'bin2hex')
->expects($this->any())->willReturn('randomstring');
$this->getFunctionMock('\\Pterodactyl\\Services\\Servers', 'str_random')
->expects($this->any())->willReturn('random_string');
$this->getFunctionMock('\\Ramsey\\Uuid\\Uuid', 'uuid4')
->expects($this->any())->willReturn('s');
@ -187,12 +187,12 @@ class ServerCreationServiceTest extends TestCase
$this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
$this->uuid->shouldReceive('uuid4')->withNoArgs()->once()->andReturnSelf()
->shouldReceive('toString')->withNoArgs()->once()->andReturn('uuid-0000');
$this->usernameService->shouldReceive('generate')->with($this->data['name'], 'randomstring')
$this->usernameService->shouldReceive('generate')->with($this->data['name'], 'random_string')
->once()->andReturn('user_name');
$this->repository->shouldReceive('create')->with([
'uuid' => 'uuid-0000',
'uuidShort' => 'randomstring',
'uuidShort' => 'random_string',
'node_id' => $this->data['node_id'],
'name' => $this->data['name'],
'description' => $this->data['description'],
@ -210,7 +210,7 @@ class ServerCreationServiceTest extends TestCase
'option_id' => $this->data['option_id'],
'pack_id' => null,
'startup' => $this->data['startup'],
'daemonSecret' => 'randomstring',
'daemonSecret' => 'random_string',
'image' => $this->data['docker_image'],
'username' => 'user_name',
'sftp_password' => null,