From 9b875db8b8c264f8e98dc9fe0096d3bd4cb90e26 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 20 Apr 2016 16:27:16 +0200 Subject: [PATCH] OCS API should catch LoginExceptions Catching the login exception and returning false (login failed). Makes the OCS API properly return data instead of printing the exception page. --- lib/private/legacy/api.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/legacy/api.php b/lib/private/legacy/api.php index bab879c95f..702b9df192 100644 --- a/lib/private/legacy/api.php +++ b/lib/private/legacy/api.php @@ -356,7 +356,11 @@ class OC_API { if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) ) { $authUser = $_SERVER['PHP_AUTH_USER']; $authPw = $_SERVER['PHP_AUTH_PW']; - $return = OC_User::login($authUser, $authPw); + try { + $return = OC_User::login($authUser, $authPw); + } catch (\OC\User\LoginException $e) { + return false; + } if ($return === true) { self::$logoutRequired = true;