do not allow client password logins if token auth is enforced or 2FA …

[ChristophWurst]

…is enabled

fixes #24779
fixes #24768

TODO

• Check if instance enforces token auth (default for new installations)
• Check if 2FA is enforced for the user
• Add config to config.sample.php

Tested with DAV and OCS, works as expected.

[nickvergessen]

$tokenProvider has no type hint, intended?

[ChristophWurst]

yes, because null in injected during setup

[ChristophWurst]

@PVince81 @nickvergessen @schiesbn @rullzer @LukasReschke test & review please :-)

Tested also with LDAP, seems to work 🙊

[PVince81]

I'd remove that, let it rely on the default value being false anyway

[PVince81]

Looks good 👍

[PVince81]

Second review ? @rullzer @nickvergessen

[rullzer]

Awesome!
Tested and works over here.
Code looks good.

👍

[ChristophWurst]

Failing test looks unrelated

16:27:55 There was 1 failure:
16:27:55 
16:27:55 1) OCA\Files_Sharing\Controllers\ShareControllerTest::testShowShare
16:27:55 Failed asserting that two objects are equal.
16:27:55 --- Expected
16:27:55 +++ Actual
16:27:55 @@ @@
16:27:55          'previewEnabled' => true
16:27:55 +        'previewMaxX' => null
16:27:55 +        'previewMaxY' => null
16:27:55      )
16:27:55      'renderAs' => 'base'
16:27:55      'appName' => 'files_sharing'
16:27:55      'headers' => Array (...)
16:27:55      'cookies' => Array ()
16:27:55      'status' => 200
16:27:55      'lastModified' => null
16:27:55      'ETag' => null
16:27:55      'contentSecurityPolicy' => OCP\AppFramework\Http\ContentSecurityPolicy Object (...)
16:27:55  )

[PVince81]

@ChristophWurst likely due to this PR: #24346

Will rerun the tests on master and make tickets so we can fix these today.

[lock]

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.