Skip to content

Commit 01ba708

Browse files
committed
feat: Add SetupCheck to warn about missing second factor provider
Signed-off-by: Côme Chilliet <[email protected]>
1 parent 1e8374d commit 01ba708

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

apps/settings/composer/composer/autoload_classmap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
'OCA\\Settings\\SetupChecks\\TaskProcessingSuccessRate' => $baseDir . '/../lib/SetupChecks/TaskProcessingSuccessRate.php',
141141
'OCA\\Settings\\SetupChecks\\TempSpaceAvailable' => $baseDir . '/../lib/SetupChecks/TempSpaceAvailable.php',
142142
'OCA\\Settings\\SetupChecks\\TransactionIsolation' => $baseDir . '/../lib/SetupChecks/TransactionIsolation.php',
143+
'OCA\\Settings\\SetupChecks\\TwoFactorConfiguration' => $baseDir . '/../lib/SetupChecks/TwoFactorConfiguration.php',
143144
'OCA\\Settings\\SetupChecks\\WellKnownUrls' => $baseDir . '/../lib/SetupChecks/WellKnownUrls.php',
144145
'OCA\\Settings\\SetupChecks\\Woff2Loading' => $baseDir . '/../lib/SetupChecks/Woff2Loading.php',
145146
'OCA\\Settings\\UserMigration\\AccountMigrator' => $baseDir . '/../lib/UserMigration/AccountMigrator.php',

apps/settings/composer/composer/autoload_static.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ class ComposerStaticInitSettings
155155
'OCA\\Settings\\SetupChecks\\TaskProcessingSuccessRate' => __DIR__ . '/..' . '/../lib/SetupChecks/TaskProcessingSuccessRate.php',
156156
'OCA\\Settings\\SetupChecks\\TempSpaceAvailable' => __DIR__ . '/..' . '/../lib/SetupChecks/TempSpaceAvailable.php',
157157
'OCA\\Settings\\SetupChecks\\TransactionIsolation' => __DIR__ . '/..' . '/../lib/SetupChecks/TransactionIsolation.php',
158+
'OCA\\Settings\\SetupChecks\\TwoFactorConfiguration' => __DIR__ . '/..' . '/../lib/SetupChecks/TwoFactorConfiguration.php',
158159
'OCA\\Settings\\SetupChecks\\WellKnownUrls' => __DIR__ . '/..' . '/../lib/SetupChecks/WellKnownUrls.php',
159160
'OCA\\Settings\\SetupChecks\\Woff2Loading' => __DIR__ . '/..' . '/../lib/SetupChecks/Woff2Loading.php',
160161
'OCA\\Settings\\UserMigration\\AccountMigrator' => __DIR__ . '/..' . '/../lib/UserMigration/AccountMigrator.php',

apps/settings/lib/AppInfo/Application.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
use OCA\Settings\SetupChecks\TaskProcessingPickupSpeed;
7676
use OCA\Settings\SetupChecks\TempSpaceAvailable;
7777
use OCA\Settings\SetupChecks\TransactionIsolation;
78+
use OCA\Settings\SetupChecks\TwoFactorConfiguration;
7879
use OCA\Settings\SetupChecks\WellKnownUrls;
7980
use OCA\Settings\SetupChecks\Woff2Loading;
8081
use OCA\Settings\UserMigration\AccountMigrator;
@@ -218,6 +219,7 @@ public function register(IRegistrationContext $context): void {
218219
$context->registerSetupCheck(TaskProcessingPickupSpeed::class);
219220
$context->registerSetupCheck(TempSpaceAvailable::class);
220221
$context->registerSetupCheck(TransactionIsolation::class);
222+
$context->registerSetupCheck(TwoFactorConfiguration::class);
221223
$context->registerSetupCheck(PushService::class);
222224
$context->registerSetupCheck(WellKnownUrls::class);
223225
$context->registerSetupCheck(Woff2Loading::class);

lib/private/Authentication/TwoFactorAuth/ProviderLoader.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ public function __construct(
3030
* @return IProvider[]
3131
* @throws Exception
3232
*/
33-
public function getProviders(IUser $user): array {
34-
$allApps = $this->appManager->getEnabledAppsForUser($user);
33+
public function getProviders(?IUser $user = null): array {
34+
if ($user === null) {
35+
$allApps = $this->appManager->getEnabledApps();
36+
} else {
37+
$allApps = $this->appManager->getEnabledAppsForUser($user);
38+
}
3539
$providers = [];
3640

3741
foreach ($allApps as $appId) {

0 commit comments

Comments
 (0)