Merge pull request #8579 from asgerf/js/literal-csv-rows

asgerf · web-flow · commit 68575f3655dc · 2022-03-29T11:13:19.000+02:00
JS: write all CSV rows as literals
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll b/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll
@@ -565,6 +565,10 @@ private module SpannerCsv {
           "@google-cloud/spanner;~SqlExecutorDirect;@google-cloud/spanner;Database;Member[run,runPartitionedUpdate,runStream]",
           "@google-cloud/spanner;~SqlExecutorDirect;@google-cloud/spanner;Transaction;Member[run,runStream,runUpdate]",
           "@google-cloud/spanner;~SqlExecutorDirect;@google-cloud/spanner;BatchTransaction;Member[createQueryPartitions]",
+          "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;v1.SpannerClient;",
+          "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;Database;",
+          "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;Transaction;",
+          "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;Snapshot;",
         ]
     }
   }
@@ -584,21 +588,14 @@ private module SpannerCsv {
   }
 
   class SpannerSources extends ModelInput::SourceModelCsv {
-    string spannerClass() { result = ["v1.SpannerClient", "Database", "Transaction", "Snapshot",] }
-
-    string resultPath() {
-      result =
-        [
-          "Member[executeSql].Argument[0..].Parameter[1]",
-          "Member[executeSql].ReturnValue.Awaited.Member[0]", "Member[run].ReturnValue.Awaited",
-          "Member[run].Argument[0..].Parameter[1]",
-        ]
-    }
-
     override predicate row(string row) {
       row =
-        "@google-cloud/spanner;" + this.spannerClass() + ";" + this.resultPath() +
-          ";database-access-result"
+        [
+          "@google-cloud/spanner;~SpannerObject;Member[executeSql].Argument[0..].Parameter[1];database-access-result",
+          "@google-cloud/spanner;~SpannerObject;Member[executeSql].ReturnValue.Awaited.Member[0];database-access-result",
+          "@google-cloud/spanner;~SpannerObject;Member[run].ReturnValue.Awaited;database-access-result",
+          "@google-cloud/spanner;~SpannerObject;Member[run].Argument[0..].Parameter[1];database-access-result",
+        ]
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,10 @@ private module SpannerCsv {`
`565`	`565`	`"@google-cloud/spanner;~SqlExecutorDirect;@google-cloud/spanner;Database;Member[run,runPartitionedUpdate,runStream]",`
`566`	`566`	`"@google-cloud/spanner;~SqlExecutorDirect;@google-cloud/spanner;Transaction;Member[run,runStream,runUpdate]",`
`567`	`567`	`"@google-cloud/spanner;~SqlExecutorDirect;@google-cloud/spanner;BatchTransaction;Member[createQueryPartitions]",`
	`568`	`+ "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;v1.SpannerClient;",`
	`569`	`+ "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;Database;",`
	`570`	`+ "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;Transaction;",`
	`571`	`+ "@google-cloud/spanner;~SpannerObject;@google-cloud/spanner;Snapshot;",`
`568`	`572`	`]`
`569`	`573`	`}`
`570`	`574`	`}`
`@@ -584,21 +588,14 @@ private module SpannerCsv {`
`584`	`588`	`}`
`585`	`589`
`586`	`590`	`class SpannerSources extends ModelInput::SourceModelCsv {`
`587`		`- string spannerClass() { result = ["v1.SpannerClient", "Database", "Transaction", "Snapshot",] }`
`588`		`-`
`589`		`- string resultPath() {`
`590`		`- result =`
`591`		`- [`
`592`		`- "Member[executeSql].Argument[0..].Parameter[1]",`
`593`		`- "Member[executeSql].ReturnValue.Awaited.Member[0]", "Member[run].ReturnValue.Awaited",`
`594`		`- "Member[run].Argument[0..].Parameter[1]",`
`595`		`- ]`
`596`		`- }`
`597`		`-`
`598`	`591`	`override predicate row(string row) {`
`599`	`592`	`row =`
`600`		`- "@google-cloud/spanner;" + this.spannerClass() + ";" + this.resultPath() +`
`601`		`- ";database-access-result"`
	`593`	`+ [`
	`594`	`+ "@google-cloud/spanner;~SpannerObject;Member[executeSql].Argument[0..].Parameter[1];database-access-result",`
	`595`	`+ "@google-cloud/spanner;~SpannerObject;Member[executeSql].ReturnValue.Awaited.Member[0];database-access-result",`
	`596`	`+ "@google-cloud/spanner;~SpannerObject;Member[run].ReturnValue.Awaited;database-access-result",`
	`597`	`+ "@google-cloud/spanner;~SpannerObject;Member[run].Argument[0..].Parameter[1];database-access-result",`
	`598`	`+ ]`
`602`	`599`	`}`
`603`	`600`	`}`
`604`	`601`	`}`