Skip to content

Python: fix nested import stars #1489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2019
Merged

Python: fix nested import stars #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a917019
Python: Add failing tests for undefined variable as value and nested …
markshannon Jun 24, 2019
9bf67e1
Python points-to: Fix up some oddities with nested from ... import *.
markshannon Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions python/ql/src/semmle/python/objects/Modules.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,8 @@ class PackageObjectInternal extends ModuleObjectInternal, TPackageObject {
or
exists(Module init |
init = this.getSourceModule() and
(
/* There is no variable shadowing the name of the child module */
not exists(EssaVariable var | var.getAUse() = init.getANormalExit() and var.getSourceVariable().getName() = name)
or
/* The variable shadowing the name of the child module is undefined at exit */
ModuleAttributes::pointsToAtExit(init, name, ObjectInternal::undefined(), _)
) and
/* The variable shadowing the name of the child module is undefined at exit */
ModuleAttributes::pointsToAtExit(init, name, ObjectInternal::undefined(), _) and
not name = "__init__" and
value = this.submodule(name) and
origin = CfgOrigin::fromObject(value)
Expand Down Expand Up @@ -249,6 +244,7 @@ class PythonModuleObjectInternal extends ModuleObjectInternal, TPythonModule {
}

pragma [noinline] override predicate attribute(string name, ObjectInternal value, CfgOrigin origin) {
value != ObjectInternal::undefined() and
ModuleAttributes::pointsToAtExit(this.getSourceModule(), name, value, origin)
}

Expand Down
4 changes: 4 additions & 0 deletions python/ql/test/library-tests/PointsTo/import_star/Values.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| nested/__init__.py:1:6:1:12 | ControlFlowNode for ImportExpr | import | nested/nested.py:0:0:0:0 | Module nested.nested |
| nested/nested.py:1:1:1:13 | ControlFlowNode for FunctionExpr | import | nested/nested.py:1:1:1:13 | Function nested |
| test.py:1:6:1:11 | ControlFlowNode for ImportExpr | import | file://:0:0:0:0 | Package nested |
| test.py:2:1:2:6 | ControlFlowNode for nested | import | nested/nested.py:1:1:1:13 | Function nested |
7 changes: 7 additions & 0 deletions python/ql/test/library-tests/PointsTo/import_star/Values.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

import python

from ControlFlowNode f, Context ctx, Value v, ControlFlowNode origin
where
f.pointsTo(ctx, v, origin)
select f, ctx, v
1 change: 1 addition & 0 deletions python/ql/test/library-tests/PointsTo/import_star/nested/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .nested import *
2 changes: 2 additions & 0 deletions python/ql/test/library-tests/PointsTo/import_star/nested/nested.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
def nested():
pass
2 changes: 2 additions & 0 deletions python/ql/test/library-tests/PointsTo/import_star/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from nested import *
nested
12 changes: 11 additions & 1 deletion python/ql/test/library-tests/PointsTo/new/Sanity.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,17 @@ predicate ssa_sanity(string clsname, string problem, string what) {
)
}

predicate undefined_sanity(string clsname, string problem, string what) {
/* Variables may be undefined, but values cannot be */
exists(ControlFlowNode f |
PointsToInternal::pointsTo(f, _, ObjectInternal::undefined(), _) and
clsname = f.getAQlClass() and not clsname = "AnyNode" and
problem = " points-to an undefined variable" and
what = f.toString()
)
}

from string clsname, string problem, string what
where ssa_sanity(clsname, problem, what)
where ssa_sanity(clsname, problem, what) or undefined_sanity(clsname, problem, what)
select clsname, what, problem