merge develop

.gitignore

@@ -15,10 +15,11 @@ output/
 reports/
 
 attack-theme/templates/general/base.html
-attack-theme/templates/contribute
+attack-theme/templates/benefactors
 attack-theme/templates/datasources
 attack-theme/templates/groups
 attack-theme/templates/campaigns
+attack-theme/templates/assets
 attack-theme/templates/matrices
 attack-theme/templates/mitigations
 attack-theme/templates/resources

CHANGELOG.md

@@ -1,6 +1,16 @@
 
 <!-- TOWNCRIER -->
 
+# v4.0.5 (2023-09-01)
+
+## Features
+
+* The sidebar is now collapsable and displayed properly in mobile view [#450](https://github.com/mitre-attack/attack-website/issues/450)
+
+## Bugfixes
+
+* Changed the UUID generation logic to use CONTENT_VERSION and WEBSITE_VERSION as seeds for idempotent UUID creation. This prevents the creation of redundant IndexedDB tables. [#455](https://github.com/mitre-attack/attack-website/issues/455)
+
 # v4.0.4 (2023-08-11)
 
 ## Features

attack-search/src/settings.js

@@ -2,6 +2,7 @@ const baseURL = ''; // TODO migrate from base_url (generated via Pelican)
 
 const searchFilePaths = [
     "campaigns.json",
+    "assets.json",
     "datasources.json",
     "groups.json",
     "matrices.json",

attack-theme/static/scripts/sidebar-load-all.js

@@ -1,5 +1,8 @@
 let mod_name = window.location.pathname.split("/")
 let mod_entry = "/" + mod_name[1] + "/sidebar-" + mod_name[1]
+if (mod_name.includes('contact')){
+    mod_entry = "/" + "resources/sidebar-resources"
+}
 $("#sidebars").load(mod_entry, function() {
     var navElements = document.querySelectorAll('.sidenav-head > a');
     var winlocation;

attack-theme/static/style/_layouts.scss

@@ -595,9 +595,9 @@ pre {
 /*TWITTER*/
 // twitter container in the home page
 .attack-box {
-    width: to-rem(350);
+    width: to-rem(384);
     max-width: 100%;
-    height: to-rem(450);
+    height: to-rem(464);
     margin: 0 auto;
     border: 3px solid #dfdfdf;
     padding: 3px;
@@ -1146,6 +1146,10 @@ div#sidebars {
     }
 }
 
+.contact-center {
+    margin-block-start: 20vh;
+}
+
 /*Card Blocks*/
 // container of groups of cards
 .expand-panel {

attack-theme/templates/general/attack-index.html

@@ -64,11 +64,11 @@
                     </div>
                     <div class="col">
                         <div class="attack-box">
-                            <img width="100%" height="50%" src="/theme/images/ATTACKCon-4.png">
+                            <img width="100%" height="50%" src="/theme/images/ATTACKCon-4.png" alt="ATT&CKcon 4.0">
                                 <center>
                                     <hr>
                                     <h2 class="attack-box-heading">
-                                        ATT&amp;CKcon 4.0 will be held on <strong>Oct 24-25</strong> in McLean, VA. 
+                                        ATT&amp;CKcon 4.0 will be held on <strong>Oct 24-25</strong> in McLean, VA.
                                         <br>
                                         <a href="https://na.eventscloud.com/attackcon4/">Click here</a> for more details and to register.
                                     </h2>

attack-theme/templates/general/intro-overview.html

@@ -8,16 +8,23 @@
 {% endblock %}
 
 {% block innerright %}
-{{ super () }}
-            <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="/">Home</a></li>
-                <li class="breadcrumb-item"><a href="/resources/">Resources</a></li>
-                <li class="breadcrumb-item">{{ page.title }}</li>
-            </ol>
-            <div class="blog-post p-3">
-                <h1 class="blog-post-title mb-4">{{ page.title }}</h1>
+<div class="px-3">
+    <ol class="breadcrumb">
+        <li class="breadcrumb-item"><a href="/">Home</a></li>
+        <li class="breadcrumb-item"><a href="/resources/">Resources</a></li>
+        <li class="breadcrumb-item">{{ page.title }}</li>
+    </ol>
+</div>
+<div class="container pb-3 uniform-block">
+    <div class="card-block">
+        <div class="clearfix pb-3">
+            <div class="clearfix pb-3">
+                <h2>{{ page.title }}</h2>
                     {{ page.content }}
             </div>
+        </div>
+    </div>
+</div>
 {% endblock %}
 
 {% block scripts %}

attack-theme/templates/macros/navigation_menu.html

@@ -48,7 +48,7 @@
     <div class="dropdown-menu {% if last %} dropdown-menu-right {% endif %}" aria-labelledby="navbarDropdown">
         {% for child in element.children %}
             {% if child.children %}
-                {{has_child(child)}}
+                {{child_has_child(child)}}
             {% elif child.external_link %}
                 {{external_link(child)}}
             {% else %}
@@ -57,4 +57,19 @@
         {% endfor %}
     </div>
 
+{% endmacro %}
+
+{% macro child_has_child(element) %}
+
+<div class="dropright dropdown">
+<a class="dropdown-item dropdown-toggle" href="{{ element.url }}" id="navbarDropdown" role="button"
+    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <b>{{ element.display_name }}</b>
+    </a>
+    <div class="dropdown-menu {% if last %} dropdown-menu-right {% endif %}" aria-labelledby="navbarDropdown">
+        {% for child in element.children %}
+            <a class="dropdown-item" href="{{child.url}}">{{ child.display_name }}</a>
+        {% endfor %}
+    </div>
+</div>
 {% endmacro %}

data/attackcon.json

@@ -375,10 +375,10 @@
         {
             "title": "What’s New with ATT&CK for Cloud?",
             "presenters": [{
-                "names": ["Jen Burns"],
+                "names": ["Jack Burns"],
                 "organization": "MITRE"
             }],
-            "description": "Jen Burns is a Lead Cybersecurity Engineer at MITRE and the Lead for MITRE ATT&CK for Cloud. She’s also a red team developer and lead for ATT&CK Evaluations, using her skills in software engineering and adversary emulation. Previously, she was a tech lead at HubSpot on the Infrastructure Security team where she focused on red teaming and building detections in the cloud environment. This presentation is from the MITRE ATT&Ckcon Power Hour session held on October 9, 2020.",
+            "description": "Jack Burns is a Lead Cybersecurity Engineer at MITRE and the Lead for MITRE ATT&CK for Cloud. He’s also a red team developer and lead for ATT&CK Evaluations, using his skills in software engineering and adversary emulation. Previously, he was a tech lead at HubSpot on the Infrastructure Security team where he focused on red teaming and building detections in the cloud environment. This presentation is from the MITRE ATT&Ckcon Power Hour session held on October 9, 2020.",
             "video": "https://www.youtube.com/watch?v=a-xs5VqlcKI&list=PLkTApXQou_8KKl3fOIPKD_9pNpmSe1TKu&index=24",
             "slides": "https://www.slideshare.net/attackcon2018/whats-new-with-attck-for-cloud"
         },
@@ -1139,4 +1139,4 @@
             "slides": "https://www.slideshare.net/attackcon2018/mitre-attckcon-2018-the-use-of-game-theory-with-mitre-attck-matt-summers-and-nick-dunn-ncc-group"
         }
     ]
-}]
+}]

data/resources_navigation.json

@@ -14,6 +14,12 @@
       "path": "/resources/getting-started/",
       "children": []
     },
+    {
+      "name": "Contribute",
+      "id": "contribute",
+      "path": "/resources/contribute/",
+      "children": []
+    },
     {
       "name": "Training",
       "id": "training",
@@ -69,6 +75,12 @@
       "path": "/resources/brand/",
       "children": []
     },
+    {
+      "name": "Benefactors",
+      "id": "benefactors",
+      "path": "/resources/benefactors/",
+      "children": []
+    },
     {
       "name": "Privacy Policy",
       "id": "privacy",
@@ -86,6 +98,12 @@
       "id": "changelog",
       "path": "/resources/changelog.html",
       "children": []
+    },
+    {
+      "name": "Contact",
+      "id": "contact",
+      "path": "/contact/",
+      "children": []
     }
   ]
 }

modules/assets/__init__.py

@@ -0,0 +1,9 @@
+from . import assets
+from . import assets_config
+
+
+def get_priority():
+    return assets_config.priority
+
+def run_module():
+    return (assets.generate_assets(), assets_config.module_name)