From 17026093f13e2373d471f3d5d352aff63b724ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Tue, 25 May 2021 20:45:20 +0200 Subject: [PATCH] update check functions and remove docker_enterprise_configuration from default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- functions/functions_lib.sh | 161 ++++++++++--------------------------- 1 file changed, 42 insertions(+), 119 deletions(-) diff --git a/functions/functions_lib.sh b/functions/functions_lib.sh index 1dec4c5..64b1611 100644 --- a/functions/functions_lib.sh +++ b/functions/functions_lib.sh @@ -5,65 +5,60 @@ host_configuration() { check_1_1 check_1_1_1 check_1_1_2 + check_1_1_3 + check_1_1_4 + check_1_1_5 + check_1_1_6 + check_1_1_7 + check_1_1_8 + check_1_1_9 + check_1_1_10 + check_1_1_11 + check_1_1_12 + check_1_1_13 + check_1_1_14 + check_1_1_15 + check_1_1_16 + check_1_1_17 + check_1_1_18 check_1_2 check_1_2_1 check_1_2_2 - check_1_2_3 - check_1_2_4 - check_1_2_5 - check_1_2_6 - check_1_2_7 - check_1_2_8 - check_1_2_9 - check_1_2_10 - check_1_2_11 - check_1_2_12 check_1_end } host_configuration_level1() { check_1 - check_1_1 - check_1_1_1 - check_1_1_2 - check_1_2 - check_1_2_1 - check_1_2_2 - check_1_2_3 - check_1_2_5 - check_1_2_6 - check_1_2_7 - check_1_2_8 - check_1_2_9 - check_1_2_10 - check_1_2_11 - check_1_2_12 - check_1_end -} - -host_general_configuration() { - check_1 - check_1_1 - check_1_1_1 - check_1_1_2 check_1_end } linux_hosts_specific_configuration() { + check_1_1 + check_1_1_1 + check_1_1_2 + check_1_1_3 + check_1_1_4 + check_1_1_5 + check_1_1_6 + check_1_1_7 + check_1_1_8 + check_1_1_9 + check_1_1_10 + check_1_1_11 + check_1_1_12 + check_1_1_13 + check_1_1_14 + check_1_1_15 + check_1_1_16 + check_1_1_17 + check_1_1_18 +} + +host_general_configuration() { check_1 check_1_2 check_1_2_1 check_1_2_2 - check_1_2_3 - check_1_2_4 - check_1_2_5 - check_1_2_6 - check_1_2_7 - check_1_2_8 - check_1_2_9 - check_1_2_10 - check_1_2_11 - check_1_2_12 check_1_end } @@ -86,22 +81,12 @@ docker_daemon_configuration() { check_2_15 check_2_16 check_2_17 + check_2_18 check_2_end } docker_daemon_configuration_level1() { check_2 - check_2_1 - check_2_2 - check_2_3 - check_2_4 - check_2_5 - check_2_6 - check_2_7 - check_2_13 - check_2_14 - check_2_16 - check_2_17 check_2_end } @@ -129,33 +114,13 @@ docker_daemon_files() { check_3_20 check_3_21 check_3_22 + check_3_23 + check_3_24 check_3_end } docker_daemon_files_level1() { check_3 - check_3_1 - check_3_2 - check_3_3 - check_3_4 - check_3_5 - check_3_6 - check_3_7 - check_3_8 - check_3_9 - check_3_10 - check_3_11 - check_3_12 - check_3_13 - check_3_14 - check_3_15 - check_3_16 - check_3_17 - check_3_18 - check_3_19 - check_3_20 - check_3_21 - check_3_22 check_3_end } @@ -177,14 +142,6 @@ container_images() { container_images_level1() { check_4 - check_4_1 - check_4_2 - check_4_3 - check_4_4 - check_4_6 - check_4_7 - check_4_9 - check_4_10 check_4_end } @@ -227,34 +184,6 @@ container_runtime() { container_runtime_level1() { check_5 - check_running_containers - check_5_1 - check_5_3 - check_5_4 - check_5_5 - check_5_6 - check_5_7 - check_5_8 - check_5_9 - check_5_10 - check_5_11 - check_5_12 - check_5_13 - check_5_14 - check_5_15 - check_5_16 - check_5_17 - check_5_18 - check_5_19 - check_5_20 - check_5_21 - check_5_24 - check_5_25 - check_5_26 - check_5_27 - check_5_28 - check_5_30 - check_5_31 check_5_end } @@ -289,11 +218,6 @@ docker_swarm_configuration() { docker_swarm_configuration_level1() { check_7 - check_7_1 - check_7_2 - check_7_3 - check_7_4 - check_7_7 check_7_end } @@ -366,7 +290,6 @@ cis() { container_runtime docker_security_operations docker_swarm_configuration - docker_enterprise_configuration } cis_level1() { @@ -377,7 +300,6 @@ cis_level1() { container_runtime_level1 docker_security_operations_level1 docker_swarm_configuration_level1 - docker_enterprise_configuration_level1 } # Community contributed @@ -388,5 +310,6 @@ community() { # All all() { cis + docker_enterprise_configuration community }