enable/disable idh via ui

salt/idh/config.sls

@@ -0,0 +1,85 @@
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+{% from 'allowed_states.map.jinja' import allowed_states %}
+{% if sls.split('.')[0] in allowed_states %}
+{%   from 'vars/globals.map.jinja' import GLOBALS %}
+{%   from 'idh/opencanary_config.map.jinja' import RESTRICTIDHSERVICES %}
+{%   from 'idh/opencanary_config.map.jinja' import OPENCANARYCONFIG %}
+
+include:
+  - idh.openssh.config
+  - firewall
+
+# If True, block IDH Services from accepting connections on Managment IP
+{% if RESTRICTIDHSERVICES %}
+  {% from 'idh/opencanary_config.map.jinja' import IDH_SERVICES %}
+
+  {% for service in IDH_SERVICES %}
+  {% if service in ["smnp","ntp", "tftp"] %}
+    {% set proto = 'udp' %}
+  {% else %}
+    {% set proto = 'tcp' %}
+  {% endif %}
+block_mgt_ip_idh_services_{{ proto }}_{{ OPENCANARYCONFIG[service~'_x_port'] }} :
+  iptables.insert:
+    - table: filter
+    - chain: INPUT
+    - jump: DROP
+    - position: 1
+    - proto:  {{ proto }}
+    - dport: {{ OPENCANARYCONFIG[service~'_x_port'] }}
+    - destination: {{ GLOBALS.node_ip }}
+  {% endfor %}
+{% endif %}
+
+# Create a config directory
+idhconfdir:
+  file.directory:
+    - name: /opt/so/conf/idh
+    - user: 939
+    - group: 939
+    - makedirs: True
+
+# Create a log directory
+idhlogdir:
+  file.directory:
+    - name: /nsm/idh
+    - user: 939
+    - group: 939
+    - makedirs: True
+
+opencanary_config:
+  file.managed:
+    - name: /opt/so/conf/idh/opencanary.conf
+    - source: salt://idh/idh.conf.jinja
+    - template: jinja
+    - defaults:
+        OPENCANARYCONFIG: {{ OPENCANARYCONFIG }}
+
+idh_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://idh/tools/sbin
+    - user: 934
+    - group: 939
+    - file_mode: 755
+
+#idh_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://idh/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
+{% else %}
+
+{{sls}}_state_not_allowed:
+  test.fail_without_changes:
+    - name: {{sls}}_state_not_allowed
+
+{% endif %}

salt/idh/defaults.yaml

@@ -1,5 +1,6 @@
 idh:
-  restrict_management_ip: false
+  enabled: False
+  restrict_management_ip: False
   openssh:
     enable: true
     config:

salt/idh/disabled.sls

@@ -0,0 +1,27 @@
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+{% from 'allowed_states.map.jinja' import allowed_states %}
+{% if sls.split('.')[0] in allowed_states %}
+
+include:
+  - idh.sostatus
+  
+so-idh:
+  docker_container.absent:
+    - force: True
+
+so-idh_so-status.disabled:
+  file.comment:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - regex: ^so-idh$
+
+{% else %}
+
+{{sls}}_state_not_allowed:
+  test.fail_without_changes:
+    - name: {{sls}}_state_not_allowed
+
+{% endif %}

salt/idh/enabled.sls

@@ -0,0 +1,39 @@
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+{% from 'allowed_states.map.jinja' import allowed_states %}
+{% if sls.split('.')[0] in allowed_states %}
+{%   from 'vars/globals.map.jinja' import GLOBALS %}
+
+include:
+  - idh.config
+  - idh.sostatus
+
+so-idh:
+  docker_container.running:
+    - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-idh:{{ GLOBALS.so_version }}
+    - name: so-idh
+    - detach: True
+    - network_mode: host
+    - binds:
+      - /nsm/idh:/var/tmp:rw
+      - /opt/so/conf/idh/opencanary.conf:/etc/opencanaryd/opencanary.conf:ro
+    - watch:
+      - file: opencanary_config
+    - require:
+      - file: opencanary_config
+
+delete_so-idh_so-status.disabled:
+  file.uncomment:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - regex: ^so-idh$
+
+{% else %}
+
+{{sls}}_state_not_allowed:
+  test.fail_without_changes:
+    - name: {{sls}}_state_not_allowed
+
+{% endif %}

salt/idh/init.sls

@@ -3,103 +3,11 @@
 # https://securityonion.net/license; you may not use this file except in compliance with the
 # Elastic License 2.0.
 
-{% from 'allowed_states.map.jinja' import allowed_states %}
+{% from 'idh/opencanary_config.map.jinja' import IDHMERGED %}
-{% if sls in allowed_states %}
-{% import_yaml 'docker/defaults.yaml' as DOCKERDEFAULTS %}
-{% from 'vars/globals.map.jinja' import GLOBALS %}
-{% from 'idh/opencanary_config.map.jinja' import RESTRICTIDHSERVICES %}
-{% from 'idh/opencanary_config.map.jinja' import OPENCANARYCONFIG %}
 
 include:
-  - idh.openssh.config
+{% if IDHMERGED.enabled %}
-  - firewall
+  - idh.enabled
-
-# If True, block IDH Services from accepting connections on Managment IP
-{% if RESTRICTIDHSERVICES %}
-  {% from 'idh/opencanary_config.map.jinja' import IDH_SERVICES %}
-
-  {% for service in IDH_SERVICES %}
-  {% if service in ["smnp","ntp", "tftp"] %}
-    {% set proto = 'udp' %}
-  {% else %}
-    {% set proto = 'tcp' %}
-  {% endif %}
-block_mgt_ip_idh_services_{{ proto }}_{{ OPENCANARYCONFIG[service~'_x_port'] }} :
-  iptables.insert:
-    - table: filter
-    - chain: INPUT
-    - jump: DROP
-    - position: 1
-    - proto:  {{ proto }}
-    - dport: {{ OPENCANARYCONFIG[service~'_x_port'] }}
-    - destination: {{ GLOBALS.node_ip }}
-  {% endfor %}
-{% endif %}
-
-# Create a config directory
-temp:
-  file.directory:
-    - name: /opt/so/conf/idh
-    - user: 939
-    - group: 939
-    - makedirs: True
-
-# Create a log directory
-configdir:
-  file.directory:
-    - name: /nsm/idh
-    - user: 939
-    - group: 939
-    - makedirs: True
-
-opencanary_config:
-  file.managed:
-    - name: /opt/so/conf/idh/opencanary.conf
-    - source: salt://idh/idh.conf.jinja
-    - template: jinja
-    - defaults:
-        OPENCANARYCONFIG: {{ OPENCANARYCONFIG }}
-
-idh_sbin:
-  file.recurse:
-    - name: /usr/sbin
-    - source: salt://idh/tools/sbin
-    - user: 934
-    - group: 939
-    - file_mode: 755
-
-#idh_sbin_jinja:
-#  file.recurse:
-#    - name: /usr/sbin
-#    - source: salt://idh/tools/sbin_jinja
-#    - user: 939
-#    - group: 939 
-#    - file_mode: 755
-#    - template: jinja
-
-so-idh:
-  docker_container.running:
-    - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-idh:{{ GLOBALS.so_version }}
-    - name: so-idh
-    - detach: True
-    - network_mode: host
-    - binds:
-      - /nsm/idh:/var/tmp:rw
-      - /opt/so/conf/idh/opencanary.conf:/etc/opencanaryd/opencanary.conf:ro
-    - watch:
-      - file: opencanary_config
-    - require:
-      - file: opencanary_config
-
-append_so-idh_so-status.conf:
-  file.append:
-    - name: /opt/so/conf/so-status/so-status.conf
-    - text: so-idh
-
 {% else %}
-
+  - idh.disabled
-{{sls}}_state_not_allowed:
-  test.fail_without_changes:
-    - name: {{sls}}_state_not_allowed
-
 {% endif %}

salt/idh/opencanary_config.map.jinja

@@ -20,6 +20,7 @@
 {% set IDH_PORTGROUPS = {} %}
 
 {% import_yaml "idh/defaults.yaml" as IDHCONFIG with context %}
+{% set IDHMERGED = salt['pillar.get']('idh', IDHCONFIG.idh, merge=True) %}
 {% set RESTRICTIDHSERVICES = salt['pillar.get']('idh:restrict_management_ip', default=IDHCONFIG.idh.restrict_management_ip) %}
 {% set OPENCANARYCONFIG = salt['pillar.get']('idh:opencanary:config', default=IDHCONFIG.idh.opencanary.config, merge=True) %}
 {# update skinlist to skin.list to avoid issues with SOC UI config #}

salt/idh/soc_idh.yaml

@@ -1,4 +1,7 @@
 idh:
+  enabled:
+    description: You can enable or disable IDH.
+    helpLink: idh.html
   opencanary:
     config:
       logger:

salt/idh/sostatus.sls

@@ -0,0 +1,21 @@
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+{% from 'allowed_states.map.jinja' import allowed_states %}
+{% if sls.split('.')[0] in allowed_states %}
+
+append_so-idh_so-status.conf:
+  file.append:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - text: so-idh
+    - unless: grep -q so-idh /opt/so/conf/so-status/so-status.conf
+
+{% else %}
+
+{{sls}}_state_not_allowed:
+  test.fail_without_changes:
+    - name: {{sls}}_state_not_allowed
+
+{% endif %}

salt/manager/tools/sbin/so-minion

@@ -153,6 +153,7 @@ function add_fleet_to_minion() {
 function add_idh_to_minion() {
 	printf '%s\n'\
 	"idh:"\
+	"  enabled: True"\
 	"  restrict_management_ip: $IDH_MGTRESTRICT"\
 	"  services:" >> "$PILLARFILE"
 	IFS=',' read -ra IDH_SERVICES_ARRAY <<< "$IDH_SERVICES"