JS: Expose data flow node for field declaration

asgerf · asgerf · commit fcb812437631 · 2021-01-18T12:18:26.000Z
diff --git a/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/src/semmle/javascript/dataflow/DataFlow.qll
@@ -1308,6 +1308,22 @@ module DataFlow {
     nd = TFunctionReturnNode(function)
   }
 
+  /**
+   * INTERNAL: Do not use outside standard library.
+   *
+   * Gets a data flow node unique to the given field declaration.
+   *
+   * Note that this node defaults to being disconnected from the data flow
+   * graph, as the individual property reads and writes affecting the field are
+   * analyzed independently of the field declaration.
+   *
+   * Certain framework models may need this node to model the behavior of
+   * class and field decorators.
+   */
+  DataFlow::Node fieldDeclarationNode(FieldDeclaration field) {
+    result = TPropNode(field)
+  }
+
   /**
    * Gets the data flow node corresponding the given l-value expression, if
    * such a node exists.
diff --git a/javascript/ql/src/semmle/javascript/frameworks/Angular2.qll b/javascript/ql/src/semmle/javascript/frameworks/Angular2.qll
@@ -293,7 +293,7 @@ module Angular2 {
       exists(FieldDeclaration f |
         f.getName() = name and
         f.getDeclaringClass().flow() = this and
-        result = f.getNameExpr().flow()
+        result = DataFlow::fieldDeclarationNode(f)
       )
     }
 

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ module Angular2 {`
`293`	`293`	`exists(FieldDeclaration f \|`
`294`	`294`	`f.getName() = name and`
`295`	`295`	`f.getDeclaringClass().flow() = this and`
`296`		`- result = f.getNameExpr().flow()`
	`296`	`+ result = DataFlow::fieldDeclarationNode(f)`
`297`	`297`	`)`
`298`	`298`	`}`
`299`	`299`