Python: Remove flow from getAttributeName

tausbn · tausbn · commit df447c0af9ec · 2020-10-08T15:01:24.000+02:00
diff --git a/python/ql/src/experimental/dataflow/internal/Attributes.qll b/python/ql/src/experimental/dataflow/internal/Attributes.qll
@@ -137,12 +137,7 @@ private class SetAttrCallAsAttrWrite extends AttrWrite, CfgNode {
   override ExprNode getAttributeNameExpr() { result.asCfgNode() = node.getName() }
 
   override string getAttributeName() {
-    // TODO track this back using local flow
-    exists(StrConst s, Node nodeFrom |
-      s = nodeFrom.asExpr() and
-      simpleLocalFlowStep*(nodeFrom, this.getAttributeNameExpr()) and
-      result = s.getText()
-    )
+    result = this.getAttributeNameExpr().asExpr().(StrConst).getText()
   }
 }
 
@@ -220,10 +215,6 @@ private class GetAttrCallAsAttrRead extends AttrRead, CfgNode {
   override ExprNode getAttributeNameExpr() { result.asCfgNode() = node.getName() }
 
   override string getAttributeName() {
-    exists(StrConst s, Node nodeFrom |
-      s = nodeFrom.asExpr() and
-      simpleLocalFlowStep*(nodeFrom, this.getAttributeNameExpr()) and
-      result = s.getText()
-    )
+    result = this.getAttributeNameExpr().asExpr().(StrConst).getText()
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,7 @@ private class SetAttrCallAsAttrWrite extends AttrWrite, CfgNode {`
`137`	`137`	`override ExprNode getAttributeNameExpr() { result.asCfgNode() = node.getName() }`
`138`	`138`
`139`	`139`	`override string getAttributeName() {`
`140`		`- // TODO track this back using local flow`
`141`		`- exists(StrConst s, Node nodeFrom \|`
`142`		`- s = nodeFrom.asExpr() and`
`143`		`- simpleLocalFlowStep*(nodeFrom, this.getAttributeNameExpr()) and`
`144`		`- result = s.getText()`
`145`		`- )`
	`140`	`+ result = this.getAttributeNameExpr().asExpr().(StrConst).getText()`
`146`	`141`	`}`
`147`	`142`	`}`
`148`	`143`
`@@ -220,10 +215,6 @@ private class GetAttrCallAsAttrRead extends AttrRead, CfgNode {`
`220`	`215`	`override ExprNode getAttributeNameExpr() { result.asCfgNode() = node.getName() }`
`221`	`216`
`222`	`217`	`override string getAttributeName() {`
`223`		`- exists(StrConst s, Node nodeFrom \|`
`224`		`- s = nodeFrom.asExpr() and`
`225`		`- simpleLocalFlowStep*(nodeFrom, this.getAttributeNameExpr()) and`
`226`		`- result = s.getText()`
`227`		`- )`
	`218`	`+ result = this.getAttributeNameExpr().asExpr().(StrConst).getText()`
`228`	`219`	`}`
`229`	`220`	`}`