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

getMediumStrengthGenerator is deprecated and does not do anything anymore

This commit is contained in:
Roeland Jago Douma 2016-01-11 20:05:30 +01:00
parent 98c4951f45
commit 876fb83ddc
14 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/encryption/lib/crypto/encryptall.php
View File

@ -344,7 +344,7 @@ class EncryptAll {
* @return string password * @return string password
*/ */
protected function generateOneTimePassword($uid) { protected function generateOneTimePassword($uid) {
$password = $this->secureRandom->getMediumStrengthGenerator()->generate(8); $password = $this->secureRandom->generate(8);
$this->userPasswords[$uid] = $password; $this->userPasswords[$uid] = $password;
return $password; return $password;
} }

2
apps/federation/api/ocsauthapi.php
View File

@ -139,7 +139,7 @@ class OCSAuthAPI {
return new \OC_OCS_Result(null, HTTP::STATUS_FORBIDDEN); return new \OC_OCS_Result(null, HTTP::STATUS_FORBIDDEN);
} }
$sharedSecret = $this->secureRandom->getMediumStrengthGenerator()->generate(32); $sharedSecret = $this->secureRandom->generate(32);
$this->trustedServers->addSharedSecret($url, $sharedSecret); $this->trustedServers->addSharedSecret($url, $sharedSecret);
// reset token after the exchange of the shared secret was successful // reset token after the exchange of the shared secret was successful

2
apps/federation/lib/trustedservers.php
View File

@ -90,7 +90,7 @@ class TrustedServers {
$url = $this->updateProtocol($url); $url = $this->updateProtocol($url);
$result = $this->dbHandler->addServer($url); $result = $this->dbHandler->addServer($url);
if ($result) { if ($result) {
$token = $this->secureRandom->getMediumStrengthGenerator()->generate(16); $token = $this->secureRandom->generate(16);
$this->dbHandler->addToken($url, $token); $this->dbHandler->addToken($url, $token);
$this->jobList->add( $this->jobList->add(
'OCA\Federation\BackgroundJob\RequestSharedSecret', 'OCA\Federation\BackgroundJob\RequestSharedSecret',

2
core/lostpassword/controller/lostcontroller.php
View File

@ -227,7 +227,7 @@ class LostController extends Controller {
); );
} }
$token = $this->secureRandom->getMediumStrengthGenerator()->generate(21, $token = $this->secureRandom->generate(21,
ISecureRandom::CHAR_DIGITS. ISecureRandom::CHAR_DIGITS.
ISecureRandom::CHAR_LOWER. ISecureRandom::CHAR_LOWER.
ISecureRandom::CHAR_UPPER); ISecureRandom::CHAR_UPPER);

2
lib/base.php
View File

@ -1076,7 +1076,7 @@ class OC {
if ($config->getSystemValue('debug', false)) { if ($config->getSystemValue('debug', false)) {
self::$server->getLogger()->debug('Setting remember login to cookie', array('app' => 'core')); self::$server->getLogger()->debug('Setting remember login to cookie', array('app' => 'core'));
} }
$token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32); $token = \OC::$server->getSecureRandom()->generate(32);
$config->setUserValue($userId, 'login_token', $token, time()); $config->setUserValue($userId, 'login_token', $token, time());
OC_User::setMagicInCookie($userId, $token); OC_User::setMagicInCookie($userId, $token);
} else { } else {

2
lib/private/db/mdb2schemamanager.php
View File

@ -75,7 +75,7 @@ class MDB2SchemaManager {
* @return \OC\DB\Migrator * @return \OC\DB\Migrator
*/ */
public function getMigrator() { public function getMigrator() {
$random = \OC::$server->getSecureRandom()->getMediumStrengthGenerator(); $random = \OC::$server->getSecureRandom();
$platform = $this->conn->getDatabasePlatform(); $platform = $this->conn->getDatabasePlatform();
$config = \OC::$server->getConfig(); $config = \OC::$server->getConfig();
if ($platform instanceof SqlitePlatform) { if ($platform instanceof SqlitePlatform) {

2
lib/private/session/cryptowrapper.php
View File

@ -74,7 +74,7 @@ class CryptoWrapper {
if (!is_null($request->getCookie(self::COOKIE_NAME))) { if (!is_null($request->getCookie(self::COOKIE_NAME))) {
$this->passphrase = $request->getCookie(self::COOKIE_NAME); $this->passphrase = $request->getCookie(self::COOKIE_NAME);
} else { } else {
$this->passphrase = $this->random->getMediumStrengthGenerator()->generate(128); $this->passphrase = $this->random->generate(128);
$secureCookie = $request->getServerProtocol() === 'https'; $secureCookie = $request->getServerProtocol() === 'https';
// FIXME: Required for CI // FIXME: Required for CI
if (!defined('PHPUNIT_RUN')) { if (!defined('PHPUNIT_RUN')) {

2
lib/private/setup/mysql.php
View File

@ -143,7 +143,7 @@ class MySQL extends AbstractDatabase {
$this->dbUser = $adminUser; $this->dbUser = $adminUser;
//create a random password so we don't need to store the admin password in the config file //create a random password so we don't need to store the admin password in the config file
$this->dbPassword = $this->random->getMediumStrengthGenerator()->generate(30); $this->dbPassword = $this->random->generate(30);
$this->createDBUser($connection); $this->createDBUser($connection);

4
lib/private/share/share.php
View File

@ -819,7 +819,7 @@ class Share extends Constants {
if (isset($oldToken)) { if (isset($oldToken)) {
$token = $oldToken; $token = $oldToken;
} else { } else {
$token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(self::TOKEN_LENGTH, $token = \OC::$server->getSecureRandom()->generate(self::TOKEN_LENGTH,
\OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_UPPER. \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_UPPER.
\OCP\Security\ISecureRandom::CHAR_DIGITS \OCP\Security\ISecureRandom::CHAR_DIGITS
); );
@ -860,7 +860,7 @@ class Share extends Constants {
throw new \Exception($message_t); throw new \Exception($message_t);
} }
$token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(self::TOKEN_LENGTH, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_UPPER . $token = \OC::$server->getSecureRandom()->generate(self::TOKEN_LENGTH, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_UPPER .
\OCP\Security\ISecureRandom::CHAR_DIGITS); \OCP\Security\ISecureRandom::CHAR_DIGITS);
$shareWith = $user . '@' . $remote; $shareWith = $user . '@' . $remote;

2
lib/private/user.php
View File

@ -393,7 +393,7 @@ class OC_User {
* generates a password * generates a password
*/ */
public static function generatePassword() { public static function generatePassword() {
return \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(30); return \OC::$server->getSecureRandom()->generate(30);
} }
/** /**

2
lib/private/user/session.php
View File

@ -260,7 +260,7 @@ class Session implements IUserSession, Emitter {
} }
// replace successfully used token with a new one // replace successfully used token with a new one
\OC::$server->getConfig()->deleteUserValue($uid, 'login_token', $currentToken); \OC::$server->getConfig()->deleteUserValue($uid, 'login_token', $currentToken);
$newToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32); $newToken = \OC::$server->getSecureRandom()->generate(32);
\OC::$server->getConfig()->setUserValue($uid, 'login_token', $newToken, time()); \OC::$server->getConfig()->setUserValue($uid, 'login_token', $newToken, time());
$this->setMagicInCookie($user->getUID(), $newToken); $this->setMagicInCookie($user->getUID(), $newToken);

4
lib/private/util.php
View File

@ -1125,7 +1125,7 @@ class OC_Util {
// Check if a token exists // Check if a token exists
if (!\OC::$server->getSession()->exists('requesttoken')) { if (!\OC::$server->getSession()->exists('requesttoken')) {
// No valid token found, generate a new one. // No valid token found, generate a new one.
$requestToken = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($tokenLength); $requestToken = \OC::$server->getSecureRandom()->generate($tokenLength);
\OC::$server->getSession()->set('requesttoken', $requestToken); \OC::$server->getSession()->set('requesttoken', $requestToken);
} else { } else {
// Valid token already exists, send it // Valid token already exists, send it
@ -1133,7 +1133,7 @@ class OC_Util {
} }
// XOR the token to mitigate breach-like attacks // XOR the token to mitigate breach-like attacks
$sharedSecret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($tokenLength); $sharedSecret = \OC::$server->getSecureRandom()->generate($tokenLength);
self::$obfuscatedToken = base64_encode($requestToken ^ $sharedSecret) .':'.$sharedSecret; self::$obfuscatedToken = base64_encode($requestToken ^ $sharedSecret) .':'.$sharedSecret;
return self::$obfuscatedToken; return self::$obfuscatedToken;

2
tests/lib/dbschema.php
View File

@ -26,7 +26,7 @@ class Test_DBSchema extends \Test\TestCase {
$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
$dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml'; $dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml';
$r = '_' . \OC::$server->getSecureRandom()->getMediumStrengthGenerator()-> $r = '_' . \OC::$server->getSecureRandom()->
generate(4, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS) . '_'; generate(4, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS) . '_';
$content = file_get_contents( $dbfile ); $content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );

4
tests/lib/security/securerandom.php
View File

@ -51,7 +51,7 @@ class SecureRandomTest extends \Test\TestCase {
* @dataProvider stringGenerationProvider * @dataProvider stringGenerationProvider
*/ */
function testMediumLowStrengthGeneratorLength($length, $expectedLength) { function testMediumLowStrengthGeneratorLength($length, $expectedLength) {
$generator = $this->rng->getMediumStrengthGenerator(); $generator = $this->rng;
$this->assertEquals($expectedLength, strlen($generator->generate($length))); $this->assertEquals($expectedLength, strlen($generator->generate($length)));
} }
@ -67,7 +67,7 @@ class SecureRandomTest extends \Test\TestCase {
* @dataProvider charCombinations * @dataProvider charCombinations
*/ */
public function testScheme($charName, $chars) { public function testScheme($charName, $chars) {
$generator = $this->rng->getMediumStrengthGenerator(); $generator = $this->rng;
$scheme = constant('OCP\Security\ISecureRandom::' . $charName); $scheme = constant('OCP\Security\ISecureRandom::' . $charName);
$randomString = $generator->generate(100, $scheme); $randomString = $generator->generate(100, $scheme);
$matchesRegex = preg_match('/^'.$chars.'+$/', $randomString); $matchesRegex = preg_match('/^'.$chars.'+$/', $randomString);