summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-04-08 14:50:46 +0200
committerGitHub <noreply@github.com>2020-04-08 14:50:46 +0200
commit4e0ba3e6be6ae46a5894ebe662f605093d6b9965 (patch)
tree3af334bcf69a3c9a005dd7e06b8afef791fbe5b6
parent547ba642c6a3e9ef2557e4e73c8e6fceca8292ec (diff)
parente52442e26f475213dfb7591fb0df1d3c516fbd51 (diff)
downloadnextcloud-server-4e0ba3e6be6ae46a5894ebe662f605093d6b9965.tar.gz
nextcloud-server-4e0ba3e6be6ae46a5894ebe662f605093d6b9965.zip
Merge pull request #20299 from nextcloud/fix/noid/member-on-null-app-cancel-login
fixes the throttler not checking the user state on postLogin
-rw-r--r--lib/base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index 4c96e3470cd..6dc5948d53c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -812,7 +812,7 @@ class OC {
// NOTE: This will be replaced to use OCP
$userSession = self::$server->getUserSession();
$userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
- if (!defined('PHPUNIT_RUN')) {
+ if (!defined('PHPUNIT_RUN') && $userSession->isLoggedIn()) {
// reset brute force delay for this IP address and username
$uid = \OC::$server->getUserSession()->getUser()->getUID();
$request = \OC::$server->getRequest();