Merge branch 'develop' into detections-updates

Author: clemiller

.github/workflows/gh-pages.yml

@@ -50,7 +50,7 @@ jobs:
           INCLUDE_OSANO: true
 
       - name: Cleanup build
-        run: rm -rf attack-versions
+        run: rm -rf attack-version-archives
 
       - name: Remove STIX directory
         run: rm -rf output/stix/

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v4.3.0 (2025-09-25)
+
+## Features
+
+* Update versions module to speed up how previous versions are created
+* Previous versions of website only archive ATT&CK object pages and redirect Resource pages to the latest version
+* Add Excel file table to ATT&CK data and tools for easier access to previous versions
+
 # v4.2.3 (2025-05-06)
 
 ## Features

modules/resources/templates/attack-data-and-tools.html

@@ -320,21 +320,76 @@ <h3 class="mt-5">ATT&amp;CK in Excel</h3>
               <h5 class="fw-bold mb-3" style="font-size:1.1rem;">ATT&CK Excel Files by Version</h5>
               <ul class="nav nav-tabs mb-2" role="tablist">
                 {% set versions = parsed.excel_files_by_version.keys()|list %}
-                {% for version in versions %}
-                  {% if loop.first %}
-                    <li class="nav-item">
-                      <a class="nav-link active" id="tab-{{ version|replace('.', '-') }}" data-toggle="tab" href="#pane-{{ version|replace('.', '-') }}" role="tab" aria-controls="pane-{{ version|replace('.', '-') }}" aria-selected="true">
-                        {{ version }}
-                      </a>
-                    </li>
-                  {% else %}
-                    <li class="nav-item">
-                      <a class="nav-link" id="tab-{{ version|replace('.', '-') }}" data-toggle="tab" href="#pane-{{ version|replace('.', '-') }}" role="tab" aria-controls="pane-{{ version|replace('.', '-') }}" aria-selected="false">
-                        {{ version }}
-                      </a>
-                    </li>
-                  {% endif %}
-                {% endfor %}
+                {% set visible_count = 3 %}
+                {% if versions|length <= visible_count %}
+                  {% for version in versions %}
+                    {% if loop.first %}
+                      <li class="nav-item">
+                        <a class="nav-link active" id="tab-{{ version|replace('.', '-') }}" data-toggle="tab" href="#pane-{{ version|replace('.', '-') }}" role="tab" aria-selected="true">
+                          {{ version }}
+                        </a>
+                      </li>
+                    {% else %}
+                      <li class="nav-item">
+                        <a class="nav-link" id="tab-{{ version|replace('.', '-') }}" data-toggle="tab" href="#pane-{{ version|replace('.', '-') }}" role="tab" aria-selected="false">
+                          {{ version }}
+                        </a>
+                      </li>
+                    {% endif %}
+                  {% endfor %}
+                {% else %}
+                  {% for version in versions[:visible_count] %}
+                    {% if loop.first %}
+                      <li class="nav-item">
+                        <a class="nav-link active" id="tab-{{ version|replace('.', '-') }}" data-toggle="tab" href="#pane-{{ version|replace('.', '-') }}" role="tab" aria-selected="true">
+                          {{ version }}
+                        </a>
+                      </li>
+                    {% else %}
+                      <li class="nav-item">
+                        <a class="nav-link" id="tab-{{ version|replace('.', '-') }}" data-toggle="tab" href="#pane-{{ version|replace('.', '-') }}" role="tab" aria-selected="false">
+                          {{ version }}
+                        </a>
+                      </li>
+                    {% endif %}
+                  {% endfor %}
+                  <li class="nav-item dropdown">
+                    <!-- Localized override for the "Older versions" dropdown so it looks like a page-level dropdown
+                         rather than inheriting the top navigation (.nav/.navbar) styles in style-attack.css.
+                         We intentionally scope the CSS here (template-only change) and add an extra class on
+                         the dropdown menu. -->
+                    <style>
+                      /* Scoped to this dropdown; uses !important to override global navbar rules */
+                      .older-versions-dropdown {
+                        background-color: white !important;
+                        box-shadow: 0 8px 16px rgba(0,0,0,0.08);
+                      }
+                      .older-versions-dropdown .dropdown-item {
+                        color: #39434c !important;
+                      }
+                      .older-versions-dropdown .dropdown-item.active {
+                        background-color: white !important;
+                      }
+                      .older-versions-dropdown .dropdown-item:hover,
+                      .older-versions-dropdown .dropdown-item:focus {
+                        color: #4f7cac !important;
+                      }
+                    </style>
+
+                    <a class="nav-link dropdown-toggle" id="older-versions-dropdown" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                      Older versions
+                    </a>
+                    <ul class="dropdown-menu older-versions-dropdown" aria-labelledby="older-versions-dropdown">
+                      {% for version in versions[visible_count:] %}
+                        <li>
+                          <a class="dropdown-item" id="tab-{{ version|replace('.', '-') }}" data-toggle="tab" href="#pane-{{ version|replace('.', '-') }}" role="tab" aria-selected="false">
+                            {{ version }}
+                          </a>
+                        </li>
+                      {% endfor %}
+                    </ul>
+                  </li>
+                {% endif %}
               </ul>
               <div class="tab-content card card-body p-3" style="background: #f8f9fa;">
                 {% for version in versions %}
@@ -371,5 +426,32 @@ <h5 class="fw-bold mb-3" style="font-size:1.1rem;">ATT&CK Excel Files by Version
 {% block scripts %}
 {{ super() }}
 <!--SCRIPTS-->
+
+<!-- Script to manage active states for dropdown tabs -->
+<script>
+$(document).ready(function() {
+    // Handle tab switching for all tabs (including dropdown items)
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+    var activeTab = $(e.target);
+    var previousTab = $(e.relatedTarget);
+
+    // Remove active class from all dropdown items
+    $('.dropdown-item[data-toggle="tab"]').removeClass('active');
+
+    // If the newly active tab is a dropdown item, add active class
+    if (activeTab.hasClass('dropdown-item')) {
+        activeTab.addClass('active');
+    }
+
+    });
+
+    // Optional: Close dropdown when an item is clicked
+    $('.dropdown-item[data-toggle="tab"]').on('click', function() {
+    $(this).closest('.dropdown').removeClass('show');
+    $(this).closest('.dropdown-menu').removeClass('show');
+    });
+});
+</script>
+
 <script src="/theme/scripts/sidebar-load-all.js"></script>
 {% endblock %}

modules/techniques/techniques.py

@@ -88,16 +88,17 @@ def generate_domain_markdown(domain, techniques_no_sub, tactics, side_nav_data,
             md_file.write(subs)
 
         # Create the markdown for techniques in the STIX
+        datasource_of = util.relationshipgetters.get_datasource_of()
         for technique in techniques_no_sub[domain]:
             if "revoked" not in technique or technique["revoked"] is False:
-                generate_technique_md(technique, domain, side_nav_data, tactics[domain], notes)
+                generate_technique_md(technique, domain, side_nav_data, tactics[domain], notes, datasource_of)
 
         return True
 
     return False
 
 
-def generate_technique_md(technique, domain, side_nav_data, tactic_list, notes):
+def generate_technique_md(technique, domain, side_nav_data, tactic_list, notes, datasource_of):
     """Generetes markdown data for given technique."""
     attack_id = util.buildhelpers.get_attack_id(technique)
 
@@ -117,7 +118,7 @@ def generate_technique_md(technique, domain, side_nav_data, tactic_list, notes):
         technique_dict["subtechniques"] = get_subtechniques(technique)
 
         # Generate data for technique
-        technique_dict = generate_data_for_md(technique_dict, technique, tactic_list)
+        technique_dict = generate_data_for_md(technique_dict=technique_dict, technique=technique, tactic_list=tactic_list, datasource_of=datasource_of)
 
         subs = techniques_config.technique_md.substitute(technique_dict)
         path = technique_dict["attack_id"]
@@ -143,7 +144,7 @@ def generate_technique_md(technique, domain, side_nav_data, tactic_list, notes):
                 sub_tech_dict["parent_name"] = technique.get("name")
                 sub_tech_dict["subtechniques"] = technique_dict["subtechniques"]
 
-                sub_tech_dict = generate_data_for_md(sub_tech_dict, subtechnique["object"], tactic_list, True)
+                sub_tech_dict = generate_data_for_md(technique_dict=sub_tech_dict, technique=subtechnique["object"], tactic_list=tactic_list, is_sub_technique=True, datasource_of=datasource_of)
 
                 if sub_tech_dict.get("sub_number"):
                     subs = techniques_config.sub_technique_md.substitute(sub_tech_dict)
@@ -158,7 +159,7 @@ def generate_technique_md(technique, domain, side_nav_data, tactic_list, notes):
                         md_file.write(subs)
 
 
-def generate_data_for_md(technique_dict, technique, tactic_list, is_sub_technique=False):
+def generate_data_for_md(technique_dict, technique, tactic_list, is_sub_technique=False, datasource_of=None):
     """Given a technique or subtechnique, fill technique dictionary to create markdown file."""
     technique_dict["name"] = technique.get("name")
 
@@ -266,10 +267,10 @@ def generate_data_for_md(technique_dict, technique, tactic_list, is_sub_techniqu
                 technique_dict["eff_perms"] = ", ".join(technique["x_mitre_effective_permissions"])
 
             # Get data sources and components
-            # (
-            #     technique_dict["datasources"],
-            #     technique_dict["show_descriptions"],
-            # ) = get_datasources_and_components_of_technique(technique, reference_list)
+            (
+                technique_dict["datasources"],
+                technique_dict["show_descriptions"],
+            ) = get_datasources_and_components_of_technique(technique, reference_list, datasource_of)
 
             # Get if technique supports remote
             if technique.get("x_mitre_remote_support"):
@@ -341,9 +342,11 @@ def generate_data_for_md(technique_dict, technique, tactic_list, is_sub_techniqu
 
 
 def get_mitigations_table_data(technique, reference_list):
-    """Given a technique a reference list, find mitigations that mitigate
-    technique and return list with mitigation data. Also modifies the
-    reference list if it finds a reference that is not on the list
+    """Given a technique and a reference list, return mitigation data.
+
+    Find mitigations that mitigate the technique and return a list with mitigation
+    data. Also modifies the reference list if it finds a reference that is not
+    on the list.
     """
     mitigation_data = []
 
@@ -373,9 +376,11 @@ def get_mitigations_table_data(technique, reference_list):
 
 
 def get_assets_table_data(technique, reference_list):
-    """Given a technique a reference list, find assets that are targeted by the
-    technique and return list with asset data. Also modifies the
-    reference list if it finds a reference that is not on the list
+    """Return asset data for a technique.
+
+    Given a technique and a reference list, find assets targeted by the
+    technique and return a list with asset data. Also modify the reference
+    list if a relationship reference is not present in the list.
     """
     asset_data = []
 
@@ -407,9 +412,10 @@ def get_assets_table_data(technique, reference_list):
 
 
 def get_examples_table_data(technique, reference_list):
-    """Given a technique object, find examples in malware using technique,
-    tools using technique and groups using technique. Return list with
-    example data
+    """Return example data for a technique.
+
+    Find malware, tools, groups, and campaigns that use the technique and
+    return a list with example data.
     """
     # Creating map to avoid repeating the code multiple times
     examples_map = [
@@ -451,7 +457,7 @@ def get_examples_table_data(technique, reference_list):
 
 
 def get_path_from_type(object):
-    """Given an object, return the path"""
+    """Return the path for an object."""
     path_map = {"intrusion-set": "groups", "malware": "software", "tool": "software", "campaign": "campaigns"}
     return path_map[object.get("type")]
 
@@ -528,7 +534,7 @@ def get_technique_side_nav_data(techniques, tactics):
 
 
 def get_techniques_list(techniques):
-    """This method is used to generate a list of techniques."""
+    """Generate a list of techniques."""
     technique_list = {}
 
     for technique in techniques:
@@ -584,9 +590,10 @@ def get_subtechniques(technique):
     return sorted(subtechs, key=lambda k: k["id"])
 
 
-def get_datasources_and_components_of_technique(technique, reference_list):
-    """Given a technique object, find data sources and components
-    detecting the technique. Returns list with the following structure
+def get_datasources_and_components_of_technique(technique, reference_list, datasource_of):
+    """Return data sources and components that detect a technique.
+
+    Returns a list with the following structure:
 
     For each data source:
     Data Source ATT&CK ID
@@ -598,20 +605,22 @@ def get_datasources_and_components_of_technique(technique, reference_list):
     datasource_and_components = []
 
     datacomponents_of_technique = util.relationshipgetters.get_datacomponents_detecting_technique().get(technique["id"])
-    datasource_of = util.relationshipgetters.get_datasource_of()
 
     show_descriptions = False
 
     if datacomponents_of_technique:
         datasources_data = {}
         for datacomponent in datacomponents_of_technique:
             datasource = datasource_of.get(datacomponent["object"]["id"])
+            # If datasource lookup failed, skip this datacomponent
+            if not datasource:
+                continue
             datasource_attack_id = util.buildhelpers.get_attack_id(datasource)
             if datasource_attack_id:
                 if not datasources_data.get(datasource_attack_id):
                     datasources_data[datasource_attack_id] = {}
                     datasources_data[datasource_attack_id]["attack_id"] = datasource_attack_id
-                    datasources_data[datasource_attack_id]["name"] = datasource["name"]
+                    datasources_data[datasource_attack_id]["name"] = datasource.get("name")
                     datasources_data[datasource_attack_id]["datacomponents"] = []
 
                 datacomponent_data = {}