Python: Properly handle invoke.task decorator

RasmusWL · RasmusWL · commit c09695af7d3c · 2020-10-07T12:29:19.000+02:00
diff --git a/python/ql/src/experimental/semmle/python/frameworks/Invoke.qll b/python/ql/src/experimental/semmle/python/frameworks/Invoke.qll
@@ -100,7 +100,7 @@ private module Invoke {
           t.start() and
           exists(Function func |
             func.getADecorator() = invoke_attr("task").asExpr() and
-            result.asExpr() = func.getArg(0)
+            result.(DataFlow::ParameterNode).getParameter() = func.getArg(0)
           )
           or
           exists(DataFlow::TypeTracker t2 | result = instance(t2).track(t2, t))
diff --git a/python/ql/test/experimental/library-tests/frameworks/invoke/ConceptsTest.expected b/python/ql/test/experimental/library-tests/frameworks/invoke/ConceptsTest.expected
@@ -1,2 +0,0 @@
-| invoke_test.py:31:26:31:51 | Comment # $getCommand="cmd1; cmd2" | Missing result:getCommand="cmd1; cmd2" |
-| invoke_test.py:38:26:38:51 | Comment # $getCommand="cmd1; cmd2" | Missing result:getCommand="cmd1; cmd2" |

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private module Invoke {`
`100`	`100`	`t.start() and`
`101`	`101`	`exists(Function func \|`
`102`	`102`	`func.getADecorator() = invoke_attr("task").asExpr() and`
`103`		`- result.asExpr() = func.getArg(0)`
	`103`	`+ result.(DataFlow::ParameterNode).getParameter() = func.getArg(0)`
`104`	`104`	`)`
`105`	`105`	`or`
`106`	`106`	`exists(DataFlow::TypeTracker t2 \| result = instance(t2).track(t2, t))`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-\| invoke_test.py:31:26:31:51 \| Comment # $getCommand="cmd1; cmd2" \| Missing result:getCommand="cmd1; cmd2" \|`
`2`		`-\| invoke_test.py:38:26:38:51 \| Comment # $getCommand="cmd1; cmd2" \| Missing result:getCommand="cmd1; cmd2" \|`