b34c8b32ef
SetPassword derives a full Argon2 hash, so the [password command, the admin gump, account creation and the XML import each cost ~8.9 ms of frozen world. Only the login verify had been moved. DRY-ing the two paths surfaced a correctness trap rather than just shared code. ApplyPasswordUpgrade guarded by comparing the stored hash, which is right for a login rehash -- do not clobber a newer password with a rehash of the one it superseded -- but wrong for an explicit change: two changes dispatched before either landed would drop the second and silently keep the older password. Ordering is now a per-account dispatch sequence claimed on the loop, which gives "newest wins" for both callers through one mechanism. SetPassword bumps it as well, so an inline write also supersedes an in-flight one. One job type serves both: PasswordJob carries an optional verify phrase and an optional hash phrase plus an OnComplete that runs on the loop, so a login verifies and may rehash while a password change only hashes. The class is PasswordWorker now, since verification no longer describes what it does. PasswordWorker.SetPassword is the single entry point and falls back to hashing inline when the gate is off or the queue is saturated -- unlike a login, a password change must never be silently dropped, and it is rare enough that the loop can absorb one. The [password confirmation moves into the callback, because off the loop it has not happened when the call returns. Account creation stays inline: it gates the login flow, so deferring it restructures the accept path.
80 lines
3.5 KiB
C#
80 lines
3.5 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: AccountSecurity.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System;
|
|
|
|
namespace Server.Accounting.Security;
|
|
|
|
public enum PasswordProtectionAlgorithm
|
|
{
|
|
// Obsolete algorithms from RunUO. These are not secure!
|
|
// They are included for password upgrades only.
|
|
None,
|
|
MD5,
|
|
SHA1,
|
|
|
|
// Supported algorithms
|
|
SHA2, // ServUO compatibility
|
|
PBKDF2,
|
|
Argon2 // Recommended algorithm for real security.
|
|
}
|
|
|
|
public static class AccountSecurity
|
|
{
|
|
public static PasswordProtectionAlgorithm CurrentAlgorithm { get; set; }
|
|
|
|
public static IPasswordProtection CurrentPasswordProtection => GetPasswordProtection(CurrentAlgorithm);
|
|
|
|
public static void Configure()
|
|
{
|
|
CurrentAlgorithm =
|
|
ServerConfiguration.GetOrUpdateSetting(
|
|
"accountSecurity.encryptionAlgorithm",
|
|
PasswordProtectionAlgorithm.Argon2
|
|
);
|
|
|
|
if (CurrentAlgorithm < PasswordProtectionAlgorithm.SHA2)
|
|
{
|
|
throw new Exception($"Security: {CurrentAlgorithm} is obsolete and not secure. Do not use it.");
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// The string actually fed to the KDF. SHA1 and SHA2 salt by username; everything else hashes
|
|
/// the password alone. Verification must derive with the algorithm the stored hash was made
|
|
/// with, and a rehash with the one it is moving to -- deriving with the wrong one produces a
|
|
/// hash that verifies once and never again.
|
|
/// </summary>
|
|
public static string DerivePhrase(PasswordProtectionAlgorithm algorithm, string username, string plainPassword)
|
|
=> algorithm is PasswordProtectionAlgorithm.SHA1 or PasswordProtectionAlgorithm.SHA2
|
|
? $"{username}{plainPassword}"
|
|
: plainPassword;
|
|
|
|
public static IPasswordProtection GetPasswordProtection(PasswordProtectionAlgorithm algorithm)
|
|
{
|
|
var passwordProtection = algorithm switch
|
|
{
|
|
PasswordProtectionAlgorithm.MD5 => HashAlgorithmPasswordProtection.MD5Instance,
|
|
PasswordProtectionAlgorithm.SHA1 => HashAlgorithmPasswordProtection.SHA1Instance,
|
|
PasswordProtectionAlgorithm.SHA2 => HashAlgorithmPasswordProtection.SHA2Instance,
|
|
PasswordProtectionAlgorithm.PBKDF2 => PBKDF2PasswordProtection.Instance,
|
|
PasswordProtectionAlgorithm.Argon2 => Argon2PasswordProtection.Instance,
|
|
PasswordProtectionAlgorithm.None => throw new Exception("Do not use PasswordProtectionAlgorithm.None"),
|
|
_ => throw new Exception("No algorithm")
|
|
};
|
|
|
|
return passwordProtection;
|
|
}
|
|
}
|