converted bank-account & crypto-wallet to financial-account; added as…

…set & transaction
OpenCTI-Platform · May 30, 2024 · 093f0f4 · 093f0f4
1 parent c0c2665
commit 093f0f4
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 148 deletions.
diff --git a/docs/pycti/pycti.rst b/docs/pycti/pycti.rst
@@ -191,8 +191,14 @@ Classes
 - :py:class:`CustomObservableUserAgent`:
   User-Agent observable.
 
-- :py:class:`CustomObservableCryptocurrencyWallet`:
-  Cryptocurrency wallet observable.
+- :py:class:`CustomObservableFinancialAccount`:
+  Financial Account observable.
+
+- :py:class:`CustomObservableFinancialAsset`:
+  Financial Asset observable.
+
+- :py:class:`CustomObservableFinancialTransaction`:
+  Financial Transaction observable.
 
 - :py:class:`CustomObservableText`:
   Text observable.
@@ -590,11 +596,25 @@ Classes
    .. inheritance-diagram:: CustomObservableUserAgent
       :parts: 1
 
-.. autoclass:: CustomObservableCryptocurrencyWallet
+.. autoclass:: CustomObservableFinancialAccount
+   :members:
+
+   .. rubric:: Inheritance
+   .. inheritance-diagram:: CustomObservableFinancialAccount
+      :parts: 1
+
+.. autoclass:: CustomObservableFinancialAsset
+   :members:
+
+   .. rubric:: Inheritance
+   .. inheritance-diagram:: CustomObservableFinancialAsset
+      :parts: 1
+
+.. autoclass:: CustomObservableFinancialTransaction
    :members:
 
    .. rubric:: Inheritance
-   .. inheritance-diagram:: CustomObservableCryptocurrencyWallet
+   .. inheritance-diagram:: CustomObservableFinancialTransaction
       :parts: 1
 
 .. autoclass:: CustomObservableText

diff --git a/pycti/__init__.py b/pycti/__init__.py
@@ -53,9 +53,10 @@
 from .utils.constants import (
     CustomObjectCaseIncident,
     CustomObjectTask,
-    CustomObservableBankAccount,
     CustomObservableCredential,
-    CustomObservableCryptocurrencyWallet,
+    CustomObservableFinancialAccount,
+    CustomObservableFinancialAsset,
+    CustomObservableFinancialTransaction,
     CustomObservableHostname,
     CustomObservablePaymentCard,
     CustomObservablePhoneNumber,
@@ -132,16 +133,16 @@
     "get_config_variable",
     "CustomObjectCaseIncident",
     "CustomObjectTask",
-    "StixCyberObservableTypes",
     "CustomObservableCredential",
+    "CustomObservableFinancialAccount",
+    "CustomObservableFinancialAsset",
+    "CustomObservableFinancialTransaction",
     "CustomObservableHostname",
-    "CustomObservableUserAgent",
-    "CustomObservableBankAccount",
-    "CustomObservableCryptocurrencyWallet",
     "CustomObservablePaymentCard",
     "CustomObservablePhoneNumber",
     "CustomObservableTrackingNumber",
     "CustomObservableText",
+    "CustomObservableUserAgent",
     "STIX_EXT_MITRE",
     "STIX_EXT_OCTI_SCO",
     "STIX_EXT_OCTI",

diff --git a/pycti/entities/opencti_stix_core_object.py b/pycti/entities/opencti_stix_core_object.py
@@ -604,9 +604,6 @@ def __init__(self, opencti, file):
             ... on CryptographicKey {
                 value
             }
-            ... on CryptocurrencyWallet {
-                value
-            }
             ... on Hostname {
                 value
             }
@@ -616,11 +613,6 @@ def __init__(self, opencti, file):
             ... on UserAgent {
                 value
             }
-            ... on BankAccount {
-                iban
-                bic
-                account_number
-            }
             ... on PhoneNumber {
                 value
             }
@@ -643,6 +635,25 @@ def __init__(self, opencti, file):
                 url
                 publication_date
             }
+            ... on FinancialAccount {
+                account_number
+                account_status
+                account_type
+                iban_number
+                bic_number
+                currency_code
+            }
+            ... on FinancialAsset {
+                name
+                asset_type
+                asset_value
+                currency_code
+            }
+            ... on FinancialTransaction {
+                transaction_date
+                transaction_value
+                currency_code
+            }
         """
         self.properties_with_files = """
             id
@@ -1268,9 +1279,6 @@ def __init__(self, opencti, file):
             ... on CryptographicKey {
                 value
             }
-            ... on CryptocurrencyWallet {
-                value
-            }
             ... on Hostname {
                 value
             }
@@ -1280,11 +1288,6 @@ def __init__(self, opencti, file):
             ... on UserAgent {
                 value
             }
-            ... on BankAccount {
-                iban
-                bic
-                account_number
-            }
             ... on PhoneNumber {
                 value
             }
@@ -1301,6 +1304,25 @@ def __init__(self, opencti, file):
                 url
                 publication_date
             }
+            ... on FinancialAccount {
+                account_number
+                account_status
+                account_type
+                iban_number
+                bic_number
+                currency_code
+            }
+            ... on FinancialAsset {
+                name
+                asset_type
+                asset_value
+                currency_code
+            }
+            ... on FinancialTransaction {
+                transaction_date
+                transaction_value
+                currency_code
+            }
         """
 
     """