diff --git a/pymisp/tools/asnobject.py b/pymisp/tools/asnobject.py index 11033a8..8dbd94d 100644 --- a/pymisp/tools/asnobject.py +++ b/pymisp/tools/asnobject.py @@ -9,8 +9,8 @@ logger = logging.getLogger('pymisp') class ASNObject(AbstractMISPObjectGenerator): - def __init__(self, parameters: dict, strict: bool=True, standalone: bool=True, **kwargs): - super(ASNObject, self).__init__('asn', strict=strict, standalone=standalone, **kwargs) + def __init__(self, parameters: dict, strict: bool=True, **kwargs): + super(ASNObject, self).__init__('asn', strict=strict, **kwargs) self._parameters = parameters self.generate_attributes() diff --git a/pymisp/tools/domainipobject.py b/pymisp/tools/domainipobject.py index 0fe7a86..47fb650 100644 --- a/pymisp/tools/domainipobject.py +++ b/pymisp/tools/domainipobject.py @@ -9,8 +9,8 @@ logger = logging.getLogger('pymisp') class DomainIPObject(AbstractMISPObjectGenerator): - def __init__(self, parameters: dict, strict: bool=True, standalone: bool=True, **kwargs): - super(DomainIPObject, self).__init__('domain-ip', strict=strict, standalone=standalone, **kwargs) + def __init__(self, parameters: dict, strict: bool=True, **kwargs): + super(DomainIPObject, self).__init__('domain-ip', strict=strict, **kwargs) self._parameters = parameters self.generate_attributes() diff --git a/pymisp/tools/elfobject.py b/pymisp/tools/elfobject.py index f23b797..5064acd 100644 --- a/pymisp/tools/elfobject.py +++ b/pymisp/tools/elfobject.py @@ -32,8 +32,8 @@ def make_elf_objects(lief_parsed: lief.Binary, misp_file: FileObject, standalone class ELFObject(AbstractMISPObjectGenerator): - def __init__(self, parsed: lief.ELF.Binary=None, filepath: Union[Path, str]=None, pseudofile: Union[BytesIO, bytes]=None, standalone: bool=True, **kwargs): - super(ELFObject, self).__init__('elf', standalone=standalone, **kwargs) + def __init__(self, parsed: lief.ELF.Binary=None, filepath: Union[Path, str]=None, pseudofile: Union[BytesIO, bytes]=None, **kwargs): + super(ELFObject, self).__init__('elf', **kwargs) if not HAS_PYDEEP: logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git") if pseudofile: @@ -64,7 +64,7 @@ class ELFObject(AbstractMISPObjectGenerator): if self.__elf.sections: pos = 0 for section in self.__elf.sections: - s = ELFSectionObject(section, self._standalone, default_attributes_parameters=self._default_attributes_parameters) + s = ELFSectionObject(section, standalone=self._standalone, default_attributes_parameters=self._default_attributes_parameters) self.add_reference(s.uuid, 'includes', 'Section {} of ELF'.format(pos)) pos += 1 self.sections.append(s) @@ -73,10 +73,10 @@ class ELFObject(AbstractMISPObjectGenerator): class ELFSectionObject(AbstractMISPObjectGenerator): - def __init__(self, section: lief.ELF.Section, standalone: bool=True, **kwargs): + def __init__(self, section: lief.ELF.Section, **kwargs): # Python3 way # super().__init__('pe-section') - super(ELFSectionObject, self).__init__('elf-section', standalone=standalone, **kwargs) + super(ELFSectionObject, self).__init__('elf-section', **kwargs) self.__section = section self.__data = bytes(self.__section.content) self.generate_attributes() diff --git a/pymisp/tools/emailobject.py b/pymisp/tools/emailobject.py index 758d7c8..5b298a2 100644 --- a/pymisp/tools/emailobject.py +++ b/pymisp/tools/emailobject.py @@ -14,10 +14,10 @@ logger = logging.getLogger('pymisp') class EMailObject(AbstractMISPObjectGenerator): - def __init__(self, filepath: Union[Path, str]=None, pseudofile: BytesIO=None, attach_original_email: bool=True, standalone: bool=True, **kwargs): + def __init__(self, filepath: Union[Path, str]=None, pseudofile: BytesIO=None, attach_original_email: bool=True, **kwargs): # PY3 way: # super().__init__('file') - super(EMailObject, self).__init__('email', standalone=standalone, **kwargs) + super(EMailObject, self).__init__('email', **kwargs) if filepath: with open(filepath, 'rb') as f: self.__pseudofile = BytesIO(f.read()) diff --git a/pymisp/tools/fail2banobject.py b/pymisp/tools/fail2banobject.py index 3077ee9..516a289 100644 --- a/pymisp/tools/fail2banobject.py +++ b/pymisp/tools/fail2banobject.py @@ -9,8 +9,8 @@ logger = logging.getLogger('pymisp') class Fail2BanObject(AbstractMISPObjectGenerator): - def __init__(self, parameters: dict, strict: bool=True, standalone: bool=True, **kwargs): - super(Fail2BanObject, self).__init__('fail2ban', strict=strict, standalone=standalone, **kwargs) + def __init__(self, parameters: dict, strict: bool=True, **kwargs): + super(Fail2BanObject, self).__init__('fail2ban', strict=strict, **kwargs) self._parameters = parameters self.generate_attributes() diff --git a/pymisp/tools/fileobject.py b/pymisp/tools/fileobject.py index 4d7d407..df3c9d3 100644 --- a/pymisp/tools/fileobject.py +++ b/pymisp/tools/fileobject.py @@ -30,10 +30,10 @@ except ImportError: class FileObject(AbstractMISPObjectGenerator): - def __init__(self, filepath: Union[Path, str]=None, pseudofile: BytesIO=None, filename: str=None, standalone: bool=True, **kwargs): + 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', standalone=standalone, **kwargs) + super(FileObject, self).__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 3f59417..24112d4 100644 --- a/pymisp/tools/geolocationobject.py +++ b/pymisp/tools/geolocationobject.py @@ -9,8 +9,8 @@ logger = logging.getLogger('pymisp') class GeolocationObject(AbstractMISPObjectGenerator): - def __init__(self, parameters: dict, strict: bool=True, standalone: bool=True, **kwargs): - super(GeolocationObject, self).__init__('asn', strict=strict, standalone=standalone, **kwargs) + def __init__(self, parameters: dict, strict: bool=True, **kwargs): + super(GeolocationObject, self).__init__('asn', strict=strict, **kwargs) self._parameters = parameters self.generate_attributes() diff --git a/pymisp/tools/git_vuln_finder_object.py b/pymisp/tools/git_vuln_finder_object.py index 2d492f3..9490d1e 100644 --- a/pymisp/tools/git_vuln_finder_object.py +++ b/pymisp/tools/git_vuln_finder_object.py @@ -9,8 +9,8 @@ logger = logging.getLogger('pymisp') class GitVulnFinderObject(AbstractMISPObjectGenerator): - def __init__(self, parameters: dict, strict: bool=True, standalone: bool=True, **kwargs): - super(GitVulnFinderObject, self).__init__('git-vuln-finder', strict=strict, standalone=standalone, **kwargs) + def __init__(self, parameters: dict, strict: bool=True, **kwargs): + super(GitVulnFinderObject, self).__init__('git-vuln-finder', strict=strict, **kwargs) self._parameters = parameters self.generate_attributes() diff --git a/pymisp/tools/machoobject.py b/pymisp/tools/machoobject.py index 88a2f07..9a13e79 100644 --- a/pymisp/tools/machoobject.py +++ b/pymisp/tools/machoobject.py @@ -32,10 +32,10 @@ def make_macho_objects(lief_parsed: lief.Binary, misp_file: FileObject, standalo class MachOObject(AbstractMISPObjectGenerator): - def __init__(self, parsed: Optional[lief.MachO.Binary]=None, filepath: Optional[Union[Path, str]]=None, pseudofile: Optional[BytesIO]=None, standalone: bool=True, **kwargs): + def __init__(self, parsed: Optional[lief.MachO.Binary]=None, filepath: Optional[Union[Path, str]]=None, pseudofile: Optional[BytesIO]=None, **kwargs): # Python3 way # super().__init__('elf') - super(MachOObject, self).__init__('macho', standalone=standalone, **kwargs) + super(MachOObject, self).__init__('macho', **kwargs) if not HAS_PYDEEP: logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git") if pseudofile: @@ -66,7 +66,7 @@ class MachOObject(AbstractMISPObjectGenerator): if self.__macho.sections: pos = 0 for section in self.__macho.sections: - s = MachOSectionObject(section, self._standalone, default_attributes_parameters=self._default_attributes_parameters) + s = MachOSectionObject(section, standalone=self._standalone, default_attributes_parameters=self._default_attributes_parameters) self.add_reference(s.uuid, 'includes', 'Section {} of MachO'.format(pos)) pos += 1 self.sections.append(s) @@ -75,10 +75,10 @@ class MachOObject(AbstractMISPObjectGenerator): class MachOSectionObject(AbstractMISPObjectGenerator): - def __init__(self, section: lief.MachO.Section, standalone: bool=True, **kwargs): + def __init__(self, section: lief.MachO.Section, **kwargs): # Python3 way # super().__init__('pe-section') - super(MachOSectionObject, self).__init__('macho-section', standalone=standalone, **kwargs) + super(MachOSectionObject, self).__init__('macho-section', **kwargs) self.__section = section self.__data = bytes(self.__section.content) self.generate_attributes() diff --git a/pymisp/tools/microblogobject.py b/pymisp/tools/microblogobject.py index 0c28404..c4c45da 100644 --- a/pymisp/tools/microblogobject.py +++ b/pymisp/tools/microblogobject.py @@ -11,8 +11,8 @@ logger = logging.getLogger('pymisp') class MicroblogObject(AbstractMISPObjectGenerator): - def __init__(self, parameters: dict, strict: bool = True, standalone: bool = True, **kwargs): - super(MicroblogObject, self).__init__('microblog', strict=strict, standalone=standalone, **kwargs) + def __init__(self, parameters: dict, strict: bool = True, **kwargs): + super(MicroblogObject, self).__init__('microblog', strict=strict, **kwargs) self._parameters = parameters self.generate_attributes() diff --git a/pymisp/tools/peobject.py b/pymisp/tools/peobject.py index e592d8c..3f37060 100644 --- a/pymisp/tools/peobject.py +++ b/pymisp/tools/peobject.py @@ -34,10 +34,10 @@ def make_pe_objects(lief_parsed: lief.Binary, misp_file: FileObject, standalone: class PEObject(AbstractMISPObjectGenerator): - def __init__(self, parsed: Optional[lief.PE.Binary]=None, filepath: Optional[Union[Path, str]]=None, pseudofile: Optional[BytesIO]=None, standalone: bool=True, **kwargs): + def __init__(self, parsed: Optional[lief.PE.Binary]=None, filepath: Optional[Union[Path, str]]=None, pseudofile: Optional[BytesIO]=None, **kwargs): # Python3 way # super().__init__('pe') - super(PEObject, self).__init__('pe', standalone=standalone, **kwargs) + super(PEObject, self).__init__('pe', **kwargs) if not HAS_PYDEEP: logger.warning("Please install pydeep: pip install git+https://github.com/kbandla/pydeep.git") if pseudofile: @@ -111,7 +111,7 @@ class PEObject(AbstractMISPObjectGenerator): if self.__pe.sections: pos = 0 for section in self.__pe.sections: - s = PESectionObject(section, self._standalone, default_attributes_parameters=self._default_attributes_parameters) + s = PESectionObject(section, standalone=self._standalone, default_attributes_parameters=self._default_attributes_parameters) self.add_reference(s.uuid, 'includes', 'Section {} of PE'.format(pos)) if ((self.__pe.entrypoint >= section.virtual_address) and (self.__pe.entrypoint < (section.virtual_address + section.virtual_size))): @@ -124,10 +124,10 @@ class PEObject(AbstractMISPObjectGenerator): class PESectionObject(AbstractMISPObjectGenerator): - def __init__(self, section: lief.PE.Section, standalone: bool=True, **kwargs): + def __init__(self, section: lief.PE.Section, **kwargs): # Python3 way # super().__init__('pe-section') - super(PESectionObject, self).__init__('pe-section', standalone=standalone, **kwargs) + super(PESectionObject, self).__init__('pe-section', **kwargs) self.__section = section self.__data = bytes(self.__section.content) self.generate_attributes() diff --git a/pymisp/tools/sbsignatureobject.py b/pymisp/tools/sbsignatureobject.py index 66b6667..2192910 100644 --- a/pymisp/tools/sbsignatureobject.py +++ b/pymisp/tools/sbsignatureobject.py @@ -8,7 +8,7 @@ class SBSignatureObject(AbstractMISPObjectGenerator): ''' Sandbox Analyzer ''' - def __init__(self, software: str, report: list, standalone: bool=True, **kwargs): + def __init__(self, software: str, report: list, **kwargs): super(SBSignatureObject, self).__init__("sb-signature", **kwargs) self._software = software self._report = report diff --git a/pymisp/tools/sshauthkeyobject.py b/pymisp/tools/sshauthkeyobject.py index 784f0a7..06dd5d5 100644 --- a/pymisp/tools/sshauthkeyobject.py +++ b/pymisp/tools/sshauthkeyobject.py @@ -13,10 +13,10 @@ logger = logging.getLogger('pymisp') class SSHAuthorizedKeysObject(AbstractMISPObjectGenerator): - def __init__(self, authorized_keys_path: Optional[Union[Path, str]]=None, authorized_keys_pseudofile: Optional[StringIO]=None, standalone: bool=True, **kwargs): + 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', standalone=standalone, **kwargs) + super(SSHAuthorizedKeysObject, self).__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/urlobject.py b/pymisp/tools/urlobject.py index f499a3d..f6bf969 100644 --- a/pymisp/tools/urlobject.py +++ b/pymisp/tools/urlobject.py @@ -13,10 +13,10 @@ faup = Faup() class URLObject(AbstractMISPObjectGenerator): - def __init__(self, url: str, standalone: bool=True, **kwargs): + def __init__(self, url: str, **kwargs): # PY3 way: # super().__init__('file') - super(URLObject, self).__init__('url', standalone=standalone, **kwargs) + super(URLObject, self).__init__('url', **kwargs) faup.decode(unquote_plus(url)) self.generate_attributes() diff --git a/pymisp/tools/vehicleobject.py b/pymisp/tools/vehicleobject.py index 1c2bf6a..8ce6285 100644 --- a/pymisp/tools/vehicleobject.py +++ b/pymisp/tools/vehicleobject.py @@ -17,8 +17,8 @@ class VehicleObject(AbstractMISPObjectGenerator): 'uk': "http://www.regcheck.org.uk/api/reg.asmx/Check" } - def __init__(self, country: str, registration: str, username: str, standalone=True, **kwargs): - super(VehicleObject, self).__init__("vehicle", standalone=standalone, **kwargs) + def __init__(self, country: str, registration: str, username: str, **kwargs): + super(VehicleObject, self).__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 97c3332..41dfa68 100644 --- a/pymisp/tools/vtreportobject.py +++ b/pymisp/tools/vtreportobject.py @@ -24,10 +24,10 @@ class VTReportObject(AbstractMISPObjectGenerator): :indicator: IOC to search VirusTotal for ''' - def __init__(self, apikey: str, indicator: str, vt_proxies: Optional[dict]=None, standalone: bool=True, **kwargs): + 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", standalone=standalone, **kwargs) + super(VTReportObject, self).__init__("virustotal-report", **kwargs) indicator = indicator.strip() self._resource_type = self.__validate_resource(indicator) if self._resource_type: