warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes configurations. (#128)

Browse source
This commit is contained in:
Kamron Batman 2020-05-03 12:03:24 -07:00 • committed by GitHub
parent f336a56364
commit cf8620d558
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Projects/Scripts/Accounting/Account.cs
View file

@ -315,7 +315,7 @@ namespace Server.Accounting
public void SetPassword(string plainPassword)
{
Password = AccountSecurity.CurrentPasswordProtection.EncryptPassword(plainPassword);
m_PasswordAlgorithm = AccountSecurity.AlgorithmName;
m_PasswordAlgorithm = AccountSecurity.CurrentAlgorithm;
}
public bool CheckPassword(string plainPassword)
@ -327,7 +327,7 @@ namespace Server.Accounting
return false;
// Upgrade the password protection in case we change the algorithm
if (m_PasswordAlgorithm != AccountSecurity.AlgorithmName)
if (m_PasswordAlgorithm != AccountSecurity.CurrentAlgorithm)
SetPassword(plainPassword);
return true;

2
Projects/Scripts/Accounting/AccountAttackLimiter.cs
View file

@ -11,7 +11,7 @@ namespace Server.Accounting
public static bool Enabled;
public static void Configure()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("accountAttackLimiter.enabled", true);
Enabled = ServerConfiguration.GetOrUpdateSetting("accountAttackLimiter.enable", true);
}
private static readonly List<InvalidAccountAccessLog> m_List = new List<InvalidAccountAccessLog>();

2
Projects/Scripts/Accounting/AccountHandler.cs
View file

@ -20,7 +20,7 @@ namespace Server.Misc
public static void Configure()
{
MaxAccountsPerIP = ServerConfiguration.GetOrUpdateSetting("accountHandler.maxAccountsPerIP", 1);
AutoAccountCreation = ServerConfiguration.GetOrUpdateSetting("accountHandler.autoAccountCreation", true);
AutoAccountCreation = ServerConfiguration.GetOrUpdateSetting("accountHandler.enableAutoAccountCreation", true);
PasswordCommandEnabled = ServerConfiguration.GetOrUpdateSetting("accountHandler.enablePlayerPasswordCommand", false);
}

4
Projects/Scripts/Accounting/IPLimiter.cs
View file

@ -13,8 +13,8 @@ namespace Server.Misc
public static void Configure()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("ipLImiter.enabled", true);
SocketBlock = ServerConfiguration.GetOrUpdateSetting("ipLImiter.blockAtConnection", true);
Enabled = ServerConfiguration.GetOrUpdateSetting("ipLimiter.enable", true);
SocketBlock = ServerConfiguration.GetOrUpdateSetting("ipLimiter.blockAtConnection", true);
MaxAddresses = ServerConfiguration.GetOrUpdateSetting("ipLimiter.maxConnectionsPerIP", 10);
}

11
Projects/Scripts/Accounting/Security/AccountSecurity.cs
View file

@ -40,14 +40,17 @@ namespace Server.Accounting.Security
public static class AccountSecurity
{
// TODO: Put it in a configuration
public const PasswordProtectionAlgorithm AlgorithmName = PasswordProtectionAlgorithm.Argon2;
public static PasswordProtectionAlgorithm CurrentAlgorithm { get; set; }
public static readonly IPasswordProtection CurrentPasswordProtection = GetPasswordProtection(AlgorithmName);
public static readonly IPasswordProtection CurrentPasswordProtection = GetPasswordProtection(CurrentAlgorithm);
public static void Configure()
{
if (AlgorithmName < PasswordProtectionAlgorithm.SHA2)
throw new Exception($"Security: {AlgorithmName} is obselete and not secure. Do not use it.");
CurrentAlgorithm =
ServerConfiguration.GetOrUpdateSetting("accountSecurity.encryptionAlgorithm", PasswordProtectionAlgorithm.Argon2);
if (CurrentAlgorithm < PasswordProtectionAlgorithm.SHA2)
throw new Exception($"Security: {CurrentAlgorithm} is obselete and not secure. Do not use it.");
}
public static IPasswordProtection GetPasswordProtection(PasswordProtectionAlgorithm algorithm)

6
Projects/Scripts/Configuration/ExpansionConfiguration.cs
View file

@ -11,13 +11,13 @@ namespace Server
{
Core.Expansion = ServerConfiguration.GetOrUpdateSetting("currentExpansion", Expansion.TOL);
AccountGold.Enabled = ServerConfiguration.GetSetting("accountGold.enabled", Core.TOL);
AccountGold.Enabled = ServerConfiguration.GetSetting("accountGold.enable", Core.TOL);
AccountGold.ConvertOnBank = ServerConfiguration.GetSetting("accountGold.convertOnBank", true);
AccountGold.ConvertOnTrade = ServerConfiguration.GetSetting("accountGold.convertOnTrade", false);
VirtualCheck.UseEditGump = ServerConfiguration.GetSetting("virtualChecks.useEditGump", true);
Mobile.InsuranceEnabled = ServerConfiguration.GetSetting("insurance.enabled", Core.AOS);
ObjectPropertyList.Enabled = ServerConfiguration.GetSetting("opl.enabled", Core.AOS);
Mobile.InsuranceEnabled = ServerConfiguration.GetSetting("insurance.enable", Core.AOS);
ObjectPropertyList.Enabled = ServerConfiguration.GetSetting("opl.enable", Core.AOS);
bool visibleDamage = ServerConfiguration.GetSetting("visibleDamage", Core.AOS);
Mobile.VisibleDamageType = visibleDamage ? VisibleDamageType.Related : VisibleDamageType.None;
Mobile.GuildClickMessage = ServerConfiguration.GetSetting("guildClickMessage", !Core.AOS);

2
Projects/Scripts/Engines/Ethics/Core/Ethic.cs
View file

@ -98,7 +98,7 @@ namespace Server.Ethics
public static void Initialize()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("ethics.enabled", false);
Enabled = ServerConfiguration.GetOrUpdateSetting("ethics.enable", false);
if (Enabled)
EventSink.Speech += EventSink_Speech;

2
Projects/Scripts/Engines/Pathing/PathFollower.cs
View file

@ -16,7 +16,7 @@ namespace Server
public static void Initialize()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("pathfinding.enabled", true);
Enabled = ServerConfiguration.GetOrUpdateSetting("pathfinding.enable", true);
}
public PathFollower(Mobile from, IPoint3D goal)

7
Projects/Scripts/Engines/VeteranRewards/RewardSystem.cs
View file

@ -16,7 +16,7 @@ namespace Server.Engines.VeteranRewards
// assuming vet rewards are enabled, should total skill cap bonuses be awarded? (720 skills total at 4th level)
public static bool SkillCapRewards { get; private set; }
public static TimeSpan RewardInterval = TimeSpan.FromDays(30.0);
public static TimeSpan RewardInterval { get; private set; }
public static RewardCategory[] Categories
{
@ -455,8 +455,9 @@ namespace Server.Engines.VeteranRewards
public static void Initialize()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("vetRewards.enabled", true);
SkillCapRewards = ServerConfiguration.GetOrUpdateSetting("vetReards.skillCapRewards", true);
Enabled = ServerConfiguration.GetOrUpdateSetting("vetRewards.enable", true);
SkillCapRewards = ServerConfiguration.GetOrUpdateSetting("vetRewards.skillCapRewards", true);
RewardInterval = ServerConfiguration.GetOrUpdateSetting("vetRewards.rewardInterval", TimeSpan.FromDays(30.0));
if (Enabled)
EventSink.Login += EventSink_Login;

2
Projects/Scripts/Misc/BuffIcons.cs
View file

@ -10,7 +10,7 @@ namespace Server
public static void Initialize()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("buffIcons.enabled", Core.ML);
Enabled = ServerConfiguration.GetOrUpdateSetting("buffIcons.enable", Core.ML);
if (Enabled)
EventSink.ClientVersionReceived += ResendBuffsOnClientVersionReceived;

2
Projects/Scripts/Misc/ClientVerification.cs
View file

@ -27,7 +27,7 @@ namespace Server.Misc
public static void Initialize()
{
m_DetectClientRequirement = ServerConfiguration.GetOrUpdateSetting("clientVerification.enabled", true);
m_DetectClientRequirement = ServerConfiguration.GetOrUpdateSetting("clientVerification.enable", true);
m_OldClientResponse =
ServerConfiguration.GetOrUpdateSetting("clientVerification.oldClientResponse", OldClientResponse.Kick);
m_AgeLeniency = ServerConfiguration.GetOrUpdateSetting("clientVerification.ageLeniency", TimeSpan.FromDays(10));

2
Projects/Scripts/SpecialSystems/Engines/TestCenter.cs
View file

@ -12,7 +12,7 @@ namespace Server.Misc
public static void Configure()
{
Enabled = ServerConfiguration.GetOrUpdateSetting("testCenter.enabled", false);
Enabled = ServerConfiguration.GetOrUpdateSetting("testCenter.enable", false);
}
public static void Initialize()