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

Increase 2fa backup codes entropy 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2017-01-16 11:24:03 +01:00
parent 203436b16b
commit 3b76699c9c
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
View File

@ -33,6 +33,8 @@ use OCP\Security\ISecureRandom;
class BackupCodeStorage { class BackupCodeStorage {
private static $CODE_LENGTH = 16;
/** @var BackupCodeMapper */ /** @var BackupCodeMapper */
private $mapper; private $mapper;
@ -48,6 +50,13 @@ class BackupCodeStorage {
/** @var ILogger */ /** @var ILogger */
private $logger; private $logger;
/**
* @param BackupCodeMapper $mapper
* @param ISecureRandom $random
* @param IHasher $hasher
* @param IManager $activityManager
* @param ILogger $logger
*/
public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher, public function __construct(BackupCodeMapper $mapper, ISecureRandom $random, IHasher $hasher,
IManager $activityManager, ILogger $logger) { IManager $activityManager, ILogger $logger) {
$this->mapper = $mapper; $this->mapper = $mapper;
@ -69,7 +78,7 @@ class BackupCodeStorage {
$uid = $user->getUID(); $uid = $user->getUID();
foreach (range(1, min([$number, 20])) as $i) { foreach (range(1, min([$number, 20])) as $i) {
$code = $this->random->generate(10, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'); $code = $this->random->generate(self::$CODE_LENGTH, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
$dbCode = new BackupCode(); $dbCode = new BackupCode();
$dbCode->setUserId($uid); $dbCode->setUserId($uid);

2
apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php
View File

@ -77,7 +77,7 @@ class BackupCodeStorageTest extends TestCase {
->will($this->returnValue('fritz')); ->will($this->returnValue('fritz'));
$this->random->expects($this->exactly($number)) $this->random->expects($this->exactly($number))
->method('generate') ->method('generate')
->with(10, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789') ->with(16, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
->will($this->returnValue('CODEABCDEF')); ->will($this->returnValue('CODEABCDEF'));
$this->hasher->expects($this->exactly($number)) $this->hasher->expects($this->exactly($number))
->method('hash') ->method('hash')