{% for version in versions %}
{% set domains = parsed.excel_files_by_version[version] %}
ATT&CK Excel Files by Version
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/modules/resources/templates/attackcon-overview.html b/modules/resources/templates/attackcon-overview.html
index fb7e3d13a9a..bd5e5339e98 100644
--- a/modules/resources/templates/attackcon-overview.html
+++ b/modules/resources/templates/attackcon-overview.html
@@ -25,8 +25,11 @@
{{ con.title }}
{% set ifSponsor = "sponsors_img_list" in con %}
{% if "banner_img" in con %}
- 
+ {% set light_banner_titles = ["ATT&CKcon 4.0", "ATT&CKcon 5.0", "ATT&CKcon 6.0", "ATT&CKcon 7.0"] %}
+
+
+
{% endif %}
diff --git a/modules/search/search.py b/modules/search/search.py
index 92bd2b746de..bd100e9bf38 100644
--- a/modules/search/search.py
+++ b/modules/search/search.py
@@ -28,7 +28,9 @@
"x-mitre-asset": "assets",
"x-mitre-data-component": "datacomponents",
"x-mitre-detection-strategy": "detectionstrategies",
+ "x-mitre-tactic": "tactics",
}
+attack_id_path_prefixes = set(object_path_prefixes.values()) | {"techniques"}
def generate_index():
@@ -64,6 +66,7 @@ def generate_index():
"title": title,
"path": path,
"content": cleancontent,
+ "attackId": get_search_attack_id(path),
"pageType": file_type,
"domains": get_domains(title, path, domain_lookup),
}
@@ -136,6 +139,19 @@ def should_skip_search_path(path):
return bool(re.search(r"/sidebar-[^/]+/index\.html$", path))
+def get_search_attack_id(path):
+ """Return the ATT&CK ID represented by a canonical object detail-page path."""
+ subtechnique_match = re.fullmatch(r"/techniques/(T\d+)/(\d{3})/index\.html", path)
+ if subtechnique_match:
+ return f"{subtechnique_match.group(1)}.{subtechnique_match.group(2)}"
+
+ object_match = re.fullmatch(r"/([^/]+)/([A-Z]+\d+(?:\.\d+)?)/index\.html", path)
+ if object_match and object_match.group(1) in attack_id_path_prefixes:
+ return object_match.group(2)
+
+ return None
+
+
def get_domains(title, path=None, domain_lookup=None):
"""Get ATT&CK domains for a search result, preferring source metadata before title inference."""
if path and domain_lookup and path in domain_lookup:
diff --git a/modules/site_config.py b/modules/site_config.py
index cd9ae7160a3..bdfa4d0d18b 100644
--- a/modules/site_config.py
+++ b/modules/site_config.py
@@ -9,7 +9,7 @@
load_dotenv()
attack_version = ""
-website_version = "5.0.0"
+website_version = "5.1.0"
# Read versions file for ATT&CK version
with open("data/versions.json", "r", encoding="utf8") as f:
diff --git a/modules/stixtests/stixtests.py b/modules/stixtests/stixtests.py
index a619414ae61..824148a4a7d 100644
--- a/modules/stixtests/stixtests.py
+++ b/modules/stixtests/stixtests.py
@@ -36,16 +36,10 @@ def run_tests():
logger.debug(f"Skipping validation for {domain['name']} because it is deprecated")
continue
- # TODO: refactor this to use a function rather than copy/paste from modules/util/stixhelpers.py
- # this can be used because it was called previously in modules/util/stixhelpers.py to download the file
- if domain["location"].startswith("http"):
- download_dir = Path(f"{site_config.web_directory}/stix")
- stix_filename = f"{download_dir}/{domain['name']}.json"
- else:
- stix_filename = domain["location"]
+ stix_filename = util.stixhelpers.get_stix_file_path(domain["name"])
logger.info(f"Validating STIX for domain: {domain['name']}")
- results = stix2validator.validate_file(fn=stix_filename, options=options)
+ results = stix2validator.validate_file(fn=str(stix_filename), options=options)
if results.is_valid:
logger.info(f"File {stix_filename} is valid")
else:
diff --git a/modules/util/stixhelpers.py b/modules/util/stixhelpers.py
index b8635f31249..befaf8a234a 100644
--- a/modules/util/stixhelpers.py
+++ b/modules/util/stixhelpers.py
@@ -482,23 +482,20 @@ def get_stix_memory_stores():
ms = {}
srcs = []
- stix_output_dir = Path(f"{site_config.web_directory}/stix")
- stix_output_dir.mkdir(parents=True, exist_ok=True)
-
for domain in site_config.domains:
- stix_filename = None
logger.info(f"Loading {domain['name']} domain STIX from: {domain['location']}")
# Download json from http or https
- stix_filename = f"{stix_output_dir}/{domain['name']}.json"
+ stix_filename = get_stix_file_path(domain_name=domain["name"])
+ stix_filename.parent.mkdir(parents=True, exist_ok=True)
if domain["location"].startswith("http"):
- download_stix_file(url=domain["location"], filepath=stix_filename)
+ download_stix_file(url=domain["location"], filepath=str(stix_filename))
else:
shutil.copy(domain["location"], str(stix_filename))
if os.path.exists(stix_filename):
ms[domain["name"]] = stix2.MemoryStore()
- ms[domain["name"]].load_from_file(stix_filename)
+ ms[domain["name"]].load_from_file(str(stix_filename))
else:
logger.error(f"\n{stix_filename} file does not exist.")
exit()
@@ -509,6 +506,11 @@ def get_stix_memory_stores():
return ms, srcs
+def get_stix_file_path(domain_name: str) -> Path:
+ """Return the path where a domain's STIX bundle is materialized."""
+ return Path(site_config.web_directory) / "stix" / f"{domain_name}.json"
+
+
def get_contributors(ms):
"""Get all contributors in the STIX content."""
# contributors not in STIX are stored here:
diff --git a/modules/versions/versions.py b/modules/versions/versions.py
index 3f579cf4d9a..0552b84566c 100644
--- a/modules/versions/versions.py
+++ b/modules/versions/versions.py
@@ -185,18 +185,39 @@ def deploy_previous_version(version_data):
if os.path.exists(archive_path):
logger.info(f"{version_name}: extracting from local archive {archive_filename}")
- extract_tar_gz(archive_path=archive_path, dest_path=dest_path)
- return
-
- if download_archive(url=archive_url, local_path=archive_path):
+ elif download_archive(url=archive_url, local_path=archive_path):
logger.info(f"{version_name}: extracting downloaded archive {archive_filename}")
- extract_tar_gz(archive_path=archive_path, dest_path=dest_path)
- return
-
- # this saves the cleaned up version archive for the future
- logger.warning(f"{version_name}: download failed, falling back to git archive")
- create_version_archive(version_data=version_data, output_dir=archive_dir)
+ else:
+ # This saves the cleaned up version archive for the future.
+ logger.warning(f"{version_name}: download failed, falling back to git archive")
+ create_version_archive(version_data=version_data, output_dir=archive_dir)
extract_tar_gz(archive_path=archive_path, dest_path=dest_path)
+ add_archive_theme(dest_path)
+
+
+def add_archive_theme(version_path: str) -> None:
+ """Add appearance support to deployed archived pages without changing the saved archive.
+
+ Parameters
+ ----------
+ version_path : str
+ Directory containing the extracted historical site.
+ """
+ prefix = "/" + site_config.subdirectory.strip("/") if site_config.subdirectory else ""
+ theme_assets = (
+ f'\n'
+ f'
\n'
+ )
+ for path in Path(version_path).rglob("*.html"):
+ if not path.is_file():
+ continue
+ html = path.read_text(encoding="utf8")
+ # Sidebar fragments and redirects have no banner. Newer archives may
+ # already have native theme support and must not receive a second UI.
+ if "version-banner" not in html or "data-archive-theme" in html or "data-theme-toggle" in html:
+ continue
+ html = re.sub(r"", lambda _: theme_assets + "", html, count=1, flags=re.IGNORECASE)
+ path.write_text(html, encoding="utf8")
def process_html_file(path: str, version_url_path: str, is_current: bool, version_data: dict):
diff --git a/test/README.md b/test/README.md
index 5b669ef59fb..154254231c2 100644
--- a/test/README.md
+++ b/test/README.md
@@ -9,33 +9,28 @@ This allows developers to catch and fix issues before pushing to GitHub Pages, t
Ensure you have the following installed on your local system:
- Docker
-- Node.js and npm
-- Python 3 and pip
+- [Just](https://just.systems/man/en/installation.html) 1.58.0 or newer
+- [uv](https://docs.astral.sh/uv/getting-started/installation/) and Python 3.13
+- Node.js 26 and npm
## Building the Web Application
-Before starting the Docker container, you need to build the static web content locally.
-The web application is composed of two modules: the Pelican content, and the ATT&CK search module.
+Before starting the Docker container, install dependencies and build from the
+repository root. Just is required for these local build commands:
-1. Generate the static web pages (i.e., the Pelican content) by running the following command from the root of the project:
-
- ```shell
- python3 update-attack.py --attack-brand \
- --all-extras \
- --no-test-exitstatus
- ```
-
- The static web content will be written to a folder called "output".
+```shell
+just install-deps
+just build-full-website --attack-brand --all-extras
+```
-2. Build the search module by running the following commands:
+Installation creates or reuses the root `.venv` and installs both npm packages.
+The build compiles and stages Search and Style, then generates the site in `output/`.
+For content-only changes, run `just build-website --attack-brand --all-extras`.
+The website targets use the Python generator's defaults unless you explicitly pass
+options. See the [developer guide](../docs/DEVELOPMENT.md) for setup and build options.
- ```shell
- cd attack-search
- npm ci
- npm run build
- cp dist/search_bundle.js ../output/theme/scripts/
- cd ..
- ```
+After changing anything in `attack-style/` or `attack-search/`, rebuild the affected
+assets and commit the generated files in `attack-theme/static/` alongside your changes.
## Using the Docker Test Environment