From 75435df663376d26bf8044b76906ecadba112000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Wed, 19 Apr 2023 11:47:41 +0300 Subject: [PATCH] fix: Update lief code to v0.13 --- pymisp/tools/create_misp_object.py | 43 +++++++++--------------------- pymisp/tools/elfobject.py | 8 +++--- pymisp/tools/machoobject.py | 6 ++--- pymisp/tools/peobject.py | 6 ++--- 4 files changed, 23 insertions(+), 40 deletions(-) diff --git a/pymisp/tools/create_misp_object.py b/pymisp/tools/create_misp_object.py index b4d36ce..a9be6f2 100644 --- a/pymisp/tools/create_misp_object.py +++ b/pymisp/tools/create_misp_object.py @@ -11,7 +11,7 @@ from typing import Optional logger = logging.getLogger('pymisp') try: - import lief # type: ignore + import lief lief.logging.disable() HAS_LIEF = True @@ -35,40 +35,23 @@ def make_binary_objects(filepath: Optional[str] = None, pseudofile: Optional[Byt misp_file = FileObject(filepath=filepath, pseudofile=pseudofile, filename=filename, standalone=standalone, default_attributes_parameters=default_attributes_parameters) if HAS_LIEF and (filepath or (pseudofile and filename)): - try: - if filepath: - lief_parsed = lief.parse(filepath=filepath) - elif pseudofile and filename: - lief_parsed = lief.parse(raw=pseudofile.getvalue(), name=filename) - else: - logger.critical('You need either a filepath, or a pseudofile and a filename.') - lief_parsed = None - if isinstance(lief_parsed, lief.PE.Binary): + if filepath: + lief_parsed = lief.parse(filepath=filepath) + elif pseudofile and filename: + lief_parsed = lief.parse(raw=pseudofile.getvalue(), name=filename) + if isinstance(lief_parsed, lief.lief_errors): + logger.warning('Got an error parsing the file: {lief_parsed}') + elif isinstance(lief_parsed, lief.PE.Binary): return make_pe_objects(lief_parsed, misp_file, standalone, default_attributes_parameters) elif isinstance(lief_parsed, lief.ELF.Binary): return make_elf_objects(lief_parsed, misp_file, standalone, default_attributes_parameters) elif isinstance(lief_parsed, lief.MachO.Binary): return make_macho_objects(lief_parsed, misp_file, standalone, default_attributes_parameters) - except lief.bad_format as e: - logger.warning('Bad format: {}'.format(e)) - except lief.bad_file as e: - logger.warning('Bad file: {}'.format(e)) - except lief.conversion_error as e: - logger.warning('Conversion file: {}'.format(e)) - except lief.builder_error as e: - logger.warning('Builder file: {}'.format(e)) - except lief.parser_error as e: - logger.warning('Parser error: {}'.format(e)) - except lief.integrity_error as e: - logger.warning('Integrity error: {}'.format(e)) - except lief.pe_error as e: - logger.warning('PE error: {}'.format(e)) - except lief.type_error as e: - logger.warning('Type error: {}'.format(e)) - except lief.exception as e: - logger.warning('Lief exception: {}'.format(e)) - except FileTypeNotImplemented as e: - logger.warning(e) + else: + logger.critical(f'Unexpected type from lief: {type(lief_parsed)}') + else: + logger.critical('You need either a filepath, or a pseudofile and a filename.') + lief_parsed = None if not HAS_LIEF: logger.warning('Please install lief, documentation here: https://github.com/lief-project/LIEF') return misp_file, None, [] diff --git a/pymisp/tools/elfobject.py b/pymisp/tools/elfobject.py index 647c743..a26734b 100644 --- a/pymisp/tools/elfobject.py +++ b/pymisp/tools/elfobject.py @@ -10,7 +10,7 @@ from typing import Union, Optional from pathlib import Path from . import FileObject -import lief # type: ignore +import lief try: import pydeep # type: ignore @@ -21,7 +21,7 @@ except ImportError: logger = logging.getLogger('pymisp') -def make_elf_objects(lief_parsed: lief.Binary, misp_file: FileObject, standalone: bool = True, default_attributes_parameters: dict = {}): +def make_elf_objects(lief_parsed: lief.ELF.Binary, misp_file: FileObject, standalone: bool = True, default_attributes_parameters: dict = {}): elf_object = ELFObject(parsed=lief_parsed, standalone=standalone, default_attributes_parameters=default_attributes_parameters) misp_file.add_reference(elf_object.uuid, 'includes', 'ELF indicators') elf_sections = [] @@ -32,14 +32,14 @@ def make_elf_objects(lief_parsed: lief.Binary, misp_file: FileObject, standalone class ELFObject(AbstractMISPObjectGenerator): - def __init__(self, parsed: Optional[lief.ELF.Binary] = None, filepath: Optional[Union[Path, str]] = None, pseudofile: Optional[Union[BytesIO, bytes]] = None, **kwargs): + def __init__(self, parsed: Optional[lief.ELF.Binary] = None, filepath: Optional[Union[Path, str]] = None, pseudofile: Optional[BytesIO] = None, **kwargs): """Creates an ELF object, with lief""" super().__init__('elf', **kwargs) if not HAS_PYDEEP: logger.warning("pydeep is missing, please install pymisp this way: pip install pymisp[fileobjects]") if pseudofile: if isinstance(pseudofile, BytesIO): - self.__elf = lief.ELF.parse(raw=pseudofile.getvalue()) + self.__elf = lief.ELF.parse(io=pseudofile) elif isinstance(pseudofile, bytes): self.__elf = lief.ELF.parse(raw=pseudofile) else: diff --git a/pymisp/tools/machoobject.py b/pymisp/tools/machoobject.py index 0e817b9..95f1b87 100644 --- a/pymisp/tools/machoobject.py +++ b/pymisp/tools/machoobject.py @@ -10,7 +10,7 @@ from typing import Optional, Union from pathlib import Path from . import FileObject -import lief # type: ignore +import lief try: import pydeep # type: ignore @@ -21,7 +21,7 @@ except ImportError: logger = logging.getLogger('pymisp') -def make_macho_objects(lief_parsed: lief.Binary, misp_file: FileObject, standalone: bool = True, default_attributes_parameters: dict = {}): +def make_macho_objects(lief_parsed: lief.MachO.Binary, misp_file: FileObject, standalone: bool = True, default_attributes_parameters: dict = {}): macho_object = MachOObject(parsed=lief_parsed, standalone=standalone, default_attributes_parameters=default_attributes_parameters) misp_file.add_reference(macho_object.uuid, 'includes', 'MachO indicators') macho_sections = [] @@ -39,7 +39,7 @@ class MachOObject(AbstractMISPObjectGenerator): logger.warning("pydeep is missing, please install pymisp this way: pip install pymisp[fileobjects]") if pseudofile: if isinstance(pseudofile, BytesIO): - self.__macho = lief.MachO.parse(raw=pseudofile.getvalue()) + self.__macho = lief.MachO.parse(io=pseudofile) elif isinstance(pseudofile, bytes): self.__macho = lief.MachO.parse(raw=pseudofile) else: diff --git a/pymisp/tools/peobject.py b/pymisp/tools/peobject.py index 011c46e..167cfbf 100644 --- a/pymisp/tools/peobject.py +++ b/pymisp/tools/peobject.py @@ -13,7 +13,7 @@ from base64 import b64encode from . import FileObject -import lief # type: ignore +import lief try: import pydeep # type: ignore @@ -24,7 +24,7 @@ except ImportError: logger = logging.getLogger('pymisp') -def make_pe_objects(lief_parsed: lief.Binary, misp_file: FileObject, standalone: bool = True, default_attributes_parameters: dict = {}): +def make_pe_objects(lief_parsed: lief.PE.Binary, misp_file: FileObject, standalone: bool = True, default_attributes_parameters: dict = {}): pe_object = PEObject(parsed=lief_parsed, standalone=standalone, default_attributes_parameters=default_attributes_parameters) misp_file.add_reference(pe_object.uuid, 'includes', 'PE indicators') pe_sections = [] @@ -42,7 +42,7 @@ class PEObject(AbstractMISPObjectGenerator): logger.warning("pydeep is missing, please install pymisp this way: pip install pymisp[fileobjects]") if pseudofile: if isinstance(pseudofile, BytesIO): - self.__pe = lief.PE.parse(raw=pseudofile.getvalue()) + self.__pe = lief.PE.parse(io=pseudofile) elif isinstance(pseudofile, bytes): self.__pe = lief.PE.parse(raw=pseudofile) else: