JS: Adapt to FlowSummaryImpl changes

Author: hvitved

javascript/ql/lib/semmle/javascript/dataflow/internal/DataFlowPrivate.qll

@@ -65,6 +65,8 @@ class FlowSummaryNode extends DataFlow::Node, TFlowSummaryNode {
 
   cached
   override string toString() { result = this.getSummaryNode().toString() }
+
+  override Location getLocation() { result = this.getSummaryNode().getLocation() }
 }
 
 class FlowSummaryDynamicParameterArrayNode extends DataFlow::Node,
@@ -541,7 +543,7 @@ predicate isArgumentNode(ArgumentNode n, DataFlowCall call, ArgumentPosition pos
 DataFlowCallable nodeGetEnclosingCallable(Node node) {
   result.asSourceCallable() = node.getContainer()
   or
-  result.asLibraryCallable() = node.(FlowSummaryNode).getSummarizedCallable()
+  result = node.(FlowSummaryNode).getSummaryNode().getEnclosingCallable()
   or
   result.asLibraryCallable() = node.(FlowSummaryDynamicParameterArrayNode).getSummarizedCallable()
   or

javascript/ql/lib/semmle/javascript/dataflow/internal/FlowSummaryPrivate.qll

@@ -12,18 +12,28 @@ private import sharedlib.FlowSummaryImpl::Private as Private
 private import sharedlib.FlowSummaryImpl::Public
 private import codeql.dataflow.internal.AccessPathSyntax as AccessPathSyntax
 private import semmle.javascript.internal.flow_summaries.ExceptionFlow
+private import codeql.util.Void
 
 /**
  * A class of callables that are candidates for flow summary modeling.
  */
-class SummarizedCallableBase = string;
+class SummarizedCallableBase extends string {
+  bindingset[this]
+  SummarizedCallableBase() { exists(this) }
 
-class SourceBase extends Unit {
-  SourceBase() { none() }
+  Location getLocation() { none() }
 }
 
-class SinkBase extends Unit {
-  SinkBase() { none() }
+class SourceBase extends Void {
+  Location getLocation() { none() }
+}
+
+class SinkBase = SourceBase;
+
+class FlowSummaryCallBase = SourceBase;
+
+DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+  result.asLibraryCallable() = c
 }
 
 /** Gets the parameter position representing a callback itself, if any. */
@@ -141,8 +151,41 @@ string encodeArgumentPosition(ArgumentPosition pos) {
 /** Gets the return kind corresponding to specification `"ReturnValue"`. */
 ReturnKind getStandardReturnValueKind() { result = MkNormalReturnKind() and Stage::ref() }
 
-private module FlowSummaryStepInput implements Private::StepsInputSig {
-  Private::SummaryNode getSummaryNode(DataFlow::Node n) {
+private module Input2 implements Private::InputSig2 {
+  private import codeql.util.Void
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+  }
+
+  bindingset[source, s]
+  SourceSinkReportingElement getSourceEntryElement(
+    SourceElement source, Private::SummaryComponentStack s
+  ) {
+    none()
+  }
+
+  bindingset[e, s]
+  DataFlow::Node getSourceExitNode(SourceSinkReportingElement e, Private::SummaryComponentStack s) {
+    none()
+  }
+
+  SourceSinkReportingElement getSinkExitElement(SinkElement sink, Private::SummaryComponent sc) {
+    none()
+  }
+
+  bindingset[e, sc]
+  DataFlow::Node getSinkEntryNode(SourceSinkReportingElement e, Private::SummaryComponent sc) {
+    none()
+  }
+}
+
+import Private::Make2<Input2> as Impl2
+
+private module FlowSummaryStepInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(DataFlow::Node n) {
     result = n.(FlowSummaryNode).getSummaryNode()
   }
 
@@ -156,12 +199,6 @@ private module FlowSummaryStepInput implements Private::StepsInputSig {
         ]
     )
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(SourceBase source) { none() }
-
-  DataFlow::Node getSourceNode(SourceBase source, Private::SummaryComponentStack s) { none() }
-
-  DataFlow::Node getSinkNode(SinkBase sink, Private::SummaryComponent sc) { none() }
 }
 
 module Steps = Private::Steps<FlowSummaryStepInput>;

javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/DataFlowArg.qll

@@ -29,8 +29,6 @@ module JSFlowSummary implements FlowSummaryImpl::InputSig<Location, JSDataFlow>
   private import semmle.javascript.dataflow.internal.FlowSummaryPrivate as FlowSummaryPrivate
   import FlowSummaryPrivate
 
-  class FlowSummaryCallBase = Void;
-
   overlay[local]
   predicate callableFromSource(SummarizedCallableBase c) { none() }
 

javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/FlowSummaryImpl.qll

@@ -1,4 +1,13 @@
 private import semmle.javascript.Locations
 private import codeql.dataflow.internal.FlowSummaryImpl
 private import DataFlowArg
-import Make<Location, JSDataFlow, JSFlowSummary>
+private import semmle.javascript.dataflow.internal.FlowSummaryPrivate as Priv
+
+private module Impl = Make<Location, JSDataFlow, JSFlowSummary>;
+
+module Private {
+  import Impl::Private
+  import Priv::Impl2
+}
+
+module Public = Impl::Public;