Java/Ruby: Sync files.

michaelnebel · michaelnebel · commit 649757c27f76 · 2022-06-20T16:20:01.000+02:00
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll
@@ -1116,13 +1116,13 @@ module Private {
       preservesValue = false and result = "taint"
     }
 
-    private string renderGenerated(RelevantSummarizedCallable c) {
-      if c.(SummarizedCallable).isAutoGenerated() then result = "generated:" else result = ""
+    private string renderProvenance(RelevantSummarizedCallable c) {
+      if c.(SummarizedCallable).isAutoGenerated() then result = "generated" else result = "manual"
     }
 
     /**
      * A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
-     * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;(generated:)?kind",
+     * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
      * ext is hardcoded to empty.
      */
     query predicate summary(string csv) {
@@ -1133,7 +1133,7 @@ module Private {
         c.relevantSummary(input, output, preservesValue) and
         csv =
           c.getCallableCsv() + getComponentStackCsv(input) + ";" + getComponentStackCsv(output) +
-            ";" + renderGenerated(c) + renderKind(preservesValue)
+            ";" + renderKind(preservesValue) + ";" + renderProvenance(c)
       )
     }
   }
diff --git a/java/ql/src/utils/model-generator/internal/CaptureModels.qll b/java/ql/src/utils/model-generator/internal/CaptureModels.qll
@@ -44,7 +44,8 @@ private string asSummaryModel(TargetApi api, string input, string output, string
   result =
     asPartialModel(api) + input + ";" //
       + output + ";" //
-      + "generated:" + kind
+      + kind + ";" //
+      + "generated"
 }
 
 /**
@@ -68,15 +69,21 @@ private string asTaintModel(TargetApi api, string input, string output) {
  */
 bindingset[input, kind]
 private string asSinkModel(TargetApi api, string input, string kind) {
-  result = asPartialModel(api) + input + ";" + "generated:" + kind
+  result =
+    asPartialModel(api) + input + ";" //
+      + kind + ";" //
+      + "generated"
 }
 
 /**
  * Gets the source model for `api` with `output` and `kind`.
  */
 bindingset[output, kind]
 private string asSourceModel(TargetApi api, string output, string kind) {
-  result = asPartialModel(api) + output + ";" + "generated:" + kind
+  result =
+    asPartialModel(api) + output + ";" //
+      + kind + ";" //
+      + "generated"
 }
 
 /**
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll
@@ -1116,13 +1116,13 @@ module Private {
       preservesValue = false and result = "taint"
     }
 
-    private string renderGenerated(RelevantSummarizedCallable c) {
-      if c.(SummarizedCallable).isAutoGenerated() then result = "generated:" else result = ""
+    private string renderProvenance(RelevantSummarizedCallable c) {
+      if c.(SummarizedCallable).isAutoGenerated() then result = "generated" else result = "manual"
     }
 
     /**
      * A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
-     * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;(generated:)?kind",
+     * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",
      * ext is hardcoded to empty.
      */
     query predicate summary(string csv) {
@@ -1133,7 +1133,7 @@ module Private {
         c.relevantSummary(input, output, preservesValue) and
         csv =
           c.getCallableCsv() + getComponentStackCsv(input) + ";" + getComponentStackCsv(output) +
-            ";" + renderGenerated(c) + renderKind(preservesValue)
+            ";" + renderKind(preservesValue) + ";" + renderProvenance(c)
       )
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1116,13 +1116,13 @@ module Private {`
`1116`	`1116`	`preservesValue = false and result = "taint"`
`1117`	`1117`	`}`
`1118`	`1118`
`1119`		`- private string renderGenerated(RelevantSummarizedCallable c) {`
`1120`		`- if c.(SummarizedCallable).isAutoGenerated() then result = "generated:" else result = ""`
	`1119`	`+ private string renderProvenance(RelevantSummarizedCallable c) {`
	`1120`	`+ if c.(SummarizedCallable).isAutoGenerated() then result = "generated" else result = "manual"`
`1121`	`1121`	`}`
`1122`	`1122`
`1123`	`1123`	`/**`
`1124`	`1124`	`* A query predicate for outputting flow summaries in semi-colon separated format in QL tests.`
`1125`		`- * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;(generated:)?kind",`
	`1125`	`+ * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind;provenance"",`
`1126`	`1126`	`* ext is hardcoded to empty.`
`1127`	`1127`	`*/`
`1128`	`1128`	`query predicate summary(string csv) {`
`@@ -1133,7 +1133,7 @@ module Private {`
`1133`	`1133`	`c.relevantSummary(input, output, preservesValue) and`
`1134`	`1134`	`csv =`
`1135`	`1135`	`c.getCallableCsv() + getComponentStackCsv(input) + ";" + getComponentStackCsv(output) +`
`1136`		`- ";" + renderGenerated(c) + renderKind(preservesValue)`
	`1136`	`+ ";" + renderKind(preservesValue) + ";" + renderProvenance(c)`
`1137`	`1137`	`)`
`1138`	`1138`	`}`
`1139`	`1139`	`}`