michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1751 from Bond-009/login

Browse Source 
Reset invalid login counter on successfull login
This commit is contained in:
Joshua M. Boniface 2019-09-17 09:11:25 -04:00 committed by GitHub
commit 39faadc9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Emby.Server.Implementations/Library/UserManager.cs
View File

@ -353,11 +353,11 @@ namespace Emby.Server.Implementations.Library
UpdateUser(user);
}
UpdateInvalidLoginAttemptCount(user, 0);
ResetInvalidLoginAttemptCount(user);
}
else
{
UpdateInvalidLoginAttemptCount(user, user.Policy.InvalidLoginAttemptCount + 1);
IncrementInvalidLoginAttemptCount(user);
}
_logger.LogInformation("Authentication request for {0} {1}.", user.Name, success ? "has succeeded" : "has been denied");
@ -509,41 +509,28 @@ namespace Emby.Server.Implementations.Library
: PasswordHash.ConvertToByteString(new PasswordHash(user.EasyPassword).Hash);
}
private void UpdateInvalidLoginAttemptCount(User user, int newValue)
private void ResetInvalidLoginAttemptCount(User user)
{
if (user.Policy.InvalidLoginAttemptCount == newValue || newValue <= 0)
user.Policy.InvalidLoginAttemptCount = 0;
UpdateUserPolicy(user, user.Policy, false);
}
private void IncrementInvalidLoginAttemptCount(User user)
{
int invalidLogins = ++user.Policy.InvalidLoginAttemptCount;
int maxInvalidLogins = user.Policy.LoginAttemptsBeforeLockout;
if (maxInvalidLogins > 0
&& invalidLogins >= maxInvalidLogins)
{
return;
}
user.Policy.InvalidLoginAttemptCount = newValue;
// Check for users without a value here and then fill in the default value
// also protect from an always lockout if misconfigured
if (user.Policy.LoginAttemptsBeforeLockout == null || user.Policy.LoginAttemptsBeforeLockout == 0)
{
user.Policy.LoginAttemptsBeforeLockout = user.Policy.IsAdministrator ? 5 : 3;
}
var maxCount = user.Policy.LoginAttemptsBeforeLockout;
var fireLockout = false;
// -1 can be used to specify no lockout value
if (maxCount != -1 && newValue >= maxCount)
{
_logger.LogDebug("Disabling user {0} due to {1} unsuccessful login attempts.", user.Name, newValue);
user.Policy.IsDisabled = true;
fireLockout = true;
UserLockedOut?.Invoke(this, new GenericEventArgs<User>(user));
_logger.LogWarning(
"Disabling user {UserName} due to {Attempts} unsuccessful login attempts.",
user.Name,
invalidLogins);
}
UpdateUserPolicy(user, user.Policy, false);
if (fireLockout)
{
UserLockedOut?.Invoke(this, new GenericEventArgs<User>(user));
}
}
/// <summary>

2
MediaBrowser.Model/Users/UserPolicy.cs
View File

@ -66,7 +66,7 @@ namespace MediaBrowser.Model.Users
public bool EnableAllFolders { get; set; }
public int InvalidLoginAttemptCount { get; set; }
public int? LoginAttemptsBeforeLockout { get; set; }
public int LoginAttemptsBeforeLockout { get; set; }
public bool EnablePublicSharing { get; set; }