dynamic: fix tests

mandiant · Oct 17, 2023 · 5475020 · 5475020
1 parent 7205bc2
commit 5475020
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/capa/features/freeze/__init__.py b/capa/features/freeze/__init__.py
@@ -658,7 +658,6 @@ def main(argv=None):
     parser.add_argument("output", type=str, help="Path to output file")
     args = parser.parse_args(args=argv)
     capa.main.handle_common_args(args)
-    capa.main.handle_signatures_arg(args)
 
     sigpaths = capa.main.get_signatures(args.signatures)
 

diff --git a/capa/main.py b/capa/main.py
@@ -80,7 +80,6 @@
     FORMAT_DOTNET,
     FORMAT_FREEZE,
     FORMAT_RESULT,
-    DYNAMIC_FORMATS,
 )
 from capa.features.address import NO_ADDRESS, Address
 from capa.features.extractors.base_extractor import (
@@ -1360,8 +1359,6 @@ def handle_common_args(args):
 
         args.rules = rules_paths
 
-
-def handle_signatures_arg(args):
     if hasattr(args, "signatures"):
         if args.signatures == SIGNATURES_PATH_DEFAULT_STRING:
             logger.debug("-" * 80)
@@ -1556,9 +1553,6 @@ def main(argv: Optional[List[str]] = None):
             # and use those for extracting.
 
             try:
-                if format_ not in DYNAMIC_FORMATS:
-                    # signatures are loaded only for static anaylsis
-                    handle_signatures_arg(args)
                 if format_ == FORMAT_PE:
                     sig_paths = get_signatures(args.signatures)
                 else:

diff --git a/capa/render/vverbose.py b/capa/render/vverbose.py
@@ -379,13 +379,13 @@ def render_rules(ostream, doc: rd.ResultDocument):
                 ostream.write(" @ ")
                 ostream.write(capa.render.verbose.format_address(location))
 
-                if capa.rules.Scope.BASIC_BLOCK in rule.meta.scopes:
+                if doc.meta.flavor == rd.Flavor.STATIC and rule.meta.scopes.static == capa.rules.Scope.BASIC_BLOCK:
                     ostream.write(
                         " in function "
                         + capa.render.verbose.format_address(frz.Address.from_capa(functions_by_bb[location.to_capa()]))
                     )
 
-                if capa.rules.Scope.THREAD in rule.meta.scopes:
+                if doc.meta.flavor == rd.Flavor.DYNAMIC and rule.meta.scopes.dynamic == capa.rules.Scope.THREAD:
                     ostream.write(
                         " in process "
                         + capa.render.verbose.format_address(