GuillaumeHemmen/docker-bench-security
1
0
Fork 0
mirror of https://github.com/docker/docker-bench-security.git synced 2025-01-18 16:22:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

locate configuration file before we run the tests #410

Browse source 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
This commit is contained in:
Thomas Sjögren 2019-12-17 15:03:54 +01:00
parent 19173cb954
commit 269b71eed8
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker-bench-security.sh
View file

@ -93,6 +93,9 @@ beginjson "$version" "$(date +%s)"
# Load all the tests from tests/ and run them # Load all the tests from tests/ and run them
main () { main () {
# Get configuration location
get_docker_configuration_file
# If there is a container with label docker_bench_security, memorize it: # If there is a container with label docker_bench_security, memorize it:
benchcont="nil" benchcont="nil"
for c in $(docker ps | sed '1d' | awk '{print $NF}'); do for c in $(docker ps | sed '1d' | awk '{print $NF}'); do

9
helper_lib.sh
View file

@ -82,8 +82,7 @@ get_docker_effective_command_line_args() {
get_docker_cumulative_command_line_args "$OPTION" | tail -n1 get_docker_cumulative_command_line_args "$OPTION" | tail -n1
} }
get_docker_configuration_file_args() { get_docker_configuration_file() {
OPTION="$1"
FILE="$(get_docker_effective_command_line_args '--config-file' | \ FILE="$(get_docker_effective_command_line_args '--config-file' | \
sed 's/.*=//g')" sed 's/.*=//g')"
@ -94,6 +93,12 @@ get_docker_configuration_file_args() {
else else
CONFIG_FILE='/dev/null' CONFIG_FILE='/dev/null'
fi fi
}
get_docker_configuration_file_args() {
OPTION="$1"
get_docker_configuration_file
grep "$OPTION" "$CONFIG_FILE" | sed 's/.*://g' | tr -d '" ', grep "$OPTION" "$CONFIG_FILE" | sed 's/.*://g' | tr -d '" ',
} }

2
tests/2_docker_daemon_configuration.sh
View file

@ -150,7 +150,7 @@ check_2_6() {
starttestjson "$id_2_6" "$desc_2_6" starttestjson "$id_2_6" "$desc_2_6"
totalChecks=$((totalChecks + 1)) totalChecks=$((totalChecks + 1))
if grep -qi 'tcp://' "$CONFIG_FILE" || \ if [ $(get_docker_configuration_file_args 'tcp://') ] || \
[ $(get_docker_cumulative_command_line_args '-H' | grep -vE '(unix|fd)://') >/dev/null 2>&1 ]; then [ $(get_docker_cumulative_command_line_args '-H' | grep -vE '(unix|fd)://') >/dev/null 2>&1 ]; then
if [ $(get_docker_configuration_file_args '"tlsverify":' | grep 'true') ] || \ if [ $(get_docker_configuration_file_args '"tlsverify":' | grep 'true') ] || \
[ $(get_docker_cumulative_command_line_args '--tlsverify' | grep 'tlsverify') >/dev/null 2>&1 ]; then [ $(get_docker_cumulative_command_line_args '--tlsverify' | grep 'tlsverify') >/dev/null 2>&1 ]; then