Convert sources to MaD

joefarebrother · joefarebrother · commit 9881fdfe2720 · 2023-04-21T14:19:17.000+01:00
diff --git a/csharp/ql/lib/ext/System.IO.model.yml b/csharp/ql/lib/ext/System.IO.model.yml
@@ -4,6 +4,16 @@ extensions:
       extensible: sourceModel
     data:
       - ["System.IO", "FileStream", False, "FileStream", "", "", "Argument[this]", "file", "manual"]
+      - ["System.IO", "FileStream", False, "FileStream", "", "", "Argument[this]", "file-write", "manual"]
+      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.String)", "", "Argument[this]", "file-write", "manual"]
+      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.String,System.Boolean)", "", "Argument[this]", "file-write", "manual"]
+      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.String,System.Boolean,System.Text.Encoding)", "", "Argument[this]", "file-write", "manual"]
+      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.String,System.Boolean,System.Text.Encoding,System.Int32)", "", "Argument[this]", "file-write", "manual"]
+      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.String,System.Text.Encoding,System.IO.FileStreamOptions)", "", "Argument[this]", "file-write", "manual"]
+      - ["System.IO", "StreamWriter", False, "StreamWriter", "(System.String,System.IO.FileStreamOptions)", "", "Argument[this]", "file-write", "manual"]
+      - ["System.IO", "File", False, "Open", "", "", "ReturnValue", "file-write", "manual"]
+      - ["System.IO", "File", False, "OpenWrite", "", "", "ReturnValue", "file-write", "manual"]
+      - ["System.IO", "File", False, "Create", "", "", "ReturnValue", "file-write", "manual"]
   - addsTo:
       pack: codeql/csharp-all
       extensible: summaryModel
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll
@@ -212,7 +212,7 @@ module ModelValidation {
     )
     or
     exists(string kind | sourceModel(_, _, _, _, _, _, _, kind, _) |
-      not kind = ["local", "remote", "file"] and
+      not kind = ["local", "remote", "file", "file-write"] and
       result = "Invalid kind \"" + kind + "\" in source model."
     )
   }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/ExternalLocationSink.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/flowsinks/ExternalLocationSink.qll
@@ -83,20 +83,7 @@ private predicate isFileWriteCall(Expr stream, Expr data) {
 }
 
 private module LocalFileOutputStreamConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node src) {
-    exists(MethodCall mc | mc = src.asExpr() |
-      mc.getTarget().hasQualifiedName("System.IO", "File", ["Open", "Create", "OpenWrite"])
-      or
-      mc.getTarget()
-          .hasQualifiedName("System.IO", "FileInfo",
-            ["AppendText", "Create", "CreateText", "Open", "OpenText", "OpenWrite"])
-    )
-    or
-    exists(ObjectCreation oc | oc = src.asExpr() |
-      oc.getObjectType() instanceof SystemIOStreamWriterClass and
-      oc.getArgument(0).getType() instanceof StringType
-    )
-  }
+  predicate isSource(DataFlow::Node src) { sourceNode(src, "file-write") }
 
   predicate isSink(DataFlow::Node sink) { isFileWriteCall(sink.asExpr(), _) }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ module ModelValidation {`
`212`	`212`	`)`
`213`	`213`	`or`
`214`	`214`	`exists(string kind \| sourceModel(_, _, _, _, _, _, _, kind, _) \|`
`215`		`- not kind = ["local", "remote", "file"] and`
	`215`	`+ not kind = ["local", "remote", "file", "file-write"] and`
`216`	`216`	`result = "Invalid kind \"" + kind + "\" in source model."`
`217`	`217`	`)`
`218`	`218`	`}`