Python points-to: Fix attribute lookup for packages.

markshannon · markshannon · commit 53f859117e16 · 2019-04-26T16:21:46.000+01:00
diff --git a/python/ql/src/semmle/python/types/ModuleObject.qll b/python/ql/src/semmle/python/types/ModuleObject.qll
@@ -6,7 +6,11 @@ private import semmle.python.types.ModuleKind
 abstract class ModuleObject extends Object {
 
     ModuleValue theModule() {
-        result.getSource() = this
+        result.(PythonModuleObjectInternal).getSourceModule() = this.getModule()
+        or
+        result.(PackageObjectInternal).getFolder() = this.(PackageObject).getPath()
+        or
+        result.(BuiltinModuleObjectInternal).getBuiltin() = this
     }
 
     /** Gets the scope corresponding to this module, if this is a Python module */
@@ -223,7 +227,7 @@ class PackageObject extends ModuleObject {
 
     override Object getAttribute(string name) {
         exists(Value val |
-            theModule().(PackageObjectInternal).attribute(name, _, _) and
+            theModule().(PackageObjectInternal).attribute(name, val, _) and
             result = val.getSource()
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,11 @@ private import semmle.python.types.ModuleKind`
`6`	`6`	`abstract class ModuleObject extends Object {`
`7`	`7`
`8`	`8`	`ModuleValue theModule() {`
`9`		`- result.getSource() = this`
	`9`	`+ result.(PythonModuleObjectInternal).getSourceModule() = this.getModule()`
	`10`	`+ or`
	`11`	`+ result.(PackageObjectInternal).getFolder() = this.(PackageObject).getPath()`
	`12`	`+ or`
	`13`	`+ result.(BuiltinModuleObjectInternal).getBuiltin() = this`
`10`	`14`	`}`
`11`	`15`
`12`	`16`	`/** Gets the scope corresponding to this module, if this is a Python module */`
`@@ -223,7 +227,7 @@ class PackageObject extends ModuleObject {`
`223`	`227`
`224`	`228`	`override Object getAttribute(string name) {`
`225`	`229`	`exists(Value val \|`
`226`		`- theModule().(PackageObjectInternal).attribute(name, _, _) and`
	`230`	`+ theModule().(PackageObjectInternal).attribute(name, val, _) and`
`227`	`231`	`result = val.getSource()`
`228`	`232`	`)`
`229`	`233`	`}`