Merge pull request #11241 from owncloud/use-lower-case

Use only lower-case letters

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;

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);
 	}
 
 	/**