Add more tests

Author: e-n-0

tracer/test/Datadog.Trace.Security.IntegrationTests/IAST/IastInstrumentationUnitTests.cs

@@ -15,6 +15,7 @@
 using System.Net.Http;
 using System.Net.Mail;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
@@ -150,6 +151,9 @@ public List<string> GetAspects()
     [InlineData(typeof(SmtpClient), "Send", new[] { "Void Send(System.String, System.String, System.String, System.String)" }, true)]
     [InlineData(typeof(SmtpClient), "SendAsync", new[] { "Void SendAsync(System.String, System.String, System.String, System.String, System.Object)" }, true)]
     [InlineData(typeof(SmtpClient), "SendMailAsync", new[] { "System.Threading.Tasks.Task SendMailAsync(System.String, System.String, System.String, System.String, System.Threading.CancellationToken)", "System.Threading.Tasks.Task SendMailAsync(System.String, System.String, System.String, System.String)" }, true)]
+#if NET6_0_OR_GREATER
+    [InlineData(typeof(DefaultInterpolatedStringHandler), null, new[] { "Void AppendFormatted(System.ReadOnlySpan`1[System.Char], Int32, System.String)" }, true)]
+#endif
     [Trait("Category", "EndToEnd")]
     [Trait("RunOnWindows", "True")]
     public void TestMethodsAspectCover(Type typeToCheck, string methodToCheck, string[] overloadsToExclude = null, bool excludeParameterlessMethods = false)
@@ -305,6 +309,9 @@ public void TestFileClassMethodsAspectCover()
     [InlineData(typeof(Assembly))]
 #endif
     [InlineData(typeof(Assembly), new string[] { "System.Reflection.Assembly::Load(System.String,System.Security.Policy.Evidence)" })]
+#if NET6_0_OR_GREATER
+    [InlineData(typeof(DefaultInterpolatedStringHandler), null)]
+#endif
     [Trait("Category", "EndToEnd")]
     [Trait("RunOnWindows", "True")]
     public void TestAllAspectsHaveACorrespondingMethod(Type type, string[] aspectsToExclude = null)
@@ -389,7 +396,7 @@ private string NormalizeName(string signature)
 
         return signature.Replace(" ", string.Empty).Replace("[T]", string.Empty).Replace("<!!0>", string.Empty)
             .Replace("[", "<").Replace("]", ">").Replace(",...", string.Empty).Replace("System.", string.Empty)
-            .Replace("ByRef", string.Empty);
+            .Replace("ByRef", string.Empty).Replace("!!0", "T");
     }
 
     private bool MethodShouldBeChecked(MethodBase method)
@@ -445,7 +452,13 @@ private void TestMethodOverloads(Type typeToCheck, string methodToCheck, List<st
             Output.WriteLine("Checking: " + methodSignature);
             if (MethodShouldBeChecked(method) && overloadsToExcludeNormalized?.Contains(methodSignature) != true)
             {
-                var isCovered = aspects.Any(x => NormalizeName(x).Contains(methodSignature) && x.Contains(typeToCheck.FullName));
+                var isCovered = aspects.Any(x =>
+                {
+                    var normalized = NormalizeName(x);
+                    var contains = normalized.Contains(methodSignature);
+                    var xcontains = x.Contains(typeToCheck.FullName);
+                    return contains && xcontains;
+                });
                 isCovered.Should().BeTrue(method.ToString() + " is not covered");
             }
         }

tracer/test/test-applications/integrations/Samples.InstrumentedTests/Vulnerabilities/String/DefaultInterpolatedStringHandlerTests.cs

@@ -245,17 +245,17 @@ public void GivenImplicitInterpolatedString_WhenAddingTaintedValuesNested_GetStr
     {
         const int number = 42;
         var date = new DateTime(2024, 11, 22, 15, 30, 0);
-        const decimal decimalValue = 123.456m;
+        const decimal decimalValue = 123;
         const bool booleanValue = true;
         const char charValue = 'A';
         var nestedInterpolatedString1 = $"Nested1 {TaintedValue} and {number}";
         var nestedInterpolatedString2 = $"Nested2 {nestedInterpolatedString1} with date {date:yyyy-MM-dd}";
-        var complexString = $"Complex {nestedInterpolatedString2} and decimal {decimalValue:F2} and boolean {booleanValue}";
+        var complexString = $"Complex {nestedInterpolatedString2} and decimal {decimalValue} and boolean {booleanValue}";
 
         var nestedString = $"Hello {$"{TaintedValue + "Hello"} - {complexString}"}";
         var finalString = $"Final {nestedString} and char {charValue} with additional {UntaintedValue} and number {number} and date {date:HH:mm:ss}";
 
-        finalString.Should().Be("Final Hello Hello - Complex Nested2 Nested1 tainted and 42 with date 2024-11-22 and decimal 123.46 and boolean True and char A with additional untainted and number 42 and date 15:30:00");
+        finalString.Should().Be("Final Hello taintedHello - Complex Nested2 Nested1 tainted and 42 with date 2024-11-22 and decimal 123 and boolean True and char A with additional untainted and number 42 and date 15:30:00");
         AssertTainted(finalString);
     }