Skip to content

Commit

Permalink
Merge pull request #501 from mitre-attack/develop
Browse files Browse the repository at this point in the history
Update website for ATT&CK v15.1
  • Loading branch information
jondricek authored May 2, 2024
2 parents 403483a + d339f6d commit f0c6237
Show file tree
Hide file tree
Showing 11 changed files with 1,727 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ jobs:
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.ref == 'refs/heads/master' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
deploy_key: ${{ secrets.DEPLOY_KEY }}
publish_dir: ./output
cname: attack.mitre.org
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# v4.1.3 (2024-05-02)
---------------------

* Release ATT&CK content version 15.1.
See detailed changes [here](https://github.com/mitre/cti/releases/tag/ATT%26CK-v15.1).


# v4.1.2 (2024-04-23)
---------------------

Expand Down
4 changes: 2 additions & 2 deletions data/versions.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"current": {
"name": "v15.0",
"name": "v15.1",
"date_start": "April 23, 2024",
"changelog": "updates-april-2024",
"cti_url": "https://github.com/mitre/cti/releases/tag/ATT%26CK-v15.0"
"cti_url": "https://github.com/mitre/cti/releases/tag/ATT%26CK-v15.1"
},
"previous": [
{
Expand Down
215 changes: 215 additions & 0 deletions modules/resources/docs/changelogs/v15.0-v15.1/changelog-detailed.html

Large diffs are not rendered by default.

1,230 changes: 1,230 additions & 0 deletions modules/resources/docs/changelogs/v15.0-v15.1/changelog.json

Large diffs are not rendered by default.

160 changes: 160 additions & 0 deletions modules/resources/docs/changelogs/v15.0-v15.1/layer-enterprise.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{
"versions": {
"layer": "4.5",
"navigator": "5.0.0",
"attack": "15.1"
},
"name": "May 2024 Enterprise Updates",
"description": "Enterprise updates for the May 2024 release of ATT&CK",
"domain": "enterprise-attack",
"techniques": [
{
"techniqueID": "T1574.014",
"tactic": "persistence",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1574.014",
"tactic": "privilege-escalation",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1574.014",
"tactic": "defense-evasion",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1550.001",
"tactic": "defense-evasion",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1550.001",
"tactic": "lateral-movement",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1059.010",
"tactic": "execution",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1574.001",
"tactic": "persistence",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1574.001",
"tactic": "privilege-escalation",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1574.001",
"tactic": "defense-evasion",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1583.001",
"tactic": "resource-development",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1546.016",
"tactic": "privilege-escalation",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1546.016",
"tactic": "persistence",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1608.005",
"tactic": "resource-development",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1550",
"tactic": "defense-evasion",
"enabled": true,
"color": "#B99095",
"comment": "patche"
},
{
"techniqueID": "T1550",
"tactic": "lateral-movement",
"enabled": true,
"color": "#B99095",
"comment": "patche"
}
],
"sorting": 0,
"hideDisabled": false,
"legendItems": [
{
"color": "#a1d99b",
"label": "additions: ATT&CK objects which are only present in the new release."
},
{
"color": "#fcf3a2",
"label": "major_version_changes: ATT&CK objects that have a major version change. (e.g. 1.0 \u2192 2.0)"
},
{
"color": "#c7c4e0",
"label": "minor_version_changes: ATT&CK objects that have a minor version change. (e.g. 1.0 \u2192 1.1)"
},
{
"color": "#B5E5CF",
"label": "other_version_changes: ATT&CK objects that have a version change of any other kind. (e.g. 1.0 \u2192 1.2)"
},
{
"color": "#B99095",
"label": "patches: ATT&CK objects that have been patched while keeping the version the same. (e.g., 1.0 \u2192 1.0 but something like a typo, a URL, or some metadata was fixed)"
},
{
"color": "#ff9000",
"label": "revocations: ATT&CK objects which are revoked by a different object."
},
{
"color": "#ff6363",
"label": "deprecations: ATT&CK objects which are deprecated and no longer in use, and not replaced."
},
{
"color": "#ff00e1",
"label": "deletions: ATT&CK objects which are no longer found in the STIX data."
},
{
"color": "#ffffff",
"label": "unchanged: ATT&CK objects which did not change between the two versions."
}
],
"showTacticRowBackground": true,
"tacticRowBackground": "#205b8f",
"selectTechniquesAcrossTactics": true
}
54 changes: 54 additions & 0 deletions modules/resources/docs/changelogs/v15.0-v15.1/layer-ics.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"versions": {
"layer": "4.5",
"navigator": "5.0.0",
"attack": "15.1"
},
"name": "May 2024 ICS Updates",
"description": "ICS updates for the May 2024 release of ATT&CK",
"domain": "ics-attack",
"techniques": [],
"sorting": 0,
"hideDisabled": false,
"legendItems": [
{
"color": "#a1d99b",
"label": "additions: ATT&CK objects which are only present in the new release."
},
{
"color": "#fcf3a2",
"label": "major_version_changes: ATT&CK objects that have a major version change. (e.g. 1.0 \u2192 2.0)"
},
{
"color": "#c7c4e0",
"label": "minor_version_changes: ATT&CK objects that have a minor version change. (e.g. 1.0 \u2192 1.1)"
},
{
"color": "#B5E5CF",
"label": "other_version_changes: ATT&CK objects that have a version change of any other kind. (e.g. 1.0 \u2192 1.2)"
},
{
"color": "#B99095",
"label": "patches: ATT&CK objects that have been patched while keeping the version the same. (e.g., 1.0 \u2192 1.0 but something like a typo, a URL, or some metadata was fixed)"
},
{
"color": "#ff9000",
"label": "revocations: ATT&CK objects which are revoked by a different object."
},
{
"color": "#ff6363",
"label": "deprecations: ATT&CK objects which are deprecated and no longer in use, and not replaced."
},
{
"color": "#ff00e1",
"label": "deletions: ATT&CK objects which are no longer found in the STIX data."
},
{
"color": "#ffffff",
"label": "unchanged: ATT&CK objects which did not change between the two versions."
}
],
"showTacticRowBackground": true,
"tacticRowBackground": "#205b8f",
"selectTechniquesAcrossTactics": true
}
54 changes: 54 additions & 0 deletions modules/resources/docs/changelogs/v15.0-v15.1/layer-mobile.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"versions": {
"layer": "4.5",
"navigator": "5.0.0",
"attack": "15.1"
},
"name": "May 2024 Mobile Updates",
"description": "Mobile updates for the May 2024 release of ATT&CK",
"domain": "mobile-attack",
"techniques": [],
"sorting": 0,
"hideDisabled": false,
"legendItems": [
{
"color": "#a1d99b",
"label": "additions: ATT&CK objects which are only present in the new release."
},
{
"color": "#fcf3a2",
"label": "major_version_changes: ATT&CK objects that have a major version change. (e.g. 1.0 \u2192 2.0)"
},
{
"color": "#c7c4e0",
"label": "minor_version_changes: ATT&CK objects that have a minor version change. (e.g. 1.0 \u2192 1.1)"
},
{
"color": "#B5E5CF",
"label": "other_version_changes: ATT&CK objects that have a version change of any other kind. (e.g. 1.0 \u2192 1.2)"
},
{
"color": "#B99095",
"label": "patches: ATT&CK objects that have been patched while keeping the version the same. (e.g., 1.0 \u2192 1.0 but something like a typo, a URL, or some metadata was fixed)"
},
{
"color": "#ff9000",
"label": "revocations: ATT&CK objects which are revoked by a different object."
},
{
"color": "#ff6363",
"label": "deprecations: ATT&CK objects which are deprecated and no longer in use, and not replaced."
},
{
"color": "#ff00e1",
"label": "deletions: ATT&CK objects which are no longer found in the STIX data."
},
{
"color": "#ffffff",
"label": "unchanged: ATT&CK objects which did not change between the two versions."
}
],
"showTacticRowBackground": true,
"tacticRowBackground": "#205b8f",
"selectTechniquesAcrossTactics": true
}
2 changes: 1 addition & 1 deletion modules/resources/static_pages/updates-april-2024.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ save_as: resources/updates/updates-april-2024/index.html

| Version | Start Date | End Date | Data | Changelogs |
|:--------|:-----------|:---------|:-----|:-----------|
| [ATT&CK v15](/versions/v15) | April 23, 2024 | Current version of ATT&CK | [v15.0 on MITRE/CTI](https://github.com/mitre/cti/releases/tag/ATT%26CK-v15.0) | v14.1 - v15.0 [Details](/docs/changelogs/v14.1-v15.0/changelog-detailed.html) ([JSON](/docs/changelogs/v14.1-v15.0/changelog.json)) |
| [ATT&CK v15](/versions/v15) | April 23, 2024 | Current version of ATT&CK | [v15.0 on MITRE/CTI](https://github.com/mitre/cti/releases/tag/ATT%26CK-v15.0)<br />[v15.1 on MITRE/CTI](https://github.com/mitre/cti/releases/tag/ATT%26CK-v15.1) | v14.1 - v15.0 [Details](/docs/changelogs/v14.1-v15.0/changelog-detailed.html) ([JSON](/docs/changelogs/v14.1-v15.0/changelog.json))<br />v15.0 - v15.1 [Details](/docs/changelogs/v15.0-v15.1/changelog-detailed.html) ([JSON](/docs/changelogs/v15.0-v15.1/changelog.json)) |

The April 2024 (v15) ATT&CK release updates Techniques, Groups, Campaigns and Software for Enterprise, Mobile, and ICS.

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ profile = "black"

[tool.towncrier]
name = "ATT&CK website"
version = "4.1.2"
version = "4.1.3"
filename = "CHANGELOG.md"
issue_format = "[#{issue}](https://github.com/mitre-attack/attack-website/issues/{issue})"
template = ".towncrier.template.md"
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ bleach==6.0.0
colorama==0.4.6
future==0.18.3
loguru==0.6.0
mitreattack-python==3.0.4
mitreattack-python==3.0.6
pelican==4.8.0
pyScss==1.4.0
python-dotenv==1.0.0
Expand All @@ -16,7 +16,7 @@ towncrier==22.12.0
webassets==2.0

# dev dependencies
black==22.3.0
black==24.3.0
isort==5.12.0
pylint==2.17.2
ruff>=0.0.277

0 comments on commit f0c6237

Please sign in to comment.