Skip to content

Commit

Permalink
Merge pull request #1108 from oat-sa/backport/tr-5940/uri-provider-le…
Browse files Browse the repository at this point in the history
…ngth

[Backport][Fix] Set the maximum allowable value for URI - 36 characters
  • Loading branch information
shpran authored Mar 1, 2024
2 parents 8a93fd3 + c093157 commit 1d89fd6
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/kernel/uri/Bin2HexUriProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Bin2HexUriProvider extends ConfigurableService implements UriProvider
*/
public function provide()
{
return $this->getOption(self::OPTION_NAMESPACE) . uniqid('i') . getmypid()
. bin2hex(openssl_random_pseudo_bytes(8));
return $this->getOption(self::OPTION_NAMESPACE) . uniqid('i') . date('YmdHis')
. bin2hex(openssl_random_pseudo_bytes(4));
}
}
46 changes: 46 additions & 0 deletions test/unit/core/kernel/uri/Bin2HexUriProviderTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

/**
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; under version 2
* of the License (non-upgradable).
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Copyright (c) 2024 (original work) Open Assessment Technologies SA.
*/

declare(strict_types=1);

namespace oat\generis\test\unit\core\kernel\uri;

use oat\generis\model\kernel\uri\Bin2HexUriProvider;
use PHPUnit\Framework\TestCase;

class Bin2HexUriProviderTest extends TestCase
{
private const NAMESPACE = 'test#';

private Bin2HexUriProvider $sut;

protected function setUp(): void
{
$this->sut = new Bin2HexUriProvider(['namespace' => self::NAMESPACE]);
}

public function testProvide(): void
{
$uri = $this->sut->provide();

$this->assertStringContainsString(self::NAMESPACE, $uri);
$this->assertEquals(36, strlen(substr($uri, strlen(self::NAMESPACE))));
}
}

0 comments on commit 1d89fd6

Please sign in to comment.