Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
clemiller committed May 12, 2022
2 parents 991e0e5 + 9ee02ae commit 1d33919
Show file tree
Hide file tree
Showing 17 changed files with 745 additions and 1,235 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/buildcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Build
on:
push:
branches:
- master, develop
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]

steps:
- uses: actions/checkout@v1

- name: Node ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: npm install and npm run build
run: |
cd nav-app/
npm ci
npm run build
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
The creation of the tag can be disabled with the --no-git-tag-version if desired.
-->

# v4.6.2 - 12 May 2022

Adds support for ATT&CK v11.1.

## Improvements
- Added a feature to pin a technique cell when viewed in the matrix, enabling the user to scroll through the details of the technique in the tooltip. See issue [#320](https://github.com/mitre-attack/attack-navigator/issues/320).
- Added a popup alert to notify users if a layer with an empty tactic field is uploaded, and therefore will not be displayed. See issue [#326](https://github.com/mitre-attack/attack-navigator/issues/326).

# v4.6.1 - 26 April 2022

## Fixes
Expand All @@ -22,8 +30,7 @@ Adds support for ATT&CK v11.
## Improvements

- Revised the rigid versioning structure in the configuration file which enforced too many constraints on importing custom data. Added new fields `version.version` and `domain.identifier` to improve how Navigator derives domain information. More details are provided in the [integration documentation](https://github.com/center-for-threat-informed-defense/attack-workbench-frontend/blob/develop/docs/integrations.md#attck-navigator-integration) on how to integrate the ATT&CK Navigator with the ATT&CK Workbench. See issue [#370](https://github.com/mitre-attack/attack-navigator/issues/370).
- Fixed an issue where a long technique name or metadata value would overflow outside of the technique tooltip. See issue [#359](https://github.com/mitre-attack/attack-navigator/issues/359).

- Fixed an issue where a long technique name or metadata value would overflow outside the technique tooltip. See issue [#359](https://github.com/mitre-attack/attack-navigator/issues/359).

# v4.5.5 - 7 January 2022

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![build status](https://github.com/mitre-attack/attack-navigator/workflows/Build/badge.svg)](https://github.com/mitre-attack/attack-navigator/actions)

# ATT&CK® Navigator

The ATT&CK Navigator is designed to provide basic navigation and annotation of [ATT&CK](https://attack.mitre.org) matrices, something that people are already doing today in tools like Excel. We've designed it to be simple and generic - you can use the Navigator to visualize your defensive coverage, your red/blue team planning, the frequency of detected techniques or anything else you want to do. The Navigator doesn't care - it just allows you to manipulate the cells in the matrix (color coding, adding a comment, assigning a numerical value, etc.). We thought having a simple tool that everyone could use to visualize the matrix would help make it easy to use ATT&CK.
Expand Down
10 changes: 5 additions & 5 deletions layers/LAYERFORMATv4_3.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ This document describes **Version 4.3** of the MITRE ATT&CK Navigator Layer file

| Name | Type | Required? | Default Value (if not present) | Description |
| :------------- | :------------- | :------------- | :------------- | :------------- |
| attack | String | No | Current version of ATT&CK: "9" | ATT&CK version of this layer |
| navigator | String | Yes | | Must be "4.3" |
| layer | String | Yes | | Must be "4.2" |
| attack | String | No | Current version of ATT&CK | ATT&CK version of this layer |
| navigator | String | Yes | | Must be "4.6.2" |
| layer | String | Yes | | Must be "4.3" |

## Technique Object properties

Expand Down Expand Up @@ -105,8 +105,8 @@ The following example illustrates the layer file format:
{
"name": "example layer",
"versions": {
"attack": "10",
"navigator": "4.5.5",
"attack": "11",
"navigator": "4.6.2",
"layer": "4.3"
},
"domain": "enterprise-attack",
Expand Down
Loading

0 comments on commit 1d33919

Please sign in to comment.