Merge branch 'master' into release/current

Author: lndrtrbn

pycti/__init__.py

@@ -65,9 +65,11 @@
     CustomObservableBankAccount,
     CustomObservableCredential,
     CustomObservableCryptocurrencyWallet,
+    CustomObservableCryptographicKey,
     CustomObservableHostname,
     CustomObservableMediaContent,
     CustomObservablePaymentCard,
+    CustomObservablePersona,
     CustomObservablePhoneNumber,
     CustomObservableText,
     CustomObservableTrackingNumber,
@@ -149,8 +151,10 @@
     "CustomObservableHostname",
     "CustomObservableUserAgent",
     "CustomObservableBankAccount",
+    "CustomObservableCryptographicKey",
     "CustomObservableCryptocurrencyWallet",
     "CustomObservablePaymentCard",
+    "CustomObservablePersona",
     "CustomObservablePhoneNumber",
     "CustomObservableTrackingNumber",
     "CustomObservableText",

pycti/utils/constants.py

@@ -454,3 +454,44 @@ class CustomObservableMediaContent:
     """Media-Content observable."""
 
     pass
+
+
+@CustomObservable(
+    "persona",
+    [
+        ("persona_name", StringProperty(required=True)),
+        ("persona_type", StringProperty(required=True)),
+        ("spec_version", StringProperty(fixed="2.1")),
+        (
+            "object_marking_refs",
+            ListProperty(
+                ReferenceProperty(valid_types="marking-definition", spec_version="2.1")
+            ),
+        ),
+    ],
+    ["persona_name", "persona_type"],
+)
+class CustomObservablePersona:
+    """Persona observable."""
+
+    pass
+
+
+@CustomObservable(
+    "cryptographic-key",
+    [
+        ("value", StringProperty(required=True)),
+        ("spec_version", StringProperty(fixed="2.1")),
+        (
+            "object_marking_refs",
+            ListProperty(
+                ReferenceProperty(valid_types="marking-definition", spec_version="2.1")
+            ),
+        ),
+    ],
+    ["value"],
+)
+class CustomObservableCryptographicKey:
+    """Cryptographic-Key observable."""
+
+    pass