diff options
| -rwxr-xr-x | lib/private/util.php | 2 | ||||
| -rw-r--r-- | tests/lib/util.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index f84bbede0ac..18857139791 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -877,7 +877,7 @@ class OC_Util { $id = OC_Config::getValue('instanceid', null); if (is_null($id)) { // We need to guarantee at least one letter in instanceid so it can be used as the session_name - $id = 'oc' . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(10); + $id = 'oc' . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS); OC_Config::$object->setValue('instanceid', $id); } return $id; diff --git a/tests/lib/util.php b/tests/lib/util.php index 8964f9f2666..999c62486a7 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -116,7 +116,10 @@ class Test_Util extends PHPUnit_Framework_TestCase { function testGetInstanceIdGeneratesValidId() { OC_Config::deleteKey('instanceid'); - $this->assertStringStartsWith('oc', OC_Util::getInstanceId()); + $instanceId = OC_Util::getInstanceId(); + $this->assertStringStartsWith('oc', $instanceId); + $matchesRegex = preg_match('/^[a-z0-9]+$/', $instanceId); + $this->assertSame(1, $matchesRegex); } /** |