Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mark McDowall 2019-04-06 19:31:08 -07:00
parent f748891b4b
commit 8f3dbbc356
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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)

4
src/Sonarr.Http/Authentication/AuthenticationModule.cs
View File

@ -3,7 +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.EnsureThat;
using NzbDrone.Core.Authentication; using NzbDrone.Core.Authentication;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
@ -24,9 +23,6 @@ namespace Sonarr.Http.Authentication
private Response Login(LoginResource resource) private Response Login(LoginResource resource)
{ {
Ensure.That(resource.Username, () => resource.Username).IsNotNullOrWhiteSpace();
Ensure.That(resource.Password, () => resource.Password).IsNotNullOrWhiteSpace();
var user = _userService.FindUser(resource.Username, resource.Password); var user = _userService.FindUser(resource.Username, resource.Password);
if (user == null) if (user == null)