Python: improve handling of __all__

markshannon · markshannon · commit 48c0cbe51a6c · 2019-04-26T16:21:47.000+01:00
diff --git a/python/ql/src/semmle/python/objects/Modules.qll b/python/ql/src/semmle/python/objects/Modules.qll
@@ -47,6 +47,10 @@ abstract class ModuleObjectInternal extends ObjectInternal {
 
     override predicate subscriptUnknown() { any() }
 
+    predicate isInitModule() {
+        any(PackageObjectInternal package).getInitModule() = this
+    }
+
 }
 
 class BuiltinModuleObjectInternal extends ModuleObjectInternal, TBuiltinModuleObject {
diff --git a/python/ql/src/semmle/python/objects/ObjectAPI.qll b/python/ql/src/semmle/python/objects/ObjectAPI.qll
@@ -65,7 +65,10 @@ class ModuleValue extends Value {
     }
 
     predicate exports(string name) {
-        not this.(ModuleObjectInternal).attribute("__all__", _, _) and this.(ModuleObjectInternal).attribute(name, _, _)
+        not this.(ModuleObjectInternal).attribute("__all__", _, _) and exists(this.attr(name))
+        and not name.charAt(0) = "_"
+        or
+        py_exports(this.getScope(), name)
     }
 
     string getName() {
diff --git a/python/ql/test/3/library-tests/modules/package_members/module_exports.expected b/python/ql/test/3/library-tests/modules/package_members/module_exports.expected
@@ -8,6 +8,7 @@
 | Module test_package | module2 |
 | Module test_package | module3 |
 | Module test_package | module4 |
+| Module test_package | module5 |
 | Module test_package | p |
 | Module test_package | q |
 | Module test_package | r |
@@ -36,6 +37,7 @@
 | Module test_star | module2 |
 | Module test_star | module3 |
 | Module test_star | module4 |
+| Module test_star | module5 |
 | Module test_star | p |
 | Module test_star | q |
 | Module test_star | r |

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ abstract class ModuleObjectInternal extends ObjectInternal {`
`47`	`47`
`48`	`48`	`override predicate subscriptUnknown() { any() }`
`49`	`49`
	`50`	`+ predicate isInitModule() {`
	`51`	`+ any(PackageObjectInternal package).getInitModule() = this`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`class BuiltinModuleObjectInternal extends ModuleObjectInternal, TBuiltinModuleObject {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ class ModuleValue extends Value {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`predicate exports(string name) {`
`68`		`- not this.(ModuleObjectInternal).attribute("__all__", _, _) and this.(ModuleObjectInternal).attribute(name, _, _)`
	`68`	`+ not this.(ModuleObjectInternal).attribute("__all__", _, _) and exists(this.attr(name))`
	`69`	`+ and not name.charAt(0) = "_"`
	`70`	`+ or`
	`71`	`+ py_exports(this.getScope(), name)`
`69`	`72`	`}`
`70`	`73`
`71`	`74`	`string getName() {`