yaralyzer 0.9.2__py3-none-any.whl → 0.9.4__py3-none-any.whl

.yaralyzer.example

@@ -12,7 +12,7 @@
 # Expand the width of the output to the fit the display window (same as the --maximize-width options)
 #    YARALYZER_MAXIMIZE_WIDTH=True
 
-# Passed through to yara.set_config as the stack_size and
+# Passed through to yara.set_config() as the stack_size and max_match_data arguments
 #    YARALYZER_STACK_SIZE=10485760
 #    YARALYZER_MAX_MATCH_LENGTH=10737418240
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # NEXT RELEASE
 
+### 0.9.4
+* Bump `yara-python` to 4.3.0+ and deal with backwards incompatibility
+
+### 0.9.3
+* Lock `yara-python` at 4.2.3 bc 4.3.x causes problems
+
 ### 0.9.2
 * Fix PyPi screenshots
 * Raise better error message if yara rules file doesn't exist

yaralyzer/bytes_match.py

@@ -10,6 +10,7 @@ from typing import Iterator, Optional
 
 from rich.table import Table
 from rich.text import Text
+from yara import StringMatch, StringMatchInstance
 
 from yaralyzer.config import YaralyzerConfig
 from yaralyzer.helpers.rich_text_helper import prefix_with_plain_text_obj
@@ -41,10 +42,10 @@ class BytesMatch:
         self.label: str = label
         self.ordinal: int = ordinal
         self.match: Optional[re.Match] = match
-        # Maybe should be called "matched_bytes"
-        self.bytes = matched_against[start_idx:self.end_idx]
+        self.bytes = matched_against[start_idx:self.end_idx]  # TODO: Maybe should be called "matched_bytes"
         self.match_groups: Optional[tuple] = match.groups() if match else None
         self._find_surrounding_bytes()
+
         # Adjust the highlighting start point in case this match is very early in the stream
         self.highlight_start_idx = start_idx - self.surrounding_start_idx
         self.highlight_end_idx = self.highlight_start_idx + self.length
@@ -65,14 +66,15 @@ class BytesMatch:
             cls,
             matched_against: bytes,
             rule_name: str,
-            yara_str: dict,
+            yara_str_match: StringMatch,
+            yara_str_match_instance: StringMatchInstance,
             ordinal: int,
             highlight_style: str = YaralyzerConfig.HIGHLIGHT_STYLE
         ) -> 'BytesMatch':
-        """Build a BytesMatch from a yara string match. matched_against is the set of bytes yara was run against"""
-        # Don't duplicate the labeling if rule_name and yara_str are the same
-        pattern_label = yara_str[1]
+        """Build a BytesMatch from a yara string match. 'matched_against' is the set of bytes yara was run against."""
+        pattern_label = yara_str_match.identifier
 
+        # Don't duplicate the labeling if rule_name and yara_str are the same
         if pattern_label == '$' + rule_name:
             label = pattern_label
         else:
@@ -80,8 +82,8 @@ class BytesMatch:
 
         return cls(
             matched_against=matched_against,
-            start_idx=yara_str[0],
-            length=len(yara_str[2]),
+            start_idx=yara_str_match_instance.offset,
+            length=yara_str_match_instance.matched_length,
             label=label,
             ordinal=ordinal,
             highlight_style=highlight_style)
@@ -94,8 +96,20 @@ class BytesMatch:
             highlight_style: str = YaralyzerConfig.HIGHLIGHT_STYLE
         ) -> Iterator['BytesMatch']:
         """Iterator w/a BytesMatch for each string returned as part of a YARA match result dict."""
-        for i, yara_str in enumerate(yara_match['strings']):
-            yield(cls.from_yara_str(matched_against, yara_match['rule'], yara_str, i + 1, highlight_style))
+        i = 0  # For numbered labeling
+
+        # yara-python's internals changed with 4.3.0: https://github.com/VirusTotal/yara-python/releases/tag/v4.3.0
+        for yara_str_match in yara_match['strings']:
+            for yara_str_match_instance in yara_str_match.instances:
+                i += 1
+
+                yield(cls.from_yara_str(
+                    matched_against,
+                    yara_match['rule'],
+                    yara_str_match,
+                    yara_str_match_instance,
+                    i,
+                    highlight_style))
 
     def style_at_position(self, idx) -> str:
         """Get the style for the byte at position idx within the matched bytes"""

yaralyzer/config.py

@@ -13,10 +13,9 @@ MEGABYTE = 1024 * KILOBYTE
 
 def config_var_name(env_var: str) -> str:
     """
-    Get the name of env_var and strip off 'YARALYZER_':
-
-    SURROUNDING_BYTES_ENV_VAR = 'YARALYZER_SURROUNDING_BYTES'
-    config_var_name(SURROUNDING_BYTES_ENV_VAR) => 'SURROUNDING_BYTES'
+    Get the name of env_var and strip off 'YARALYZER_', e.g.:
+        SURROUNDING_BYTES_ENV_VAR = 'YARALYZER_SURROUNDING_BYTES'
+        config_var_name(SURROUNDING_BYTES_ENV_VAR) => 'SURROUNDING_BYTES'
     """
     env_var = env_var.removeprefix("YARALYZER_")
     return f'{env_var=}'.partition('=')[0]
@@ -71,7 +70,7 @@ class YaralyzerConfig:
     ]
 
     @classmethod
-    def set_argument_parser(cls, parser):
+    def set_argument_parser(cls, parser: ArgumentParser) -> None:
         cls._argument_parser: ArgumentParser = parser
         cls._argparse_keys: List[str] = sorted([action.dest for action in parser._actions])
 
@@ -93,7 +92,7 @@ class YaralyzerConfig:
             if isinstance(arg_value, bool):
                 setattr(args, option, arg_value or is_env_var_set_and_not_false(env_var))
             elif isinstance(arg_value, (int, float)):
-                # Check against defaults to avoid overriding env var configured optoins
+                # Check against defaults to avoid overriding env var configured options
                 if arg_value == default_value and env_value is not None:
                     setattr(args, option, int(env_value) or arg_value)  # TODO: float args not handled
             else:

yaralyzer/helpers/string_helper.py

@@ -1,6 +1,9 @@
 from functools import partial
 from typing import Any, Callable, List
 
+INDENT_DEPTH = 4
+INDENT_SPACES = INDENT_DEPTH * ' '
+
 
 def escape_yara_pattern(pattern: str) -> str:
     return pattern.replace('/', '\\/')

yaralyzer/util/argument_parser.py

@@ -161,7 +161,7 @@ export = parser.add_argument_group(
     'FILE EXPORT',
     "Multiselect. Choosing nothing is choosing nothing. Sends what you see on the screen to various file " + \
         "formats in parallel. Writes files to the current directory if --output-dir is not provided. " + \
-        "Filenames are expansion of the scanned filename though you can use --file-prefix to make your " +
+        "Filenames are expansions of the scanned filename though you can use --file-prefix to make your " +
         "filenames more unique and beautiful to their beholder.")
 
 export.add_argument('-svg', '--export-svg',

yaralyzer/yara/yara_match.py

@@ -8,12 +8,13 @@ Rich text decorator for YARA match dicts, which look like this:
     'rule': 'my_rule',
     'meta': {},
     'strings': [
-        (81L, '$a', 'abc'),
-        (141L, '$b', 'def')
+        StringMatch1,
+        StringMatch2
     ]
 }
 """
 import re
+from copy import deepcopy
 from numbers import Number
 from typing import Any, Dict
 
@@ -21,9 +22,11 @@ from rich.console import Console, ConsoleOptions, RenderResult
 from rich.padding import Padding
 from rich.panel import Panel
 from rich.text import Text
+from yara import StringMatch
 
 from yaralyzer.helpers.bytes_helper import clean_byte_string
 from yaralyzer.helpers.rich_text_helper import CENTER
+from yaralyzer.helpers.string_helper import INDENT_SPACES
 from yaralyzer.output.rich_console import console_width, theme_colors_with_prefix
 from yaralyzer.util.logging import log
 
@@ -56,16 +59,16 @@ class YaraMatch:
 
     def __rich_console__(self, _console: Console, options: ConsoleOptions) -> RenderResult:
         """Renders a panel showing the color highlighted raw YARA match info."""
-        yield(Text("\n"))
+        yield Text("\n")
         yield Padding(Panel(self.label, expand=False, style=f"on color(251) reverse"), MATCH_PADDING)
-        yield(RAW_YARA_THEME_TXT)
+        yield RAW_YARA_THEME_TXT
         yield Padding(Panel(_rich_yara_match(self.match)), MATCH_PADDING)
 
 
 def _rich_yara_match(element: Any, depth: int = 0) -> Text:
-    """Mildly painful/hacky way of coloring a yara result hash."""
-    indent = Text((depth + 1) * 4 * ' ')
-    end_indent = Text(depth * 4 * ' ')
+    """Painful/hacky way of recursively coloring a yara result hash."""
+    indent = Text((depth + 1) * INDENT_SPACES)
+    end_indent = Text(depth * INDENT_SPACES)
 
     if isinstance(element, str):
         txt = _yara_string(element)
@@ -79,6 +82,17 @@ def _rich_yara_match(element: Any, depth: int = 0) -> Text:
         if len(element) == 0:
             txt = Text('[]', style='white')
         else:
+            if isinstance(element[0], StringMatch):
+                # In yara-python 4.3.0 the StringMatch type was introduced so we just make it look like
+                # the old list of tuples format (see: https://github.com/VirusTotal/yara-python/releases/tag/v4.3.0)
+                match_tuples = [
+                    (match.identifier, match_instance.offset, match_instance.matched_data)
+                    for match in element
+                    for match_instance in match.instances
+                ]
+
+                return _rich_yara_match(match_tuples, depth)
+
             total_length = sum([len(str(e)) for e in element]) + ((len(element) - 1) * 2) + len(indent) + 2
             elements_txt = [_rich_yara_match(e, depth + 1) for e in element]
             list_txt = Text('[', style='white')

yaralyzer/yaralyzer.py

@@ -30,6 +30,7 @@ from yaralyzer.yara.yara_match import YaraMatch
 from yaralyzer.yara.yara_rule_builder import yara_rule_string
 
 YARA_EXT = 'yara'
+YARA_FILE_DOES_NOT_EXIST_ERROR_MSG = "is not a valid yara rules file (it doesn't exist)"
 
 
 # TODO: might be worth introducing a Scannable namedtuple or similar
@@ -93,7 +94,7 @@ class Yaralyzer:
 
         for file in yara_rules_files:
             if not path.exists(file):
-                raise ValueError(f"'{file}' is not a valid yara rules file (it doesn't exist)")
+                raise ValueError(f"'{file}' {YARA_FILE_DOES_NOT_EXIST_ERROR_MSG}")
 
         filepaths_arg = {path.basename(file): file for file in yara_rules_files}
         yara_rules = yara.compile(filepaths=filepaths_arg)

{yaralyzer-0.9.2.dist-info → yaralyzer-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yaralyzer
-Version: 0.9.2
+Version: 0.9.4
 Summary: Visualize and force decode YARA and regex matches found in a file or byte stream. With colors. Lots of colors.
 Home-page: https://github.com/michelcrypt4d4mus/yaralyzer
 License: GPL-3.0-or-later
@@ -19,14 +19,14 @@ Requires-Dist: chardet (>=5.0.0,<6.0.0)
 Requires-Dist: python-dotenv (>=0.21.0,<0.22.0)
 Requires-Dist: rich (>=12.5.1,<13.0.0)
 Requires-Dist: rich-argparse-plus (>=0.3.1,<0.4.0)
-Requires-Dist: yara-python (>=4.2.3,<5.0.0)
+Requires-Dist: yara-python (>=4.3.0,<5.0.0)
 Project-URL: Documentation, https://github.com/michelcrypt4d4mus/yaralyzer
 Project-URL: Repository, https://github.com/michelcrypt4d4mus/yaralyzer
 Description-Content-Type: text/markdown
 
 <!-- ![Tests](https://img.shields.io/github/workflow/status/michelcrypt4d4mus/yaralyzer/tests?label=tests) -->
 ![Python Version](https://img.shields.io/pypi/pyversions/yaralyzer)
-![Release](https://img.shields.io/github/v/release/michelcrypt4d4mus/yaralyzer?sort=semver)
+![Release](https://img.shields.io/pypi/v/yaralyzer)
 ![Downloads](https://img.shields.io/pypi/dm/yaralyzer)
 
 # THE YARALYZER
@@ -52,8 +52,8 @@ yaralyze --hex-pattern 'd0 93 d0 a3 d0 [-] 9b d0 90 d0 93' one_day_in_the_life_o
 #### What It Do
 1. **See the actual bytes your YARA rules are matching.** No more digging around copy/pasting the start positions reported by YARA into your favorite hex editor. Displays both the bytes matched by YARA as well as a configurable number of bytes before and after each match in hexadecimal and "raw" python string representation.
 1. **Do the same for byte patterns and regular expressions without writing a YARA file.** If you're too lazy to write a YARA file but are trying to determine, say, whether there's a regular expression hidden somewhere in the file you could scan for the pattern `'/.+/'` and immediately get a window into all the bytes in the file that live between front slashes. Same story for quotes, BOMs, etc. Any regex YARA can handle is supported so the sky is the limit.
-1. **Detect the possible encodings of each set of matched bytes.** [The `chardet` library](https://github.com/chardet/chardet) is a sophisticated library for guessing character encodings and it is leveraged here.
-1. **Display the result of forcing various character encodings upon the matched areas.** Several default character encodings will be _forcibly_ attempted in the region around the match. [`chardet`](https://github.com/chardet/chardet) will also be leveraged to see if the bytes fit the pattern of _any_ known encoding. If `chardet` is confident enough (configurable), an attempt at decoding the bytes using that encoding will be displayed.
+1. **Detect the possible encodings of each set of matched bytes.** [`chardet`](https://github.com/chardet/chardet) is a sophisticated library for guessing character encodings and it is leveraged here.
+1. **Display the result of forcing various character encodings upon the matched areas.** Several default character encodings will be _forcibly_ attempted in the region around the match. [`chardet`](https://github.com/chardet/chardet) will also be leveraged to see if the bytes fit the pattern of _any_ known encoding. If `chardet` is confident enough (configurable) an attempt at decoding the bytes using that encoding will be displayed.
 1. **Export the matched regions/decodings to SVG, HTML, and colored text files.** Show off your ASCII art.
 
 #### Why It Do
@@ -87,7 +87,7 @@ Run `yaralyze -h` to see the command line options (screenshot below).
 For info on exporting SVG images, HTML, etc., see [Example Output](#example-output).
 
 ### Configuration
-If you place a filed called `.yaralyzer` in your home directory or the current working directory then environment variables specified in that `.yaralyzer` file will be added to the environment each time yaralyzer is invoked. This provides a mechanism for permanently configuring various command line options so you can avoid typing them over and over. See the example file [`.yaralyzer.example`](.yaralyzer.example) to see which options can be configured this way.
+If you place a file called `.yaralyzer` in your home directory or the current working directory then environment variables specified in that `.yaralyzer` file will be added to the environment each time yaralyzer is invoked. This provides a mechanism for permanently configuring various command line options so you can avoid typing them over and over. See the example file [`.yaralyzer.example`](.yaralyzer.example) to see which options can be configured this way.
 
 Only one `.yaralyzer` file will be loaded and the working directory's `.yaralyzer` takes precedence over the home directory's `.yaralyzer`.
 
@@ -131,6 +131,7 @@ The Yaralyzer can export visualizations to HTML, ANSI colored text, and SVG vect
 
 
 # TODO
+* For some reason when displaying matches the output to a file iterates over all matches in a different way than just running in the console. Presumably this is related to the `rich` rendering engine in some way. For now the console output is the "more correct" one so it's generally OK. See [`issue_with_output_to_console_correct`](doc/rendered_images/issue_with_output_to_console_correct.png) vs. [`doc/rendered_images/issue_with_output_to_txt_file_incorrect.png`](doc/rendered_images/issue_with_output_to_txt_file_incorrect.png)
 * highlight decodes done at `chardet`s behest
 * deal with repetitive matches
 

{yaralyzer-0.9.2.dist-info → yaralyzer-0.9.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-.yaralyzer.example,sha256=Bp38fkp3rQ1_iFTkH51vlMQEGHE3x66rzwHQGCr-TS0,3610
-CHANGELOG.md,sha256=T7FVyoCGfRJNTpSOBY_X80jvt_OygiNVo3Bly5nyHCc,1776
+.yaralyzer.example,sha256=004RNeAXrI_fAvBSomfI4eI4cs6zooXy_YdmkYRMRks,3637
+CHANGELOG.md,sha256=4laMKKz_0uJCSO2RoZSUkdHxqqiJFGw0HmkMZHMVXtA,1924
 yaralyzer/__init__.py,sha256=sU2sN1lizcfxUg4vghz_L3OUwi7sWXGvNinE_tJCa4Y,2616
-yaralyzer/bytes_match.py,sha256=HaFxaSqtzvBUFXwXxuBATxPM_krG7WY1oEMFXwE5KrY,7011
-yaralyzer/config.py,sha256=ucKA1F4NqiSUBRDbINYjm0QqbXJjLmELKdpgmyajghs,3693
+yaralyzer/bytes_match.py,sha256=6QeW1Zk9DpNQ9ks-ixnQZ-clqT8qwB2FKsmH3nmxcYI,7583
+yaralyzer/config.py,sha256=eRJ88wBFs1rfjOv4htI1Ye0LFCFfk4kGDiFHuqZfkX0,3730
 yaralyzer/decoding/bytes_decoder.py,sha256=lulfZZhYmo9ky2KpqBW-c9hs5_uhlaz0gatdtT_NYSY,7951
 yaralyzer/decoding/decoding_attempt.py,sha256=GAxMNOX7I_FsuzGWIelTWAECytLUJD-wpmUAuVe2bn0,7241
 yaralyzer/encoding_detection/character_encodings.py,sha256=zrOUgNXwrcXkeYSgdo09vsFPmNYsTkaHvq7YzzpbMsk,4395
@@ -12,19 +12,19 @@ yaralyzer/helpers/bytes_helper.py,sha256=nq2FOUVfZNO2XYAzFQ364cZ8mw70hxP9fyncQwU
 yaralyzer/helpers/dict_helper.py,sha256=h8Sg01qCJRKfZ0bmTYhLP6X5OVxMg-7CZryJIjcbw8E,211
 yaralyzer/helpers/file_helper.py,sha256=ytPOE_Zel2fk7g39eCTTHG1W3SYgkEpro9tNrd2TDxU,1196
 yaralyzer/helpers/rich_text_helper.py,sha256=9Wc6WM625iKxAXRvxBkVzvszfcxb8YtqoQ6d7d8EqoQ,4218
-yaralyzer/helpers/string_helper.py,sha256=0dzHuHQJhhHH7t2pTlDF71_xJpK4TdtFV8LeQDny0j0,834
+yaralyzer/helpers/string_helper.py,sha256=UEMi1fnoURZHmzE-Sgbe5ndUPRHgHiH-opeJ6Z-n48k,887
 yaralyzer/output/decoding_attempts_table.py,sha256=cMY9eCXZHj0FfGxJ9uoM5cpdhQve-EtTRHv3fTHKJAo,3712
 yaralyzer/output/file_export.py,sha256=B8sS64J_pUTxBj5Souc12eStFa9ihRFnYGdJ1j8xz9g,2270
 yaralyzer/output/file_hashes_table.py,sha256=v_GH5dIZwUJurHfEk-Fs3FlTXL68CLSPm1xqWGiCeNY,1608
 yaralyzer/output/regex_match_metrics.py,sha256=deJPaVnhpy-AUX6PCE_jbPLIlmfIOtl-cEVWsiFp3KY,3003
 yaralyzer/output/rich_console.py,sha256=LpHBhiJ3I20x_QIi6Ipaa8q2WWONMv_Jbs3rhgsT_mc,3682
-yaralyzer/util/argument_parser.py,sha256=88lBcM98wP2DLAKq31QwSUsQhGZlThjxK9KbXike_Bc,12551
+yaralyzer/util/argument_parser.py,sha256=Ka57PMyuLZj2umgBSJd435DsVmPzgRAWUlRuaHhoTWM,12552
 yaralyzer/util/logging.py,sha256=3qtLnCFbN8L1nTSwIQvxfcM5jfhIRWTFZj9XGQk74kc,4326
-yaralyzer/yara/yara_match.py,sha256=ql3myrpr7uiUH93ZdUKdLOK3oxGmY2_hJyTVxw01hDk,4453
+yaralyzer/yara/yara_match.py,sha256=qR8GNnmHiN-SzNwkWYcJa1Kb6RQUeNtcjpjccoI8wIQ,5145
 yaralyzer/yara/yara_rule_builder.py,sha256=kAa3RBojM5GEaXDJjKZODAyx6yj34AlkOnQhACAFfZM,3021
-yaralyzer/yaralyzer.py,sha256=K0XIl0EL9Kv2WHubc1Px7Jvrn-Xm48fiVQ4nlUKfUTc,9180
-yaralyzer-0.9.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-yaralyzer-0.9.2.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-yaralyzer-0.9.2.dist-info/entry_points.txt,sha256=7LnLJrNTfql0vuctjRWwp_ZD-BYvtv9ENVipdjuT7XI,136
-yaralyzer-0.9.2.dist-info/METADATA,sha256=PLoL9TDlN-fOs7dTRU8OdqH76Gj6sPUV0v5hIuBsa_g,10282
-yaralyzer-0.9.2.dist-info/RECORD,,
+yaralyzer/yaralyzer.py,sha256=HedtLt5z4jZsolzJQ96yaJttFI7kl4R1Y9sUM_ZG-F4,9256
+yaralyzer-0.9.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+yaralyzer-0.9.4.dist-info/METADATA,sha256=M1VnVpBiuhB_-ORYBckFKM2rjUXWAF0GpzkWxhUKbVk,10760
+yaralyzer-0.9.4.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+yaralyzer-0.9.4.dist-info/entry_points.txt,sha256=7LnLJrNTfql0vuctjRWwp_ZD-BYvtv9ENVipdjuT7XI,136
+yaralyzer-0.9.4.dist-info/RECORD,,

{yaralyzer-0.9.2.dist-info → yaralyzer-0.9.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 1.7.0
 Root-Is-Purelib: true
 Tag: py3-none-any