From 89f60420cd60d31f782c9172c9b360ce55790bcd Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Fri, 23 Dec 2022 18:31:21 +1000 Subject: [PATCH] warning fixes --- src/ARKServerManager/Lib/ServerApp.cs | 1 + src/ARKServerManager/Lib/ServerProfile.cs | 9 +++++++++ src/ConanServerManager/Lib/ServerApp.cs | 1 + src/Plugin.Discord.UnitTests/DiscordPluginUnitTest.cs | 2 ++ src/ServerManager.Common/Utils/SecurityUtils.cs | 1 + src/ServerManager.Common/Utils/TaskSchedulerUtils.cs | 1 + 6 files changed, 15 insertions(+) diff --git a/src/ARKServerManager/Lib/ServerApp.cs b/src/ARKServerManager/Lib/ServerApp.cs index b169fe9e..f572b02a 100644 --- a/src/ARKServerManager/Lib/ServerApp.cs +++ b/src/ARKServerManager/Lib/ServerApp.cs @@ -2468,6 +2468,7 @@ namespace ServerManagerTool.Lib return appMods; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "SCS0006:Weak hashing function.", Justification = "")] public static string GetMutexName(string directory) { using (var hashAlgo = MD5.Create()) diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index 41d7157b..e2abd8aa 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -1295,25 +1295,33 @@ namespace ServerManagerTool.Lib public bool SaveTributeCharacterExpirationSeconds { get { return !string.IsNullOrWhiteSpace(this.CrossArkClusterId) && OverrideTributeCharacterExpirationSeconds; } +#pragma warning disable CS1717 // Assignment made to same variable set { value = value; } +#pragma warning restore CS1717 // Assignment made to same variable } public bool SaveTributeItemExpirationSeconds { get { return !string.IsNullOrWhiteSpace(this.CrossArkClusterId) && OverrideTributeItemExpirationSeconds; } +#pragma warning disable CS1717 // Assignment made to same variable set { value = value; } +#pragma warning restore CS1717 // Assignment made to same variable } public bool SaveTributeDinoExpirationSeconds { get { return !string.IsNullOrWhiteSpace(this.CrossArkClusterId) && OverrideTributeDinoExpirationSeconds; } +#pragma warning disable CS1717 // Assignment made to same variable set { value = value; } +#pragma warning restore CS1717 // Assignment made to same variable } public bool SaveMinimumDinoReuploadInterval { get { return !string.IsNullOrWhiteSpace(this.CrossArkClusterId) && OverrideMinimumDinoReuploadInterval; } +#pragma warning disable CS1717 // Assignment made to same variable set { value = value; } +#pragma warning restore CS1717 // Assignment made to same variable } public static readonly DependencyProperty TributeCharacterExpirationSecondsProperty = DependencyProperty.Register(nameof(TributeCharacterExpirationSeconds), typeof(int), typeof(ServerProfile), new PropertyMetadata(86400)); @@ -5220,6 +5228,7 @@ namespace ServerManagerTool.Lib list.UpdateTotals(); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "SCS0005:Weak random number generator.", Justification = "")] public void RandomizePGMSettings() { var random = new Random(DateTime.Now.Millisecond); diff --git a/src/ConanServerManager/Lib/ServerApp.cs b/src/ConanServerManager/Lib/ServerApp.cs index aad777b2..46571580 100644 --- a/src/ConanServerManager/Lib/ServerApp.cs +++ b/src/ConanServerManager/Lib/ServerApp.cs @@ -2342,6 +2342,7 @@ namespace ServerManagerTool.Lib return appMods; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "SCS0006:Weak hashing function.", Justification = "")] public static string GetMutexName(string directory) { using (var hashAlgo = MD5.Create()) diff --git a/src/Plugin.Discord.UnitTests/DiscordPluginUnitTest.cs b/src/Plugin.Discord.UnitTests/DiscordPluginUnitTest.cs index f71c99c1..2025e0a4 100644 --- a/src/Plugin.Discord.UnitTests/DiscordPluginUnitTest.cs +++ b/src/Plugin.Discord.UnitTests/DiscordPluginUnitTest.cs @@ -228,6 +228,7 @@ namespace Plugin.Discord.UnitTests }); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "SCS0005:Weak random number generator.", Justification = "")] private void SendMultipleMessages(DiscordPlugin plugin, string profileName) { // Arrange @@ -254,6 +255,7 @@ namespace Plugin.Discord.UnitTests Assert.IsTrue(true); } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "SCS0005:Weak random number generator.", Justification = "")] private void SendMultipleErrors(DiscordPlugin plugin, string profileName) { // Arrange diff --git a/src/ServerManager.Common/Utils/SecurityUtils.cs b/src/ServerManager.Common/Utils/SecurityUtils.cs index 2dcd3db6..920fabd6 100644 --- a/src/ServerManager.Common/Utils/SecurityUtils.cs +++ b/src/ServerManager.Common/Utils/SecurityUtils.cs @@ -20,6 +20,7 @@ namespace ServerManagerTool.Common.Utils private static int callCount = 0; + [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "SCS0005:Weak random number generator.", Justification = "")] public static string GeneratePassword(int count) { StringBuilder newPassword = new StringBuilder(count); diff --git a/src/ServerManager.Common/Utils/TaskSchedulerUtils.cs b/src/ServerManager.Common/Utils/TaskSchedulerUtils.cs index a3523a19..32843e34 100644 --- a/src/ServerManager.Common/Utils/TaskSchedulerUtils.cs +++ b/src/ServerManager.Common/Utils/TaskSchedulerUtils.cs @@ -46,6 +46,7 @@ namespace ServerManagerTool.Common.Utils set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "SCS0006:Weak hashing function.", Justification = "")] public static string ComputeKey(string folder) { try