From 932066bc0ed73151cd2995127d2969d4f42fa5d5 Mon Sep 17 00:00:00 2001
From: Capa Bot <capa-dev@mandiant.com>
Date: Fri, 19 May 2023 08:22:32 +0000
Subject: [PATCH 1/2] Sync capa rules submodule

---
 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules b/rules
index 312d4cad..cc41fac5 160000
--- a/rules
+++ b/rules
@@ -1 +1 @@
-Subproject commit 312d4cad891498e1d360dffcc98f669b63869c94
+Subproject commit cc41fac571e6e022716b4d76e92e906bdd8ed178

From 456d4272abb35e8e5c6fc392037411cce2efeb1a Mon Sep 17 00:00:00 2001
From: Aayush Goel <81844215+Aayush-Goel-04@users.noreply.github.com>
Date: Thu, 25 May 2023 12:40:51 +0530
Subject: [PATCH 2/2] Add logging redirect to capa main

---
 CHANGELOG.md |  2 +-
 capa/main.py | 60 ++++++++++++++++++++++++++++------------------------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d078c5b0..22575f72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@
 - improve ELF strtab and needed parsing @mr-tz
 - better handle exceptional cases when parsing ELF files [#1458](https://github.com/mandiant/capa/issues/1458) [@Aayush-Goel-04](https://github.com/aayush-goel-04)
 - Improved testing coverage for Binary Ninja Backend [#1446](https://github.com/mandiant/capa/issues/1446) [@Aayush-Goel-04](https://github.com/aayush-goel-04)
-- Add redirect print to tqdm for capa main [#749](https://github.com/mandiant/capa/issues/749) [@Aayush-Goel-04](https://github.com/aayush-goel-04)
+- Add logging and print redirect to tqdm for capa main [#749](https://github.com/mandiant/capa/issues/749) [@Aayush-Goel-04](https://github.com/aayush-goel-04)
 - extractor: fix binja installation path detection does not work with Python 3.11
 
 ### capa explorer IDA Pro plugin
diff --git a/capa/main.py b/capa/main.py
index fc71a89c..b305673c 100644
--- a/capa/main.py
+++ b/capa/main.py
@@ -25,6 +25,7 @@ from typing import Any, Dict, List, Tuple, Callable
 import halo
 import tqdm
 import colorama
+import tqdm.contrib.logging
 from pefile import PEFormatError
 from elftools.common.exceptions import ELFError
 
@@ -253,38 +254,41 @@ def find_capabilities(ruleset: RuleSet, extractor: FeatureExtractor, disable_pro
     }  # type: Dict[str, Any]
 
     with redirecting_print_to_tqdm(disable_progress):
-        pbar = tqdm.tqdm
-        if disable_progress:
-            # do not use tqdm to avoid unnecessary side effects when caller intends
-            # to disable progress completely
-            def pbar(s, *args, **kwargs):
-                return s
+        with tqdm.contrib.logging.logging_redirect_tqdm():
+            pbar = tqdm.tqdm
+            if disable_progress:
+                # do not use tqdm to avoid unnecessary side effects when caller intends
+                # to disable progress completely
+                def pbar(s, *args, **kwargs):
+                    return s
 
-        functions = list(extractor.get_functions())
-        n_funcs = len(functions)
+            functions = list(extractor.get_functions())
+            n_funcs = len(functions)
 
-        pb = pbar(functions, desc="matching", unit=" functions", postfix="skipped 0 library functions")
-        for f in pb:
-            if extractor.is_library_function(f.address):
-                function_name = extractor.get_function_name(f.address)
-                logger.debug("skipping library function 0x%x (%s)", f.address, function_name)
-                meta["library_functions"][f.address] = function_name
-                n_libs = len(meta["library_functions"])
-                percentage = round(100 * (n_libs / n_funcs))
-                if isinstance(pb, tqdm.tqdm):
-                    pb.set_postfix_str(f"skipped {n_libs} library functions ({percentage}%)")
-                continue
+            pb = pbar(functions, desc="matching", unit=" functions", postfix="skipped 0 library functions")
+            for f in pb:
+                if extractor.is_library_function(f.address):
+                    function_name = extractor.get_function_name(f.address)
+                    logger.debug("skipping library function 0x%x (%s)", f.address, function_name)
+                    meta["library_functions"][f.address] = function_name
+                    n_libs = len(meta["library_functions"])
+                    percentage = round(100 * (n_libs / n_funcs))
+                    if isinstance(pb, tqdm.tqdm):
+                        pb.set_postfix_str(f"skipped {n_libs} library functions ({percentage}%)")
+                    continue
 
-            function_matches, bb_matches, insn_matches, feature_count = find_code_capabilities(ruleset, extractor, f)
-            meta["feature_counts"]["functions"][f.address] = feature_count
-            logger.debug("analyzed function 0x%x and extracted %d features", f.address, feature_count)
+                function_matches, bb_matches, insn_matches, feature_count = find_code_capabilities(
+                    ruleset, extractor, f
+                )
+                meta["feature_counts"]["functions"][f.address] = feature_count
+                logger.debug("analyzed function 0x%x and extracted %d features", f.address, feature_count)
 
-            for rule_name, res in function_matches.items():
-                all_function_matches[rule_name].extend(res)
-            for rule_name, res in bb_matches.items():
-                all_bb_matches[rule_name].extend(res)
-            for rule_name, res in insn_matches.items():
-                all_insn_matches[rule_name].extend(res)
+                for rule_name, res in function_matches.items():
+                    all_function_matches[rule_name].extend(res)
+                for rule_name, res in bb_matches.items():
+                    all_bb_matches[rule_name].extend(res)
+                for rule_name, res in insn_matches.items():
+                    all_insn_matches[rule_name].extend(res)
 
     # collection of features that captures the rule matches within function, BB, and instruction scopes.
     # mapping from feature (matched rule) to set of addresses at which it matched.