Java: Don't require that the source is directly within the TargetApi itself (in that case wrappers get excluded).

michaelnebel · michaelnebel · commit 66fe0e74b5e4 · 2022-02-28T16:48:23.000+01:00
diff --git a/java/ql/src/utils/model-generator/CaptureSourceModels.ql b/java/ql/src/utils/model-generator/CaptureSourceModels.ql
@@ -43,7 +43,6 @@ string captureSource(TargetAPI api) {
   exists(DataFlow::Node source, DataFlow::Node sink, FromSourceConfiguration config, string kind |
     config.hasFlow(source, sink) and
     sourceNode(source, kind) and
-    api = source.getEnclosingCallable() and
     api = sink.getEnclosingCallable() and
     result = asSourceModel(api, returnNodeAsOutput(sink), kind)
   )

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ string captureSource(TargetAPI api) {`
`43`	`43`	`exists(DataFlow::Node source, DataFlow::Node sink, FromSourceConfiguration config, string kind \|`
`44`	`44`	`config.hasFlow(source, sink) and`
`45`	`45`	`sourceNode(source, kind) and`
`46`		`- api = source.getEnclosingCallable() and`
`47`	`46`	`api = sink.getEnclosingCallable() and`
`48`	`47`	`result = asSourceModel(api, returnNodeAsOutput(sink), kind)`
`49`	`48`	`)`