@@ -315,18 +315,6 @@ def _constant_string(node: ast.expr, *, depth: int = 0) -> str | None:
315315 return None
316316
317317
318- def _dynamic_module_name (node : ast .expr , aliases : dict [str , str ]) -> str | None :
319- if not isinstance (node , ast .Call ) or not node .args :
320- return None
321- function = resolve_dotted_name (node .func )
322- if function is None :
323- return None
324- function = apply_import_aliases (function , aliases )
325- if function != "importlib.import_module" :
326- return None
327- return _constant_string (node .args [0 ])
328-
329-
330318@dataclass
331319class _ReflectiveScope :
332320 modules : dict [str , str ] = field (default_factory = dict )
@@ -363,8 +351,7 @@ def visit_ImportFrom(self, node: ast.ImportFrom) -> None:
363351class _ReflectiveSinkResolver (ast .NodeVisitor ):
364352 """Resolve reflective sink handles at each call site with lexical scoping."""
365353
366- def __init__ (self , aliases : dict [str , str ]) -> None :
367- self .aliases = aliases
354+ def __init__ (self ) -> None :
368355 self .scopes = [_ReflectiveScope ()]
369356 self .call_sinks : dict [ast .Call , str ] = {}
370357
@@ -379,7 +366,22 @@ def _lookup(self, kind: str, name: str) -> str | None:
379366 return values [name ]
380367 if name in scope .shadowed :
381368 return None
382- return self .aliases .get (name ) if kind == "module" else None
369+ return None
370+
371+ def _dynamic_module_name (self , node : ast .expr ) -> str | None :
372+ if not isinstance (node , ast .Call ) or not node .args :
373+ return None
374+ function = resolve_dotted_name (node .func )
375+ if function is None :
376+ return None
377+ root , separator , rest = function .partition ("." )
378+ resolved_root = self ._lookup ("module" , root )
379+ if resolved_root is None :
380+ return None
381+ function = f"{ resolved_root } .{ rest } " if separator else resolved_root
382+ if function != "importlib.import_module" :
383+ return None
384+ return _constant_string (node .args [0 ])
383385
384386 @staticmethod
385387 def _target_names (targets : list [ast .expr ]) -> list [str ]:
@@ -402,7 +404,7 @@ def _shadow_names(self, names: list[str]) -> None:
402404 def _bind (self , targets : list [ast .expr ], value : ast .expr ) -> None :
403405 names = self ._target_names (targets )
404406 self ._shadow_names (names )
405- module = _dynamic_module_name (value , self . aliases )
407+ module = self . _dynamic_module_name (value )
406408 if module is not None :
407409 for name in names :
408410 self .scope .modules [name ] = module
@@ -416,7 +418,7 @@ def _bind(self, targets: list[ast.expr], value: ast.expr) -> None:
416418 base = value .args [0 ]
417419 module = self ._lookup ("module" , base .id ) if isinstance (base , ast .Name ) else None
418420 if module is None :
419- module = _dynamic_module_name (base , self . aliases )
421+ module = self . _dynamic_module_name (base )
420422 attribute = _constant_string (value .args [1 ])
421423 if module is None or attribute is None :
422424 return
@@ -436,6 +438,23 @@ def visit_AnnAssign(self, node: ast.AnnAssign) -> None:
436438 else :
437439 self ._bind ([node .target ], node .annotation )
438440
441+ def visit_Import (self , node : ast .Import ) -> None :
442+ for imported in node .names :
443+ local_name = imported .asname or imported .name .partition ("." )[0 ]
444+ canonical = imported .name if imported .asname else local_name
445+ self ._shadow_names ([local_name ])
446+ self .scope .modules [local_name ] = canonical
447+
448+ def visit_ImportFrom (self , node : ast .ImportFrom ) -> None :
449+ if node .module is None :
450+ return
451+ for imported in node .names :
452+ if imported .name == "*" :
453+ continue
454+ local_name = imported .asname or imported .name
455+ self ._shadow_names ([local_name ])
456+ self .scope .modules [local_name ] = f"{ node .module } .{ imported .name } "
457+
439458 def visit_Call (self , node : ast .Call ) -> None :
440459 if isinstance (node .func , ast .Name ):
441460 sink = self ._lookup ("callable" , node .func .id )
@@ -483,10 +502,8 @@ def visit_ClassDef(self, node: ast.ClassDef) -> None:
483502 self ._shadow_names ([node .name ])
484503
485504
486- def _build_reflective_sink_aliases (
487- tree : ast .Module , aliases : dict [str , str ]
488- ) -> dict [ast .Call , str ]:
489- resolver = _ReflectiveSinkResolver (aliases )
505+ def _build_reflective_sink_aliases (tree : ast .Module ) -> dict [ast .Call , str ]:
506+ resolver = _ReflectiveSinkResolver ()
490507 resolver .visit (tree )
491508 return resolver .call_sinks
492509
@@ -671,7 +688,7 @@ def _analyze_python(
671688
672689 aliases = python_ast .import_aliases
673690 type_map = build_type_map (tree , aliases )
674- reflective_sinks = _build_reflective_sink_aliases (tree , aliases )
691+ reflective_sinks = _build_reflective_sink_aliases (tree )
675692 lines = python_ast .lines
676693 findings : list [AnalyzerFinding ] = []
677694 tainted : dict [str , _TaintedVar ] = {}
0 commit comments