From c82dd6848fa672515642bc199de6b33dfe0baf27 Mon Sep 17 00:00:00 2001 From: Thomas Dupuy Date: Mon, 25 Oct 2021 20:37:12 -0400 Subject: [PATCH] chg: Unified constructors --- pymisp/tools/asnobject.py | 3 +-- pymisp/tools/domainipobject.py | 3 +-- pymisp/tools/elfobject.py | 2 +- pymisp/tools/emailobject.py | 2 +- pymisp/tools/fail2banobject.py | 3 +-- pymisp/tools/fileobject.py | 4 +--- pymisp/tools/geolocationobject.py | 3 +-- pymisp/tools/git_vuln_finder_object.py | 3 +-- pymisp/tools/machoobject.py | 4 +--- pymisp/tools/microblogobject.py | 2 +- pymisp/tools/peobject.py | 3 +-- pymisp/tools/sbsignatureobject.py | 2 +- pymisp/tools/sshauthkeyobject.py | 3 +-- pymisp/tools/vehicleobject.py | 2 +- pymisp/tools/vtreportobject.py | 4 +--- 15 files changed, 15 insertions(+), 28 deletions(-) diff --git a/pymisp/tools/asnobject.py b/pymisp/tools/asnobject.py index 885efff..3abe89f 100644 --- a/pymisp/tools/asnobject.py +++ b/pymisp/tools/asnobject.py @@ -10,7 +10,7 @@ logger = logging.getLogger('pymisp') class ASNObject(AbstractMISPObjectGenerator): def __init__(self, parameters: dict, strict: bool = True, **kwargs): - super(ASNObject, self).__init__('asn', strict=strict, **kwargs) + super().__init__('asn', **kwargs) self._parameters = parameters self.generate_attributes() @@ -19,4 +19,3 @@ class ASNObject(AbstractMISPObjectGenerator): self._parameters['first-seen'] = first last = self._sanitize_timestamp(self._parameters.pop('last-seen', None)) self._parameters['last-seen'] = last - return super(ASNObject, self).generate_attributes() diff --git a/pymisp/tools/domainipobject.py b/pymisp/tools/domainipobject.py index 712d140..d1bff67 100644 --- a/pymisp/tools/domainipobject.py +++ b/pymisp/tools/domainipobject.py @@ -10,7 +10,7 @@ logger = logging.getLogger('pymisp') class DomainIPObject(AbstractMISPObjectGenerator): def __init__(self, parameters: dict, strict: bool = True, **kwargs): - super(DomainIPObject, self).__init__('domain-ip', strict=strict, **kwargs) + super().__init__('domain-ip', **kwargs) self._parameters = parameters self.generate_attributes() @@ -19,4 +19,3 @@ class DomainIPObject(AbstractMISPObjectGenerator): self._parameters['first-seen'] = first last = self._sanitize_timestamp(self._parameters.pop('last-seen', None)) self._parameters['last-seen'] = last - return super(DomainIPObject, self).generate_attributes() diff --git a/pymisp/tools/elfobject.py b/pymisp/tools/elfobject.py index 96e51d5..74e90a4 100644 --- a/pymisp/tools/elfobject.py +++ b/pymisp/tools/elfobject.py @@ -34,7 +34,7 @@ class ELFObject(AbstractMISPObjectGenerator): def __init__(self, parsed: lief.ELF.Binary = None, filepath: Union[Path, str] = None, pseudofile: Union[BytesIO, bytes] = None, **kwargs): """Creates an ELF object, with lief""" - super(ELFObject, self).__init__('elf', **kwargs) + super().__init__('elf', **kwargs) if not HAS_PYDEEP: logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git") if pseudofile: diff --git a/pymisp/tools/emailobject.py b/pymisp/tools/emailobject.py index da3fb8b..1dcf80b 100644 --- a/pymisp/tools/emailobject.py +++ b/pymisp/tools/emailobject.py @@ -31,7 +31,7 @@ class MISPMsgConverstionError(MISPObjectException): class EMailObject(AbstractMISPObjectGenerator): def __init__(self, filepath: Union[Path, str] = None, pseudofile: BytesIO = None, attach_original_email: bool = True, **kwargs): - super().__init__("email", **kwargs) + super().__init__('email', **kwargs) self.attach_original_email = attach_original_email self.encapsulated_body: Union[str, None] = None diff --git a/pymisp/tools/fail2banobject.py b/pymisp/tools/fail2banobject.py index fae8006..2943bab 100644 --- a/pymisp/tools/fail2banobject.py +++ b/pymisp/tools/fail2banobject.py @@ -10,11 +10,10 @@ logger = logging.getLogger('pymisp') class Fail2BanObject(AbstractMISPObjectGenerator): def __init__(self, parameters: dict, strict: bool = True, **kwargs): - super(Fail2BanObject, self).__init__('fail2ban', strict=strict, **kwargs) + super().__init__('fail2ban', **kwargs) self._parameters = parameters self.generate_attributes() def generate_attributes(self): timestamp = self._sanitize_timestamp(self._parameters.pop('processing-timestamp', None)) self._parameters['processing-timestamp'] = timestamp - return super(Fail2BanObject, self).generate_attributes() diff --git a/pymisp/tools/fileobject.py b/pymisp/tools/fileobject.py index 32095bb..3dba2f2 100644 --- a/pymisp/tools/fileobject.py +++ b/pymisp/tools/fileobject.py @@ -31,9 +31,7 @@ except ImportError: class FileObject(AbstractMISPObjectGenerator): def __init__(self, filepath: Union[Path, str] = None, pseudofile: BytesIO = None, filename: str = None, **kwargs): - # PY3 way: - # super().__init__('file') - super(FileObject, self).__init__('file', **kwargs) + super().__init__('file', **kwargs) if not HAS_PYDEEP: logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git") if not HAS_MAGIC: diff --git a/pymisp/tools/geolocationobject.py b/pymisp/tools/geolocationobject.py index a53d14d..d785145 100644 --- a/pymisp/tools/geolocationobject.py +++ b/pymisp/tools/geolocationobject.py @@ -10,7 +10,7 @@ logger = logging.getLogger('pymisp') class GeolocationObject(AbstractMISPObjectGenerator): def __init__(self, parameters: dict, strict: bool = True, **kwargs): - super(GeolocationObject, self).__init__('asn', strict=strict, **kwargs) + super().__init__('geolocation', **kwargs) self._parameters = parameters self.generate_attributes() @@ -19,4 +19,3 @@ class GeolocationObject(AbstractMISPObjectGenerator): self._parameters['first-seen'] = first last = self._sanitize_timestamp(self._parameters.pop('last-seen', None)) self._parameters['last-seen'] = last - return super(GeolocationObject, self).generate_attributes() diff --git a/pymisp/tools/git_vuln_finder_object.py b/pymisp/tools/git_vuln_finder_object.py index 19b5dab..9a22b88 100644 --- a/pymisp/tools/git_vuln_finder_object.py +++ b/pymisp/tools/git_vuln_finder_object.py @@ -10,7 +10,7 @@ logger = logging.getLogger('pymisp') class GitVulnFinderObject(AbstractMISPObjectGenerator): def __init__(self, parameters: dict, strict: bool = True, **kwargs): - super(GitVulnFinderObject, self).__init__('git-vuln-finder', strict=strict, **kwargs) + super().__init__('git-vuln-finder', **kwargs) self._parameters = parameters self.generate_attributes() @@ -25,4 +25,3 @@ class GitVulnFinderObject(AbstractMISPObjectGenerator): self._parameters['stats.deletions'] = stats.pop('deletions') self._parameters['stats.lines'] = stats.pop('lines') self._parameters['stats.files'] = stats.pop('files') - return super(GitVulnFinderObject, self).generate_attributes() diff --git a/pymisp/tools/machoobject.py b/pymisp/tools/machoobject.py index c08ad7d..e2f3747 100644 --- a/pymisp/tools/machoobject.py +++ b/pymisp/tools/machoobject.py @@ -34,9 +34,7 @@ class MachOObject(AbstractMISPObjectGenerator): def __init__(self, parsed: Optional[lief.MachO.Binary] = None, filepath: Optional[Union[Path, str]] = None, pseudofile: Optional[BytesIO] = None, **kwargs): """Creates an MachO object, with lief""" - # Python3 way - # super().__init__('elf') - super(MachOObject, self).__init__('macho', **kwargs) + super().__init__('macho', **kwargs) if not HAS_PYDEEP: logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git") if pseudofile: diff --git a/pymisp/tools/microblogobject.py b/pymisp/tools/microblogobject.py index c4c45da..19878f8 100644 --- a/pymisp/tools/microblogobject.py +++ b/pymisp/tools/microblogobject.py @@ -12,7 +12,7 @@ logger = logging.getLogger('pymisp') class MicroblogObject(AbstractMISPObjectGenerator): def __init__(self, parameters: dict, strict: bool = True, **kwargs): - super(MicroblogObject, self).__init__('microblog', strict=strict, **kwargs) + super().__init__('microblog', **kwargs) self._parameters = parameters self.generate_attributes() diff --git a/pymisp/tools/peobject.py b/pymisp/tools/peobject.py index b94fe59..7d0ab3d 100644 --- a/pymisp/tools/peobject.py +++ b/pymisp/tools/peobject.py @@ -37,8 +37,7 @@ class PEObject(AbstractMISPObjectGenerator): def __init__(self, parsed: Optional[lief.PE.Binary] = None, filepath: Optional[Union[Path, str]] = None, pseudofile: Optional[BytesIO] = None, **kwargs): """Creates an PE object, with lief""" - super().__init__('pe') - super(PEObject, self).__init__('pe', **kwargs) + super().__init__('pe', **kwargs) if not HAS_PYDEEP: logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git") if pseudofile: diff --git a/pymisp/tools/sbsignatureobject.py b/pymisp/tools/sbsignatureobject.py index 2192910..ca7ad6e 100644 --- a/pymisp/tools/sbsignatureobject.py +++ b/pymisp/tools/sbsignatureobject.py @@ -9,7 +9,7 @@ class SBSignatureObject(AbstractMISPObjectGenerator): Sandbox Analyzer ''' def __init__(self, software: str, report: list, **kwargs): - super(SBSignatureObject, self).__init__("sb-signature", **kwargs) + super().__init__('sb-signature', **kwargs) self._software = software self._report = report self.generate_attributes() diff --git a/pymisp/tools/sshauthkeyobject.py b/pymisp/tools/sshauthkeyobject.py index 26519b0..8d7d74c 100644 --- a/pymisp/tools/sshauthkeyobject.py +++ b/pymisp/tools/sshauthkeyobject.py @@ -15,8 +15,7 @@ class SSHAuthorizedKeysObject(AbstractMISPObjectGenerator): def __init__(self, authorized_keys_path: Optional[Union[Path, str]] = None, authorized_keys_pseudofile: Optional[StringIO] = None, **kwargs): # PY3 way: - # super().__init__('file') - super(SSHAuthorizedKeysObject, self).__init__('ssh-authorized-keys', **kwargs) + super().__init__('ssh-authorized-keys', **kwargs) if authorized_keys_path: with open(authorized_keys_path, 'r') as f: self.__pseudofile = StringIO(f.read()) diff --git a/pymisp/tools/vehicleobject.py b/pymisp/tools/vehicleobject.py index 8ce6285..7d5bc95 100644 --- a/pymisp/tools/vehicleobject.py +++ b/pymisp/tools/vehicleobject.py @@ -18,7 +18,7 @@ class VehicleObject(AbstractMISPObjectGenerator): } def __init__(self, country: str, registration: str, username: str, **kwargs): - super(VehicleObject, self).__init__("vehicle", **kwargs) + super().__init__('vehicle', **kwargs) self._country = country self._registration = registration self._username = username diff --git a/pymisp/tools/vtreportobject.py b/pymisp/tools/vtreportobject.py index 097811e..4974fdb 100644 --- a/pymisp/tools/vtreportobject.py +++ b/pymisp/tools/vtreportobject.py @@ -25,9 +25,7 @@ class VTReportObject(AbstractMISPObjectGenerator): :indicator: IOC to search VirusTotal for ''' def __init__(self, apikey: str, indicator: str, vt_proxies: Optional[dict] = None, **kwargs): - # PY3 way: - # super().__init__("virustotal-report") - super(VTReportObject, self).__init__("virustotal-report", **kwargs) + super().__init__('virustotal-report', **kwargs) indicator = indicator.strip() self._resource_type = self.__validate_resource(indicator) if self._resource_type: