added MetaObject

stix2/base.py

@@ -470,6 +470,10 @@ def _check_object_constraints(self):
         self._check_at_least_one_property()
 
 
+class _MetaObject(_STIXBase):
+    pass
+
+
 def _choose_one_hash(hash_dict):
     if "MD5" in hash_dict:
         return {"MD5": hash_dict["MD5"]}

stix2/datastore/relational_db/input_creation.py

@@ -2,6 +2,7 @@
 
 from sqlalchemy import insert
 
+from stix2.datastore.relational_db.add_method import add_method
 from stix2.datastore.relational_db.utils import (
     SCO_COMMON_PROPERTIES, SDO_COMMON_PROPERTIES, canonicalize_table_name,
 )

stix2/datastore/relational_db/relational_db.py

@@ -12,7 +12,7 @@
 from stix2.datastore.relational_db.utils import canonicalize_table_name
 from stix2.parsing import parse
 from stix2.v21.base import (
-    _DomainObject, _Extension, _Observable, _RelationshipObject,
+    _DomainObject, _Extension, _MetaObject, _Observable, _RelationshipObject,
 )
 
 
@@ -158,6 +158,8 @@ def _create_table_objects(self):
             tables.extend(new_tables)
         for stix_class in _get_all_subclasses(_Observable):
             tables.extend(generate_object_table(stix_class, self.metadata, "sco"))
+        for stix_class in _get_all_subclasses(_MetaObject):
+            tables.extend(generate_object_table(stix_class, self.metadata, "common"))
         for stix_class in _get_all_subclasses(_Extension):
             if stix_class.extension_type not in ["new-sdo", "new-sco", "new-sro"]:
                 if hasattr(stix_class, "_applies_to"):

stix2/datastore/relational_db/table_creation.py

@@ -502,7 +502,7 @@ def generate_table_information(self, name, metadata, schema_name, table_name, **
                 ForeignKey(
                     canonicalize_table_name(table_name, schema_name) + ".id",
                     ondelete="CASCADE",
-                )
+                ),
             ),
         )
         columns.append(

stix2/v20/base.py

@@ -1,7 +1,8 @@
 """Base classes for STIX 2.0 type definitions."""
 
 from ..base import (
-    _DomainObject, _Extension, _Observable, _RelationshipObject, _STIXBase,
+    _DomainObject, _Extension, _MetaObject, _Observable, _RelationshipObject,
+    _STIXBase,
 )
 
 
@@ -23,3 +24,7 @@ class _DomainObject(_DomainObject, _STIXBase20):
 
 class _RelationshipObject(_RelationshipObject, _STIXBase20):
     pass
+
+
+class _MetaObject(_MetaObject, _STIXBase20):
+    pass

stix2/v20/common.py

@@ -11,7 +11,7 @@
     SelectorProperty, StringProperty, TimestampProperty, TypeProperty,
 )
 from ..utils import NOW, _get_dict
-from .base import _STIXBase20
+from .base import _MetaObject, _STIXBase20
 from .vocab import HASHING_ALGORITHM
 
 
@@ -111,7 +111,7 @@ def clean(self, value, allow_custom=False):
             raise ValueError("must be a Statement, TLP Marking or a registered marking.")
 
 
-class MarkingDefinition(_STIXBase20, _MarkingsMixin):
+class MarkingDefinition(_MetaObject, _MarkingsMixin):
     """For more detailed information on this object's properties, see
     `the STIX 2.0 specification <http://docs.oasis-open.org/cti/stix/v2.0/cs01/part1-stix-core/stix-v2.0-cs01-part1-stix-core.html#_Toc496709284>`__.
     """

stix2/v21/base.py

@@ -1,7 +1,8 @@
 """Base classes for STIX 2.1 type definitions."""
 
 from ..base import (
-    _DomainObject, _Extension, _Observable, _RelationshipObject, _STIXBase,
+    _DomainObject, _Extension, _MetaObject, _Observable, _RelationshipObject,
+    _STIXBase,
 )
 
 
@@ -40,3 +41,7 @@ class _DomainObject(_DomainObject, _STIXBase21):
 
 class _RelationshipObject(_RelationshipObject, _STIXBase21):
     pass
+
+
+class _MetaObject(_MetaObject, _STIXBase21):
+    pass

stix2/v21/common.py

@@ -14,7 +14,7 @@
     TypeProperty,
 )
 from ..utils import NOW, _get_dict
-from .base import _STIXBase21
+from .base import _MetaObject, _STIXBase21
 from .vocab import EXTENSION_TYPE, HASHING_ALGORITHM
 
 
@@ -79,7 +79,7 @@ def _check_object_constraints(self):
         self._check_at_least_one_property(['lang', 'marking_ref'])
 
 
-class LanguageContent(_STIXBase21):
+class LanguageContent(_MetaObject):
     """For more detailed information on this object's properties, see
     `the STIX 2.1 specification <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html#_z9r1cwtu8jja>`__.
     """
@@ -107,7 +107,7 @@ class LanguageContent(_STIXBase21):
     ])
 
 
-class ExtensionDefinition(_STIXBase21):
+class ExtensionDefinition(_MetaObject):
     """For more detailed information on this object's properties, see
     `the STIX 2.1 specification <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html#_32j232tfvtly>`__.
     """
@@ -190,7 +190,7 @@ def clean(self, value, allow_custom=False):
             raise ValueError("must be a Statement, TLP Marking or a registered marking.")
 
 
-class MarkingDefinition(_STIXBase21, _MarkingsMixin):
+class MarkingDefinition(_MetaObject, _MarkingsMixin):
     """For more detailed information on this object's properties, see
     `the STIX 2.1 specification <https://docs.oasis-open.org/cti/stix/v2.1/os/stix-v2.1-os.html#_k5fndj2c7c1k>`__.
     """