mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-03 19:17:24 -05:00 
			
		
		
		
	Merge pull request #12552 from Bond-009/passwordhashing
Increase password hash iterations
This commit is contained in:
		
						commit
						bafbc2372c
					
				@ -1,9 +1,11 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System.Diagnostics.CodeAnalysis;
 | 
			
		||||
using System.Globalization;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using Jellyfin.Data.Entities;
 | 
			
		||||
using MediaBrowser.Controller.Authentication;
 | 
			
		||||
using MediaBrowser.Model.Cryptography;
 | 
			
		||||
using Microsoft.Extensions.Logging;
 | 
			
		||||
 | 
			
		||||
namespace Jellyfin.Server.Implementations.Users
 | 
			
		||||
{
 | 
			
		||||
@ -12,14 +14,17 @@ namespace Jellyfin.Server.Implementations.Users
 | 
			
		||||
    /// </summary>
 | 
			
		||||
    public class DefaultAuthenticationProvider : IAuthenticationProvider, IRequiresResolvedUser
 | 
			
		||||
    {
 | 
			
		||||
        private readonly ILogger<DefaultAuthenticationProvider> _logger;
 | 
			
		||||
        private readonly ICryptoProvider _cryptographyProvider;
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// Initializes a new instance of the <see cref="DefaultAuthenticationProvider"/> class.
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        /// <param name="logger">The logger.</param>
 | 
			
		||||
        /// <param name="cryptographyProvider">The cryptography provider.</param>
 | 
			
		||||
        public DefaultAuthenticationProvider(ICryptoProvider cryptographyProvider)
 | 
			
		||||
        public DefaultAuthenticationProvider(ILogger<DefaultAuthenticationProvider> logger, ICryptoProvider cryptographyProvider)
 | 
			
		||||
        {
 | 
			
		||||
            _logger = logger;
 | 
			
		||||
            _cryptographyProvider = cryptographyProvider;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@ -75,8 +80,10 @@ namespace Jellyfin.Server.Implementations.Users
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            // Migrate old hashes to the new default
 | 
			
		||||
            if (!string.Equals(readyHash.Id, _cryptographyProvider.DefaultHashMethod, StringComparison.Ordinal))
 | 
			
		||||
            if (!string.Equals(readyHash.Id, _cryptographyProvider.DefaultHashMethod, StringComparison.Ordinal)
 | 
			
		||||
                || int.Parse(readyHash.Parameters["iterations"], CultureInfo.InvariantCulture) != Constants.DefaultIterations)
 | 
			
		||||
            {
 | 
			
		||||
                _logger.LogInformation("Migrating password hash of {User} to the latest default", username);
 | 
			
		||||
                ChangePassword(resolvedUser, password);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -18,6 +18,6 @@ namespace MediaBrowser.Model.Cryptography
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// The default amount of iterations for hashing passwords.
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        public const int DefaultIterations = 120000;
 | 
			
		||||
        public const int DefaultIterations = 210000;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user