If basic auth provided but invalid fail

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Nov 5, 2020 · d0831b9 · d0831b9
1 parent ecbe8cb
commit d0831b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/base.php b/lib/base.php
@@ -1045,6 +1045,7 @@ public static function handleRequest() {
 	 *
 	 * @param OCP\IRequest $request
 	 * @return boolean
+	 * @throws \OC\User\LoginException
 	 */
 	public static function handleLogin(OCP\IRequest $request) {
 		$userSession = self::$server->getUserSession();

diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
@@ -577,6 +577,7 @@ protected function prepareUserLogin($firstTimeLogin, $refreshCsrfToken = true) {
 	 * @param IRequest $request
 	 * @param OC\Security\Bruteforce\Throttler $throttler
 	 * @return boolean if the login was successful
+	 * @throws LoginException
 	 */
 	public function tryBasicAuthLogin(IRequest $request,
 									  OC\Security\Bruteforce\Throttler $throttler) {
@@ -599,8 +600,9 @@ public function tryBasicAuthLogin(IRequest $request,
 
 					return true;
 				}
+				throw new LoginException('Basic auth failed while credentials provided');
 			} catch (PasswordLoginForbiddenException $ex) {
-				// Nothing to do
+				throw new LoginException('Password login not allowed', 0, $ex);
 			}
 		}
 		return false;