Merge pull request #4467 from tausbn/python-fix-import-type-tracking

Python: Fix unwanted module type tracking

Author: RasmusWL

python/ql/src/experimental/dataflow/internal/DataFlowUtil.qll

@@ -68,5 +68,5 @@ Node importNode(string name) {
   // Because named imports are modelled as `AttrRead`s, the statement `from foo import bar as baz`
   // is interpreted as if it was an assignment `baz = foo.bar`, which means `baz` gets tracked as a
   // reference to `foo.bar`, as desired.
-  result.asCfgNode().getNode() = any(ImportExpr i | i.getAnImportedModuleName() = name)
+  result.asCfgNode().getNode() = any(ImportExpr i | i.getName() = name)
 }

python/ql/test/experimental/dataflow/import-helper/ImportHelper.expected

@@ -4,15 +4,11 @@
 | test2.py:1:6:1:10 | ControlFlowNode for ImportExpr | mypkg |
 | test2.py:1:19:1:21 | GSSA Variable foo | mypkg.foo |
 | test2.py:1:24:1:26 | GSSA Variable bar | mypkg.bar |
-| test3.py:1:8:1:16 | ControlFlowNode for ImportExpr | mypkg |
 | test3.py:1:8:1:16 | ControlFlowNode for ImportExpr | mypkg.foo |
-| test3.py:2:8:2:16 | ControlFlowNode for ImportExpr | mypkg |
 | test3.py:2:8:2:16 | ControlFlowNode for ImportExpr | mypkg.bar |
 | test3.py:2:8:2:16 | GSSA Variable mypkg | mypkg |
-| test4.py:1:8:1:16 | ControlFlowNode for ImportExpr | mypkg |
 | test4.py:1:8:1:16 | ControlFlowNode for ImportExpr | mypkg.foo |
 | test4.py:1:21:1:24 | GSSA Variable _foo | mypkg.foo |
-| test4.py:2:8:2:16 | ControlFlowNode for ImportExpr | mypkg |
 | test4.py:2:8:2:16 | ControlFlowNode for ImportExpr | mypkg.bar |
 | test4.py:2:21:2:24 | GSSA Variable _bar | mypkg.bar |
 | test5.py:1:8:1:12 | ControlFlowNode for ImportExpr | mypkg |
@@ -21,12 +17,10 @@
 | test5.py:9:26:9:29 | GSSA Variable _bar | mypkg.bar |
 | test6.py:1:8:1:12 | ControlFlowNode for ImportExpr | mypkg |
 | test6.py:1:8:1:12 | GSSA Variable mypkg | mypkg |
-| test6.py:5:8:5:16 | ControlFlowNode for ImportExpr | mypkg |
 | test6.py:5:8:5:16 | ControlFlowNode for ImportExpr | mypkg.foo |
 | test6.py:5:8:5:16 | GSSA Variable mypkg | mypkg |
 | test7.py:1:6:1:10 | ControlFlowNode for ImportExpr | mypkg |
 | test7.py:1:19:1:21 | GSSA Variable foo | mypkg.foo |
-| test7.py:5:8:5:16 | ControlFlowNode for ImportExpr | mypkg |
 | test7.py:5:8:5:16 | ControlFlowNode for ImportExpr | mypkg.foo |
 | test7.py:5:8:5:16 | GSSA Variable mypkg | mypkg |
 | test7.py:9:6:9:10 | ControlFlowNode for ImportExpr | mypkg |

python/ql/test/experimental/dataflow/typetracking/import_as_attr_dotted.py

@@ -0,0 +1,9 @@
+import module.attr as attr_ref
+
+x = attr_ref
+
+def fun():
+    y = attr_ref
+
+# The following should _not_ be a reference to the above module, since we don't actually import it.
+z = module