Merge b6322c0 into f176fb0

pymisp/abstract.py

@@ -170,6 +170,14 @@ def set_not_jsonable(self, args: List[str]) -> None:
         """Set __not_jsonable to a new list"""
         self.__not_jsonable = args
 
+    def _remove_from_not_jsonable(self, *args) -> None:
+        """Remove the entries that are in the __not_jsonable list"""
+        for entry in args:
+            try:
+                self.__not_jsonable.remove(entry)
+            except ValueError:
+                pass
+
     def from_json(self, json_string: str) -> None:
         """Load a JSON string"""
         self.from_dict(**loads(json_string))

pymisp/api.py

@@ -331,7 +331,7 @@ def get_object(self, misp_object: Union[MISPObject, int, str, UUID], pythonify:
         misp_object_r = self._check_json_response(r)
         if not (self.global_pythonify or pythonify) or 'errors' in misp_object_r:
             return misp_object_r
-        o = MISPObject(misp_object_r['Object']['name'])
+        o = MISPObject(misp_object_r['Object']['name'], standalone=False)
         o.from_dict(**misp_object_r)
         return o
 
@@ -342,7 +342,7 @@ def add_object(self, event: Union[MISPEvent, int, str, UUID], misp_object: MISPO
         new_object = self._check_json_response(r)
         if not (self.global_pythonify or pythonify) or 'errors' in new_object:
             return new_object
-        o = MISPObject(new_object['Object']['name'])
+        o = MISPObject(new_object['Object']['name'], standalone=False)
         o.from_dict(**new_object)
         return o
 
@@ -356,7 +356,7 @@ def update_object(self, misp_object: MISPObject, object_id: Optional[int]=None,
         updated_object = self._check_json_response(r)
         if not (self.global_pythonify or pythonify) or 'errors' in updated_object:
             return updated_object
-        o = MISPObject(updated_object['Object']['name'])
+        o = MISPObject(updated_object['Object']['name'], standalone=False)
         o.from_dict(**updated_object)
         return o
 

pymisp/mispevent.py

@@ -603,7 +603,7 @@ class MISPObject(AbstractMISP):
                              'sharing_group_id', 'comment', 'first_seen', 'last_seen',
                              'deleted'}
 
-    def __init__(self, name: str, strict: bool=False, standalone: bool=False, default_attributes_parameters: dict={}, **kwargs):
+    def __init__(self, name: str, strict: bool=False, standalone: bool=True, default_attributes_parameters: dict={}, **kwargs):
         ''' Master class representing a generic MISP object
         :name: Name of the object
 
@@ -629,6 +629,7 @@ def __init__(self, name: str, strict: bool=False, standalone: bool=False, defaul
         self.last_seen: datetime
         self.__fast_attribute_access: dict = defaultdict(list)  # Hashtable object_relation: [attributes]
         self.ObjectReference: List[MISPObjectReference] = []
+        self._standalone: bool = False
         self.Attribute: List[MISPObjectAttribute] = []
         self.SharingGroup: MISPSharingGroup
         self._default_attributes_parameters: dict
@@ -656,10 +657,7 @@ def __init__(self, name: str, strict: bool=False, standalone: bool=False, defaul
         else:
             self.distribution = 5  # Default to inherit
             self.sharing_group_id = 0
-        self._standalone = standalone
-        if self._standalone:
-            # Mark as non_jsonable because we need to add the references manually after the object(s) have been created
-            self.update_not_jsonable('ObjectReference')
+        self.standalone = standalone
 
     def _load_template_path(self, template_path: Union[Path, str]) -> bool:
         self._definition: Optional[Dict] = self._load_json(template_path)
@@ -742,6 +740,21 @@ def references(self, references: List[MISPObjectReference]):
         else:
             raise PyMISPError('All the attributes have to be of type MISPObjectReference.')
 
+    @property
+    def standalone(self):
+        return self._standalone
+
+    @standalone.setter
+    def standalone(self, new_standalone: bool):
+        if self._standalone != new_standalone:
+            if new_standalone:
+                self.update_not_jsonable("ObjectReference")
+            else:
+                self._remove_from_not_jsonable("ObjectReference")
+            self._standalone = new_standalone
+        else:
+            pass
+
     def from_dict(self, **kwargs):
         if 'Object' in kwargs:
             kwargs = kwargs['Object']
@@ -1385,6 +1398,7 @@ def add_object(self, obj: Union[MISPObject, dict, None]=None, **kwargs) -> MISPO
             misp_obj.from_dict(**kwargs)
         else:
             raise InvalidMISPObject("An object to add to an existing Event needs to be either a MISPObject, or a plain python dictionary")
+        misp_obj.standalone = False
         self.Object.append(misp_obj)
         self.edited = True
         return misp_obj

pymisp/tools/asnobject.py

@@ -9,8 +9,8 @@
 
 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()
 

pymisp/tools/domainipobject.py

@@ -9,8 +9,8 @@
 
 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()
 

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 @@ def generate_attributes(self):
         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 @@ def generate_attributes(self):
 
 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()

pymisp/tools/emailobject.py

@@ -14,10 +14,10 @@
 
 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())

pymisp/tools/fail2banobject.py

@@ -9,8 +9,8 @@
 
 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()
 

pymisp/tools/fileobject.py

@@ -30,10 +30,10 @@
 
 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:

pymisp/tools/geolocationobject.py

@@ -9,8 +9,8 @@
 
 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()
 

pymisp/tools/git_vuln_finder_object.py

@@ -9,8 +9,8 @@
 
 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()
 

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 @@ def generate_attributes(self):
         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 @@ def generate_attributes(self):
 
 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()

pymisp/tools/microblogobject.py

@@ -11,8 +11,8 @@
 
 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()
 

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 @@ def generate_attributes(self):
         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 @@ def generate_attributes(self):
 
 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()

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

pymisp/tools/sshauthkeyobject.py

@@ -13,10 +13,10 @@
 
 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())

pymisp/tools/urlobject.py

@@ -13,10 +13,10 @@
 
 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()
 

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

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: