github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 04:59:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Return better error message if username or password is null

Browse source 
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick 2019-09-10 21:24:17 -04:00
commit d1f0b3a222
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Lidarr.Http/Authentication/AuthenticationModule.cs
View file

@ -3,10 +3,6 @@ using Nancy;
using Nancy.Authentication.Forms; using Nancy.Authentication.Forms;
using Nancy.Extensions; using Nancy.Extensions;
using Nancy.ModelBinding; using Nancy.ModelBinding;
using NzbDrone.Common.Extensions;
using NLog;
using NzbDrone.Common.Instrumentation;
using NzbDrone.Core.Authentication;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
namespace Lidarr.Http.Authentication namespace Lidarr.Http.Authentication
@ -30,7 +26,8 @@ namespace Lidarr.Http.Authentication
if (user == null) if (user == null)
{ {
return LoginFailed(); var returnUrl = (string)Request.Query.returnUrl;
return Context.GetRedirect($"~/login?returnUrl={returnUrl}&loginFailed=true");
} }
DateTime? expiry = null; DateTime? expiry = null;
@ -49,11 +46,5 @@ namespace Lidarr.Http.Authentication
return this.LogoutAndRedirect(_configFileProvider.UrlBase + "/"); return this.LogoutAndRedirect(_configFileProvider.UrlBase + "/");
} }
private Response LoginFailed()
{
var returnUrl = (string)Request.Query.returnUrl;
return Context.GetRedirect($"~/login?returnUrl={returnUrl}&loginFailed=true");
}
} }
} }

5
src/NzbDrone.Core/Authentication/UserService.cs
View file

@ -73,6 +73,11 @@ namespace NzbDrone.Core.Authentication
public User FindUser(string username, string password) public User FindUser(string username, string password)
{ {
if (username.IsNullOrWhiteSpace() || password.IsNullOrWhiteSpace())
{
return null;
}
var user = _repo.FindUser(username.ToLowerInvariant()); var user = _repo.FindUser(username.ToLowerInvariant());
if (user == null) if (user == null)