Python: Setup shared read/store steps

RasmusWL · RasmusWL · commit 7721fb33314c · 2024-03-14T10:42:37.000+01:00
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -641,11 +641,18 @@ predicate jumpStepNotSharedWithTypeTracker(Node nodeFrom, Node nodeTo) {
 //--------
 // Field flow
 //--------
+/**
+ * Subset of `storeStep` that should be shared with type-tracking.
+ */
+predicate storeStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) { none() }
+
 /**
  * Holds if data can flow from `nodeFrom` to `nodeTo` via an assignment to
  * content `c`.
  */
 predicate storeStep(Node nodeFrom, ContentSet c, Node nodeTo) {
+  storeStepCommon(nodeFrom, c, nodeTo)
+  or
   listStoreStep(nodeFrom, c, nodeTo)
   or
   setStoreStep(nodeFrom, c, nodeTo)
@@ -891,10 +898,17 @@ predicate attributeStoreStep(Node nodeFrom, AttributeContent c, Node nodeTo) {
   )
 }
 
+/**
+ * Subset of `readStep` that should be shared with type-tracking.
+ */
+predicate readStepCommon(Node nodeFrom, ContentSet c, Node nodeTo) { none() }
+
 /**
  * Holds if data can flow from `nodeFrom` to `nodeTo` via a read of content `c`.
  */
 predicate readStep(Node nodeFrom, ContentSet c, Node nodeTo) {
+  readStepCommon(nodeFrom, c, nodeTo)
+  or
   subscriptReadStep(nodeFrom, c, nodeTo)
   or
   iterableUnpackingReadStep(nodeFrom, c, nodeTo)
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -175,6 +175,8 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       nodeTo = a.getObject()
     )
     or
+    DataFlowPrivate::storeStepCommon(nodeFrom, content, nodeTo)
+    or
     TypeTrackerSummaryFlow::basicStoreStep(nodeFrom, nodeTo, content)
   }
 
@@ -189,6 +191,8 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {
       nodeTo = a
     )
     or
+    DataFlowPrivate::readStepCommon(nodeFrom, content, nodeTo)
+    or
     TypeTrackerSummaryFlow::basicLoadStep(nodeFrom, nodeTo, content)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,8 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {`
`175`	`175`	`nodeTo = a.getObject()`
`176`	`176`	`)`
`177`	`177`	`or`
	`178`	`+ DataFlowPrivate::storeStepCommon(nodeFrom, content, nodeTo)`
	`179`	`+ or`
`178`	`180`	`TypeTrackerSummaryFlow::basicStoreStep(nodeFrom, nodeTo, content)`
`179`	`181`	`}`
`180`	`182`
`@@ -189,6 +191,8 @@ module TypeTrackingInput implements Shared::TypeTrackingInput {`
`189`	`191`	`nodeTo = a`
`190`	`192`	`)`
`191`	`193`	`or`
	`194`	`+ DataFlowPrivate::readStepCommon(nodeFrom, content, nodeTo)`
	`195`	`+ or`
`192`	`196`	`TypeTrackerSummaryFlow::basicLoadStep(nodeFrom, nodeTo, content)`
`193`	`197`	`}`
`194`	`198`