From 7ba6ddf2b16caf144e3c5cb9b26323b4bcb7fd72 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 25 Apr 2023 23:40:17 +0100 Subject: [PATCH] do case invariant compare on deny mac and id0 --- OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs | 2 +- OpenSim/Services/HypergridService/GatekeeperService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs index b36068d8e3..998e8a622b 100644 --- a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs @@ -48,7 +48,7 @@ namespace OpenSim.Capabilities.Handlers private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static readonly Dictionary queryTypes = new Dictionary() + private static readonly Dictionary queryTypes = new() { {"texture_id", AssetType.Texture}, {"sound_id", AssetType.Sound}, diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 38a726caba..f0e45d0548 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs @@ -367,7 +367,7 @@ namespace OpenSim.Services.HypergridService if (!String.IsNullOrWhiteSpace(m_DeniedMacs)) { //m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); - if (m_DeniedMacs.Contains(curMac)) + if (m_DeniedMacs.Contains(curMac, StringComparison.InvariantCultureIgnoreCase)) { reason = "Login failed: client with Mac " + curMac + " is denied"; m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client with mac {0} is denied", curMac); @@ -378,7 +378,7 @@ namespace OpenSim.Services.HypergridService if (!string.IsNullOrWhiteSpace(m_DeniedID0s)) { //m_log.InfoFormat("[GATEKEEPER SERVICE]: Checking users Mac {0} against list of denied macs {1} ...", curMac, m_DeniedMacs); - if (m_DeniedID0s.Contains(aCircuit.Id0)) + if (m_DeniedID0s.Contains(aCircuit.Id0, StringComparison.InvariantCultureIgnoreCase)) { reason = "Login failed: client with id0 " + aCircuit.Id0 + " is denied"; m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: client with mac {0} is denied", aCircuit.Id0);