Merge pull request #89 from Cyb3rWard0g/master

Update Jupyter Notebooks and Enhance Navigator Export Function
OTRF · Dec 21, 2024 · 046ad25 · 046ad25
2 parents d05ce53 + 3bcc81e
commit 046ad25
Show file tree

Hide file tree

Showing 16 changed files with 10,719 additions and 7,417 deletions.
diff --git a/attackcti/attack_api.py b/attackcti/attack_api.py
@@ -2281,11 +2281,11 @@ def export_groups_navigator_layers(self):
                     actor_layer = {
                         "description": ("Enterprise techniques used by {0}, ATT&CK group {1} v1.0".format(k,v[0]['group_id'])),
                         "name": ("{0} ({1})".format(k,v[0]['group_id'])),
-                        "domain": "mitre-enterprise",
+                        "domain": "enterprise-attack",
                         "versions": {
-                            "attack": "10",
-                            "navigator": "4.5.5",
-                            "layer": "4.3"
+                            "attack": "16",
+                            "navigator": "5.1.0",
+                            "layer": "4.5"
                         },
                         "techniques": [
                             {

diff --git a/docs/playground/0-Download-ATTACK-STIX-Data.ipynb b/docs/playground/0-Download-ATTACK-STIX-Data.ipynb
@@ -55,12 +55,12 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Downloaded enterprise-attack.json to downloads/v15.1\n"
+      "Downloaded enterprise-attack.json to downloads/v16.1\n"
      ]
     }
    ],
    "source": [
-    "stix20_downloader.download_attack_data(domain=\"enterprise\", release=\"15.1\")"
+    "stix20_downloader.download_attack_data(domain=\"enterprise\", release=\"16.1\")"
    ]
   },
   {
@@ -95,12 +95,12 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Downloaded mobile-attack.json to downloads/v15.1\n"
+      "Downloaded mobile-attack.json to downloads/v16.1\n"
      ]
     }
    ],
    "source": [
-    "stix21_downloader.download_attack_data(domain=\"mobile\", release=\"15.1\")"
+    "stix21_downloader.download_attack_data(domain=\"mobile\", release=\"16.1\")"
    ]
   },
   {
@@ -111,7 +111,7 @@
     {
      "data": {
       "text/plain": [
-       "'downloads/v15.1/mobile-attack.json'"
+       "'downloads/v16.1/mobile-attack.json'"
       ]
      },
      "execution_count": 6,
@@ -131,7 +131,7 @@
     {
      "data": {
       "text/plain": [
-       "{'mobile': 'downloads/v15.1/mobile-attack.json'}"
+       "{'mobile': 'downloads/v16.1/mobile-attack.json'}"
       ]
      },
      "execution_count": 7,
@@ -183,7 +183,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -192,7 +192,7 @@
        "187"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -210,7 +210,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -219,39 +219,46 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Downloaded enterprise-attack.json to downloads/v15.1\n",
-      "Downloaded mobile-attack.json to downloads/v15.1\n",
-      "Downloaded ics-attack.json to downloads/v15.1\n"
+      "Downloaded enterprise-attack.json to downloads/v16.1\n",
+      "Downloaded mobile-attack.json to downloads/v16.1\n",
+      "Downloaded ics-attack.json to downloads/v16.1\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "{'enterprise': 'downloads/v15.1/enterprise-attack.json',\n",
-       " 'mobile': 'downloads/v15.1/mobile-attack.json',\n",
-       " 'ics': 'downloads/v15.1/ics-attack.json'}"
+       "{'enterprise': 'downloads/v16.1/enterprise-attack.json',\n",
+       " 'mobile': 'downloads/v16.1/mobile-attack.json',\n",
+       " 'ics': 'downloads/v16.1/ics-attack.json'}"
       ]
      },
-     "execution_count": 13,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "stix20_downloader.download_all_domains(release=\"15.1\")"
+    "stix20_downloader.download_all_domains(release=\"16.1\")"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": ".venv",
    "language": "python",
    "name": "python3"
   },
@@ -265,7 +272,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.1"
+   "version": "3.13.0"
   }
  },
  "nbformat": 4,

diff --git a/docs/playground/1-Collect_All_Functions.ipynb b/docs/playground/1-Collect_All_Functions.ipynb
diff --git a/docs/playground/10-Export_All_Techniques_To_YAML.ipynb b/docs/playground/10-Export_All_Techniques_To_YAML.ipynb
diff --git a/docs/playground/11-Initialize_Client_Local_STIX_data.ipynb b/docs/playground/11-Initialize_Client_Local_STIX_data.ipynb
diff --git a/docs/playground/2-Collect_Matrix_Specific_Functions.ipynb b/docs/playground/2-Collect_Matrix_Specific_Functions.ipynb