C#: Convert System.Uri flow to CSV format.

Author: michaelnebel

csharp/ql/lib/semmle/code/csharp/dataflow/LibraryTypeDataFlow.qll

@@ -499,51 +499,6 @@ private module FrameworkDataFlowAdaptor {
   }
 }
 
-/** Data flow for `System.Uri`. */
-class SystemUriFlow extends LibraryTypeDataFlow, SystemUriClass {
-  override predicate callableFlow(
-    CallableFlowSource source, CallableFlowSink sink, SourceDeclarationCallable c,
-    boolean preservesValue
-  ) {
-    (
-      this.constructorFlow(source, sink, c)
-      or
-      this.methodFlow(source, sink, c)
-      or
-      exists(Property p |
-        this.propertyFlow(p) and
-        source = TCallableFlowSourceQualifier() and
-        sink = TCallableFlowSinkReturn() and
-        c = p.getGetter()
-      )
-    ) and
-    preservesValue = false
-  }
-
-  private predicate constructorFlow(CallableFlowSource source, CallableFlowSink sink, Constructor c) {
-    c = this.getAMember() and
-    c.getParameter(0).getType() instanceof StringType and
-    source = TCallableFlowSourceArg(0) and
-    sink = TCallableFlowSinkReturn()
-  }
-
-  private predicate methodFlow(
-    CallableFlowSource source, CallableFlowSink sink, SourceDeclarationMethod m
-  ) {
-    m = this.getAMethod("ToString") and
-    source = TCallableFlowSourceQualifier() and
-    sink = TCallableFlowSinkReturn()
-  }
-
-  private predicate propertyFlow(Property p) {
-    p = this.getPathAndQueryProperty()
-    or
-    p = this.getQueryProperty()
-    or
-    p = this.getOriginalStringProperty()
-  }
-}
-
 /** Data flow for `System.IO.StringReader`. */
 class SystemIOStringReaderFlow extends LibraryTypeDataFlow, SystemIOStringReaderClass {
   override predicate callableFlow(

csharp/ql/lib/semmle/code/csharp/frameworks/System.qll

@@ -92,7 +92,7 @@ class SystemBooleanStruct extends BoolType {
   }
 }
 
-/** Data flow for `System.Boolean` */
+/** Data flow for `System.Boolean`. */
 private class SystemBoolean32FlowModelCsv extends SummaryModelCsv {
   override predicate row(string row) {
     row =
@@ -553,6 +553,22 @@ class SystemUriClass extends SystemClass {
   }
 }
 
+/** Data flow for `System.Uri`. */
+private class SystemUriFlowModelCsv extends SummaryModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        "System;Uri;false;ToString;();;Argument[-1];ReturnValue;taint",
+        "System;Uri;false;Uri;(System.String);;Argument[0];ReturnValue;taint",
+        "System;Uri;false;Uri;(System.String,System.Boolean);;Argument[0];ReturnValue;taint",
+        "System;Uri;false;Uri;(System.String,System.UriKind);;Argument[0];ReturnValue;taint",
+        "System;Uri;false;get_OriginalString;();;Argument[-1];ReturnValue;taint",
+        "System;Uri;false;get_PathAndQuery;();;Argument[-1];ReturnValue;taint",
+        "System;Uri;false;get_Query;();;Argument[-1];ReturnValue;taint",
+      ]
+  }
+}
+
 /** The `System.ValueType` class. */
 class SystemValueTypeClass extends SystemClass {
   SystemValueTypeClass() { this.hasName("ValueType") }