upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #29762 from nextcloud/revert/bcfd4ed5910d29423bfa86214a3b595fe8e92c9c

Browse source 
[stable22] Revert "Explicitly allow some routes without 2FA"
This commit is contained in:
blizzz 2021-11-18 13:29:42 +01:00 committed by GitHub
commit 7efa3552e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/Controller/OCJSController.php
View file

@ -98,7 +98,6 @@ class OCJSController extends Controller {
/**
* @NoCSRFRequired
* @NoTwoFactorRequired
* @PublicPage
*
* @return DataDisplayResponse

6
core/Middleware/TwoFactorMiddleware.php
View file

@ -83,12 +83,6 @@ class TwoFactorMiddleware extends Middleware {
* @param string $methodName
*/
public function beforeController($controller, $methodName) {
if ($this->reflector->hasAnnotation('NoTwoFactorRequired')) {
// Route handler explicitly marked to work without finished 2FA are
// not blocked
return;
}
if ($controller instanceof APIController && $methodName === 'poll') {
// Allow polling the twofactor nextcloud notifications state
return;