diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-05-18 12:56:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 12:56:42 +0200 |
| commit | 2d011b781e8a696bb6dc6cf355d19463f6b9cdb3 (patch) | |
| tree | 8c7e5e3dba3a3e9a831b3951aa15b0768f068508 /Emby.Server.Implementations/Library | |
| parent | 71f81c5fb0e4f9bcf1242552e0d6df7a88593d3e (diff) | |
| parent | 1bf3a26a6194c6a5878f1e4c98ed953103ac7b71 (diff) | |
Merge pull request #1383 from jellyfin/release-10.3.z
Backmerge for Release 10.3.3
Diffstat (limited to 'Emby.Server.Implementations/Library')
| -rw-r--r-- | Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs | 6 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/UserManager.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs index 3d15a8afb..0527464ff 100644 --- a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs +++ b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs @@ -19,7 +19,7 @@ namespace Emby.Server.Implementations.Library public string Name => "Default"; public bool IsEnabled => true; - + // This is dumb and an artifact of the backwards way auth providers were designed. // This version of authenticate was never meant to be called, but needs to be here for interface compat // Only the providers that don't provide local user support use this @@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.Library { throw new NotImplementedException(); } - + // This is the verson that we need to use for local users. Because reasons. public Task<ProviderAuthenticationResult> Authenticate(string username, string password, User resolvedUser) { @@ -103,7 +103,7 @@ namespace Emby.Server.Implementations.Library string hash = user.Password; user.Password = string.Format("$SHA1${0}", hash); } - + if (user.EasyPassword != null && !user.EasyPassword.Contains("$")) { string hash = user.EasyPassword; diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs index c33bb7740..b396ee51a 100644 --- a/Emby.Server.Implementations/Library/UserManager.cs +++ b/Emby.Server.Implementations/Library/UserManager.cs @@ -550,7 +550,7 @@ namespace Emby.Server.Implementations.Library { return string.IsNullOrEmpty(user.EasyPassword) ? null - : user.EasyPassword; + : (new PasswordHash(user.EasyPassword)).Hash; } /// <summary> |