From 16385bb41f80f692c031e3f3e74d78a04f1456a8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 16 Jul 2018 15:51:03 +0200
Subject: [PATCH] Skip two factor challenge in account module middleware

Fixes issue with infinite redirect when trying to access the challenge
page.
---
 core/Middleware/AccountModuleMiddleware.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/Middleware/AccountModuleMiddleware.php b/core/Middleware/AccountModuleMiddleware.php
index c7f782613f01..5ba76c88b00f 100644
--- a/core/Middleware/AccountModuleMiddleware.php
+++ b/core/Middleware/AccountModuleMiddleware.php
@@ -32,6 +32,7 @@
 use OCP\Authentication\IAccountModuleController;
 use OCP\ILogger;
 use OCP\IUserSession;
+use OC\Core\Controller\TwoFactorChallengeController;
 
 /**
  * Class AccountModuleMiddleware
@@ -94,6 +95,11 @@ public function beforeController($controller, $methodName) {
 			return;
 		}
 
+		if ($controller instanceof TwoFactorChallengeController) {
+			// Don't block two factor challenge
+			return;
+		}
+
 		if ($this->session->isLoggedIn()) {
 			$user = $this->session->getUser();
 			if ($user === null) {