Merge pull request #11447 from geoffw0/localflow2

geoffw0 · web-flow · commit f2913206555b · 2022-11-28T14:18:01.000Z
Swift: Update queries to use LocalFlowSource
diff --git a/swift/ql/src/queries/Security/CWE-089/SqlInjection.ql b/swift/ql/src/queries/Security/CWE-089/SqlInjection.ql
@@ -69,7 +69,7 @@ class SQLiteSwiftSqlSink extends SqlSink {
 class SqlInjectionConfig extends TaintTracking::Configuration {
   SqlInjectionConfig() { this = "SqlInjectionConfig" }
 
-  override predicate isSource(DataFlow::Node node) { node instanceof RemoteFlowSource }
+  override predicate isSource(DataFlow::Node node) { node instanceof FlowSource }
 
   override predicate isSink(DataFlow::Node node) { node instanceof SqlSink }
 }
diff --git a/swift/ql/src/queries/Security/CWE-094/UnsafeJsEval.ql b/swift/ql/src/queries/Security/CWE-094/UnsafeJsEval.ql
@@ -20,9 +20,8 @@ import DataFlow::PathGraph
 
 /**
  * A source of untrusted, user-controlled data.
- * TODO: Extend to more (non-remote) sources in the future.
  */
-class Source = RemoteFlowSource;
+class Source = FlowSource;
 
 /**
  * A sink that evaluates a string of JavaScript code.

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class SQLiteSwiftSqlSink extends SqlSink {`
`69`	`69`	`class SqlInjectionConfig extends TaintTracking::Configuration {`
`70`	`70`	`SqlInjectionConfig() { this = "SqlInjectionConfig" }`
`71`	`71`
`72`		`- override predicate isSource(DataFlow::Node node) { node instanceof RemoteFlowSource }`
	`72`	`+ override predicate isSource(DataFlow::Node node) { node instanceof FlowSource }`
`73`	`73`
`74`	`74`	`override predicate isSink(DataFlow::Node node) { node instanceof SqlSink }`
`75`	`75`	`}`