python

Author: hvitved

python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll

@@ -529,8 +529,7 @@ predicate simpleLocalFlowStepForTypetracking(Node nodeFrom, Node nodeTo) {
 }
 
 private predicate summaryLocalStep(Node nodeFrom, Node nodeTo, string model) {
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-    nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
 }
 
 predicate variableCaptureLocalFlowStep(Node nodeFrom, Node nodeTo) {
@@ -697,8 +696,7 @@ predicate jumpStep(Node nodeFrom, Node nodeTo) {
   or
   jumpStepNotSharedWithTypeTracker(nodeFrom, nodeTo)
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
-    nodeTo.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(nodeFrom, nodeTo)
 }
 
 /**

python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll

@@ -132,15 +132,20 @@ private module Input2 implements Impl::Private::InputSig2 {
     DataFlowCallable getEnclosingCallable() { none() }
   }
 
-  bindingset[source, s]
   SourceSinkReportingElement getSourceEntryElement(
-    Impl::Public::SourceElement source, Impl::Private::SummaryComponentStack s
+    Impl::Public::SourceElement source, Impl::Private::SummaryComponent sc
   ) {
     none()
   }
 
-  bindingset[e, s]
-  Node getSourceExitNode(SourceSinkReportingElement e, Impl::Private::SummaryComponentStack s) {
+  SourceSinkReportingElement getNextElement(
+    SourceSinkReportingElement prev, Impl::Private::SummaryComponent sc
+  ) {
+    none()
+  }
+
+  bindingset[e, sc]
+  Node getSourceExitNode(SourceSinkReportingElement e, Impl::Private::SummaryComponent sc) {
     none()
   }
 

python/ql/lib/semmle/python/dataflow/new/internal/TaintTrackingPrivate.qll

@@ -80,8 +80,7 @@ private module Cached {
     ) and
     model = ""
     or
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
   }
 }