C#: Fix rebase error merge (validation on encryption kind was un-intentionally deleted).

michaelnebel · michaelnebel · commit 592b60d6ab00 · 2022-08-24T09:58:53.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll
@@ -359,6 +359,7 @@ module CsvValidation {
     exists(string row, string kind | sinkModel(row) |
       kind = row.splitAt(";", 7) and
       not kind = ["code", "sql", "xss", "remote", "html"] and
+      not kind.matches("encryption-%") and
       result = "Invalid kind \"" + kind + "\" in sink model."
     )
     or

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,7 @@ module CsvValidation {`
`359`	`359`	`exists(string row, string kind \| sinkModel(row) \|`
`360`	`360`	`kind = row.splitAt(";", 7) and`
`361`	`361`	`not kind = ["code", "sql", "xss", "remote", "html"] and`
	`362`	`+ not kind.matches("encryption-%") and`
`362`	`363`	`result = "Invalid kind \"" + kind + "\" in sink model."`
`363`	`364`	`)`
`364`	`365`	`or`