Merge pull request #17853 from michaelnebel/csharp/madtests

michaelnebel · web-flow · commit 058fcc1a5107 · 2024-10-28T13:38:26.000+01:00
C#: Re-factor test for CWE-611/UntrustedDataInsecureXml.ql to pretty print models.
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.expected
@@ -1,9 +1,11 @@
+#select
+| Test.cs:11:50:11:84 | access to indexer | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | This insecure XML processing depends on a $@ (DTD processing is enabled with an insecure resolver). | Test.cs:11:50:11:72 | access to property QueryString | user-provided value |
 edges
 | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance |  |
-| Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance | MaD:11692 |
+| Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | provenance | MaD:1 |
+models
+| 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
 nodes
 | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | semmle.label | access to property QueryString : NameValueCollection |
 | Test.cs:11:50:11:84 | access to indexer | semmle.label | access to indexer |
 subpaths
-#select
-| Test.cs:11:50:11:84 | access to indexer | Test.cs:11:50:11:72 | access to property QueryString : NameValueCollection | Test.cs:11:50:11:84 | access to indexer | This insecure XML processing depends on a $@ (DTD processing is enabled with an insecure resolver). | Test.cs:11:50:11:72 | access to property QueryString | user-provided value |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref b/csharp/ql/test/query-tests/Security Features/CWE-611/UntrustedDataInsecureXml.qlref
@@ -1 +1,2 @@
-Security Features/CWE-611/UntrustedDataInsecureXml.ql
+query: Security Features/CWE-611/UntrustedDataInsecureXml.ql
+postprocess: TestUtilities/PrettyPrintModels.ql

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-Security Features/CWE-611/UntrustedDataInsecureXml.ql`
	`1`	`+query: Security Features/CWE-611/UntrustedDataInsecureXml.ql`
	`2`	`+postprocess: TestUtilities/PrettyPrintModels.ql`