Skip to content

[stable15] Clear backupcode reminder when no 2fa #14559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Mar 6, 2019
Merged

[stable15] Clear backupcode reminder when no 2fa #14559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42309f
Clear backupcodes reminder if no 2FA is enabled
rullzer Mar 5, 2019
390917a
Do not send notification if no active 2fa
rullzer Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Do not send notification if no active 2fa 
If the job is still present we should also not fire it off if there is
not a single active 2FA provider.

Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer authored and Backportbot committed Mar 6, 2019
commit 390917a9e5bace3d4e8f709b30bb52aef80744cd
10 changes: 9 additions & 1 deletion apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,15 @@ protected function run($argument) {
}

$providers = $this->registry->getProviderStates($user);
if (isset($providers['backup_codes']) && $providers['backup_codes'] === true) {
$state2fa = array_reduce($providers, function(bool $carry, bool $state) {
return $carry || $state;
}, false);

/*
* If no provider is active or if the backup codes are already generate
* we can remove the job
*/
if ($state2fa === false || (isset($providers['backup_codes']) && $providers['backup_codes'] === true)) {
// Backup codes already generated lets remove this job
$this->jobList->remove(self::class, $argument);
return;
Expand Down
31 changes: 30 additions & 1 deletion apps/twofactor_backupcodes/tests/Unit/BackgroundJob/RememberBackupCodesJobTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,34 @@ public function testBackupCodesGenerated() {
$this->invokePrivate($this->job, 'run', [['uid' => 'validUID']]);
}

public function testNoActiveProvider() {
$user = $this->createMock(IUser::class);
$user->method('getUID')
->willReturn('validUID');
$this->userManager->method('get')
->with('validUID')
->willReturn($user);

$this->registry->method('getProviderStates')
->with($user)
->willReturn([
'backup_codes' => false,
'foo' => false,
]);

$this->jobList->expects($this->once())
->method('remove')
->with(
RememberBackupCodesJob::class,
['uid' => 'validUID']
);

$this->notificationManager->expects($this->never())
->method($this->anything());

$this->invokePrivate($this->job, 'run', [['uid' => 'validUID']]);
}

public function testNotificationSend() {
$user = $this->createMock(IUser::class);
$user->method('getUID')
Expand All @@ -125,7 +153,8 @@ public function testNotificationSend() {
$this->registry->method('getProviderStates')
->with($user)
->willReturn([
'backup_codes' => false
'backup_codes' => false,
'foo' => true,
]);

$this->jobList->expects($this->never())
Expand Down