Merge pull request #7362 from Security-Onion-Solutions/delta

Navigator - include attack json for airgap

salt/nginx/files/navigator_config.json

@@ -1,9 +1,9 @@
 {%- set URL_BASE = salt['pillar.get']('global:url_base', '') %}
 
 {
-    "enterprise_attack_url": "https://raw.githubusercontent.com/mitre/cti/master/enterprise-attack/enterprise-attack.json",
+    "enterprise_attack_url": "assets/enterprise-attack.json",
-    "pre_attack_url": "https://raw.githubusercontent.com/mitre/cti/master/pre-attack/pre-attack.json",
+    "pre_attack_url": "assets/pre-attack.json",
-    "mobile_data_url": "https://raw.githubusercontent.com/mitre/cti/master/mobile-attack/mobile-attack.json",
+    "mobile_data_url": "assets/mobile-attack.json",
     "taxii_server": {
         "enabled": false,
         "url": "https://cti-taxii.mitre.org/",

salt/nginx/init.sls

@@ -67,6 +67,24 @@ navigatordefaultlayer:
     - replace: False
     - template: jinja
 
+navigatorpreattack:
+  file.managed:
+    - name: /opt/so/conf/navigator/pre-attack.json
+    - source: salt://nginx/files/pre-attack.json
+    - user: 939
+    - group: 939
+    - makedirs: True
+    - replace: False
+
+navigatorenterpriseattack:
+  file.managed:
+    - name: /opt/so/conf/navigator/enterprise-attack.json
+    - source: salt://nginx/files/enterprise-attack.json
+    - user: 939
+    - group: 939
+    - makedirs: True
+    - replace: False
+
 so-nginx:
   docker_container.running:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-nginx:{{ VERSION }}
@@ -83,6 +101,8 @@ so-nginx:
       # ATT&CK Navigator binds
       - /opt/so/conf/navigator/navigator_config.json:/opt/socore/html/navigator/assets/config.json:ro
       - /opt/so/conf/navigator/nav_layer_playbook.json:/opt/socore/html/navigator/assets/playbook.json:ro
+      - /opt/so/conf/navigator/enterprise-attack.json:/opt/socore/html/navigator/assets/enterprise-attack.json:ro
+      - /opt/so/conf/navigator/pre-attack.json:/opt/socore/html/navigator/assets/pre-attack.json:ro
   {% endif %}
   {% if ISAIRGAP is sameas true %}
       - /nsm/repo:/opt/socore/html/repo:ro