mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2584 from mrtorrent/fix_instanceid_format 

Fix instanceid format to prevent session loop
This commit is contained in:
Bernhard Posselt 2013-03-29 07:26:07 -07:00
parent 8ed9be5408 93a6ed3dab
commit 66d7cc4c74
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/util.php
View File

@ -411,18 +411,19 @@ class OC_Util {
exit();
}
/**
* get an id unqiue for this instance
* @return string
*/
public static function getInstanceId() {
$id=OC_Config::getValue('instanceid', null);
if(is_null($id)) {
$id=uniqid();
OC_Config::setValue('instanceid', $id);
}
return $id;
}
/**
* get an id unique for this instance
* @return string
*/
public static function getInstanceId() {
$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' . uniqid();
OC_Config::setValue('instanceid', $id);
}
return $id;
}
/**
* @brief Static lifespan (in seconds) when a request token expires.

5
tests/lib/util.php
View File

@ -54,4 +54,9 @@ class Test_Util extends PHPUnit_Framework_TestCase {
$this->assertEquals('no-reply@example.com', $email);
OC_Config::deleteKey('mail_domain');
}
function testGetInstanceIdGeneratesValidId() {
OC_Config::deleteKey('instanceid');
$this->assertStringStartsWith('oc', OC_Util::getInstanceId());
}
}