From 94f51cf1240d8e906f4178da32d551e595dec573 Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 10 Sep 2019 21:24:17 -0400 Subject: [PATCH] Fixed: Return better error message if username or password is null Co-Authored-By: Mark McDowall --- .../Authentication/AuthenticationModule.cs | 13 ++----------- src/NzbDrone.Core/Authentication/UserService.cs | 5 +++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Lidarr.Http/Authentication/AuthenticationModule.cs b/src/Lidarr.Http/Authentication/AuthenticationModule.cs index 4fc0e7736..742b94e95 100644 --- a/src/Lidarr.Http/Authentication/AuthenticationModule.cs +++ b/src/Lidarr.Http/Authentication/AuthenticationModule.cs @@ -3,10 +3,6 @@ using Nancy; using Nancy.Authentication.Forms; using Nancy.Extensions; using Nancy.ModelBinding; -using NzbDrone.Common.Extensions; -using NLog; -using NzbDrone.Common.Instrumentation; -using NzbDrone.Core.Authentication; using NzbDrone.Core.Configuration; namespace Lidarr.Http.Authentication @@ -30,7 +26,8 @@ namespace Lidarr.Http.Authentication if (user == null) { - return LoginFailed(); + var returnUrl = (string)Request.Query.returnUrl; + return Context.GetRedirect($"~/login?returnUrl={returnUrl}&loginFailed=true"); } DateTime? expiry = null; @@ -49,11 +46,5 @@ namespace Lidarr.Http.Authentication return this.LogoutAndRedirect(_configFileProvider.UrlBase + "/"); } - - private Response LoginFailed() - { - var returnUrl = (string)Request.Query.returnUrl; - return Context.GetRedirect($"~/login?returnUrl={returnUrl}&loginFailed=true"); - } } } diff --git a/src/NzbDrone.Core/Authentication/UserService.cs b/src/NzbDrone.Core/Authentication/UserService.cs index 4ca713890..4e4bc9aed 100644 --- a/src/NzbDrone.Core/Authentication/UserService.cs +++ b/src/NzbDrone.Core/Authentication/UserService.cs @@ -73,6 +73,11 @@ namespace NzbDrone.Core.Authentication public User FindUser(string username, string password) { + if (username.IsNullOrWhiteSpace() || password.IsNullOrWhiteSpace()) + { + return null; + } + var user = _repo.FindUser(username.ToLowerInvariant()); if (user == null)