Minor fixes re:PR870, added null checks from PR876

1 files changed, 32 insertions, 0 deletions

diff --git a/Emby.Server.Implementations/Data/SqliteUserRepository.cs b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
index db359d7dd..b3d457342 100644
--- a/Emby.Server.Implementations/Data/SqliteUserRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserRepository.cs
@@ -55,6 +55,7 @@ namespace Emby.Server.Implementations.Data
                 {
                     TryMigrateToLocalUsersTable(connection);
                 }
+                RemoveEmptyPasswordHashes();
             }
         }
 
@@ -73,6 +74,37 @@ namespace Emby.Server.Implementations.Data
             }
         }
 
+        private void RemoveEmptyPasswordHashes()

+        {

+            foreach (var user in RetrieveAllUsers())

+            {

+                // If the user password is the sha1 hash of the empty string, remove it

+                if (!string.Equals(user.Password, "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709") || !string.Equals(user.Password, "$SHA1$DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"))

+                {

+                    continue;

+                }

+

+                user.Password = null;

+                var serialized = _jsonSerializer.SerializeToBytes(user);

+

+                using (WriteLock.Write())

+                using (var connection = CreateConnection())

+                {

+                    connection.RunInTransaction(db =>

+                    {

+                        using (var statement = db.PrepareStatement("update LocalUsersv2 set data=@data where Id=@InternalId"))

+                        {

+                            statement.TryBind("@InternalId", user.InternalId);

+                            statement.TryBind("@data", serialized);

+                            statement.MoveNext();

+                        }

+

+                    }, TransactionMode);

+                }

+            }

+

+        }
+
         /// <summary>
         /// Save a user in the repo
         /// </summary>