RDMPDEV-186: fixed security code scan warnings

HicServices · May 31, 2019 · 0a0bb01 · 0a0bb01
1 parent a04d96e
commit 0a0bb01
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Rdmp.Core/Curation/Data/Plugin.cs b/Rdmp.Core/Curation/Data/Plugin.cs
@@ -63,7 +63,7 @@ public string GetShortName()
         }
 
         /// <summary>
-        /// The master version of the <see cref="Plugin"/> (not the dlls inside - See <see cref="LoadModuleAssembly.DllFileVersion"/>).
+        /// The master version of the <see cref="Plugin"/>
         /// <para>Not currently used</para>
         /// </summary>
         public Version PluginVersion

diff --git a/Rdmp.Core/Curation/Data/Serialization/JsonConvertExtensions.cs b/Rdmp.Core/Curation/Data/Serialization/JsonConvertExtensions.cs
@@ -28,7 +28,7 @@ public static string SerializeObject(object value, IRDMPPlatformRepositoryServic
 
             var settings = new JsonSerializerSettings
             {
-                TypeNameHandling = TypeNameHandling.Objects,
+                TypeNameHandling = TypeNameHandling.None,
                 TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
                 Converters = new JsonConverter[] {databaseEntityJsonConverter}
             };
@@ -56,7 +56,7 @@ public static object DeserializeObject(string value, Type type,IRDMPPlatformRepo
 
             var settings = new JsonSerializerSettings
             {
-                TypeNameHandling = TypeNameHandling.Objects,
+                TypeNameHandling = TypeNameHandling.None,
                 TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
                 Converters = new JsonConverter[] {databaseEntityJsonConverter, lazyJsonConverter}
             };

diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterCollectionUI.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterCollectionUI.cs
@@ -214,7 +214,9 @@ private void miAddParameter_Click(object sender, EventArgs e)
         {
             Random r = new Random();
 
+#pragma warning disable SCS0005 // Weak random generator: This is only used to create an initial value for a parameter.
             var dialog  = new TypeTextOrCancelDialog("Parameter Name", "Name", 100, "@MyParam" + r.Next());
+#pragma warning restore SCS0005 // Weak random generator
             if (dialog.ShowDialog() == DialogResult.OK)
             {
                 var newParameter = Options.CreateNewParameter(dialog.ResultText.Trim());

diff --git a/rakefile.rb b/rakefile.rb
@@ -5,7 +5,7 @@
 load 'rakeconfig.rb'
 $MSBUILD15CMD = MSBUILD15CMD.gsub(/\\/,"/")
 
-task :ci_low_warnings, [:config,:level] => [:assemblyinfo, :build_low_warning]
+task :ci_low_warnings, [:config,:level,:aserrors] => [:assemblyinfo, :build_low_warning]
 
 task :ci_continuous, [:config] => [:setup_connection, :assemblyinfo, :build, :tests]
 
@@ -43,9 +43,9 @@
 	sh "\"#{$MSBUILD15CMD}\" #{SOLUTION} \/t:Clean;Build \/p:Configuration=Release"
 end
 
-task :build_low_warning, [:config,:level] => :restorepackages do |msb, args|
+task :build_low_warning, [:config,:level,:aserrors] => :restorepackages do |msb, args|
 	args.with_defaults(:level => 1)
-	sh "\"#{$MSBUILD15CMD}\" #{SOLUTION} \/t:Clean;Build \/p:Configuration=#{args.config} \/p:WarningLevel=#{args.level} \/p:TreatWarningsAsErrors=false"
+	sh "\"#{$MSBUILD15CMD}\" #{SOLUTION} \/t:Clean;Build \/p:Configuration=#{args.config} \/v:detailed \/p:WarningLevel=#{args.level} \/p:TreatWarningsAsErrors=#{args.aserrors}"
 end
 
 task :createtestdb, [:config] do |t, args|