Merge pull request #508 from mitre-attack/develop

Develop
mitre-attack · Jul 18, 2024 · eca84b6 · eca84b6
2 parents a3fdf6f + b03bb55
commit eca84b6
Show file tree

Hide file tree

Showing 31 changed files with 1,937 additions and 173 deletions.
diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.10.11
+3.10.14
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
+# v4.1.5 (2024-07-18)
+
+## Misc
+
+* Added new ATT&CK trainings.
+* Moved sidebar headings around to add ATT&CKcon to be at the top level.
+
 # v4.1.4 (2024-06-19)
 
 ## Misc
 
-* Updated CTI Training to latest version
-* Updated banner related to ATT&CKcon 5.0
+* Updated CTI Training to latest version.
+* Updated banner related to ATT&CKcon 5.0.
 
 # v4.1.3 (2024-05-02)
 

diff --git a/data/attackcon.json b/data/attackcon.json
@@ -1,4 +1,11 @@
 [{
+    "date": "October 2024",
+    "title": "ATT&CKcon 5.0",
+    "description": "<p>On October 22 and 23, 2024, join fellow cyber professionals at MITRE ATT&CK’s headquarters in McLean, VA for two days of programming, featuring knowledgeable speakers, engaging content, and meaningful collaboration, all designed to help you leverage the ATT&CK framework.</p><p>To visit the registration portal, <a href=\"https://www.mitre.org/events/attackcon-5\">click here</a></p>",
+    "sponsors_img_list": [],
+    "presentations": []
+    },
+    {
     "date": "October 2023",
     "title": "ATT&CKcon 4.0",
     "description": "We are thrilled and express our gratitude to everyone who participated in ATT&CKcon 4.0!<br><br>This year we were privileged to have another range of speakers who shared their unique insights and experiences, further enriching the knowledge pool of our ATT&CK community. We invite you to continue to watch and share these insightful talks!<br><br><a target=\"_blank\" href=\"https://www.youtube.com/playlist?list=PLkTApXQou_8If8_fwdCKVnwHr0WaEnfSH\">Click here to explore the talks from ATT&CKcon 4.0 on our YouTube playlist!</a>",

diff --git a/data/resources_navigation.json b/data/resources_navigation.json
@@ -19,27 +19,69 @@
           "path": "/resources/learn-more-about-attack/presentation-archive/",
           "children": []
         },
-        {
-          "name": "ATT&CKcon Presentations",
-          "id": "attackcon",
-          "path": "/resources/learn-more-about-attack/attackcon/",
-          "children": []
-        },
         {
           "name": "Trainings",
           "id": "training",
           "path": "/resources/learn-more-about-attack/training/",
           "children": [
             {
-              "name": "CTI Training",
+              "name": "CTI",
               "id": "cti",
               "path": "/resources/learn-more-about-attack/training/cti/",
               "children": []
+            },
+            {
+              "name": "Purple Teaming Fundamentals",
+              "id": "purple_teaming_fundamentals",
+              "path": "/resources/learn-more-about-attack/training/purple-teaming-fundamentals/",
+              "children": []
+            },
+            {
+              "name": "ATT&CK Fundamentals",
+              "id": "attack_fundamentals",
+              "path": "/resources/learn-more-about-attack/training/attack-fundamentals/",
+              "children": []
+            },
+            {
+              "name": "Adversary Emulation",
+              "id": "adversary_emulation",
+              "path": "/resources/learn-more-about-attack/training/adversary-emulation/",
+              "children": []
+            },
+            {
+              "name": "Access Tokens Technical Primer",
+              "id": "access_tokens",
+              "path": "/resources/learn-more-about-attack/training/access-tokens/",
+              "children": []
+            },
+            {
+              "name": "SOC Assessments",
+              "id": "soc_assessments",
+              "path": "/resources/learn-more-about-attack/training/soc-assessments/",
+              "children": []
+            },
+            {
+              "name": "Threat Hunting",
+              "id": "threat_hunting",
+              "path": "/resources/learn-more-about-attack/training/threat-hunting/",
+              "children": []
+            },
+            {
+              "name": "Detection Engineering",
+              "id": "detection_engineering",
+              "path": "/resources/learn-more-about-attack/training/detection-engineering/",
+              "children": []
             }
           ]
         }
       ]
     },
+    {
+          "name": "ATT&CKcon",
+          "id": "attackcon",
+          "path": "/resources/attackcon/",
+          "children": []
+    },
     {
       "name": "ATT&CK Data & Tools",
       "id": "attack-data-and-tools",