Remove basic support for lambda flow

Author: Benjamin Muskalla

java/ql/src/utils/model-generator/CaptureSourceModels.ql

@@ -22,42 +22,24 @@ class FromSourceConfiguration extends TaintTracking::Configuration {
 
   override predicate isSink(DataFlow::Node sink) {
     exists(Callable c |
-      sink instanceof ReturnNodeExt and
+      sink instanceof ReturnNode and
       sink.getEnclosingCallable() = c and
       c.isPublic() and
       c.fromSource()
     )
-    or
-    exists(MethodAccess c | sink.asExpr() = c.getAnArgument())
   }
 
   override DataFlow::FlowFeature getAFeature() {
     result instanceof DataFlow::FeatureHasSinkCallContext
   }
 }
 
-string asOutput(DataFlow::Node node) {
-  if node instanceof ReturnNodeExt
-  then result = "ReturnValue"
-  else
-    result =
-      "Parameter[" +
-        node.(ArgumentNode)
-            .getCall()
-            .asCall()
-            .getQualifier()
-            .(VarAccess)
-            .getVariable()
-            .(Parameter)
-            .getPosition() + "]"
-}
-
 string captureSource(Callable 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
-    result = asSourceModel(api, asOutput(sink), kind)
+    result = asSourceModel(api, "ReturnValue", kind)
   )
 }
 

java/ql/test/utils/model-generator/CaptureSourceModels.expected

@@ -1,3 +1,2 @@
-| p;Sources;true;consumeSource;(int,Consumer);;Parameter[1];remote |
 | p;Sources;true;readUrl;(URL);;ReturnValue;remote |
 | p;Sources;true;socketStream;();;ReturnValue;remote |

java/ql/test/utils/model-generator/p/Sources.java

@@ -18,8 +18,4 @@ public InputStream socketStream() throws IOException {
         return socket.accept().getInputStream();
     }
 
-    public void consumeSource(int port, Consumer<InputStream> consumer) throws IOException {
-        ServerSocket socket = new ServerSocket(port);
-        consumer.accept(socket.accept().getInputStream());
-    }
 }