validation: fixed some bugs

validation: removed support for remote validation (now it only works in a local network)

etc-defaults.d/cbox-dev.conf

@@ -32,11 +32,9 @@ CDWRITER="2,0,0"
 # directory of the test-cases
 VALIDATE_TEST_CASES_DIR=$ROOT_DIR/validation/test-cases
 
-# override these settings if the CryptoBox is not directly available
-# in this case they should point to a redirecting router
-VALIDATE_HOST_IP=192.168.0.23
-VALIDATE_HTTP_PORT=80
-VALIDATE_HTTPS_PORT=443
+# override these settings if the CryptoBox uses a non-default IP
+VALIDATE_HOST_IP_DEFAULT=192.168.0.23
+VALIDATE_HOST_IP_CHANGED=192.168.0.24
 
 # destination directories for the results
 VALIDATE_REPORT_DIR=/tmp/cryptobox-validation-$$

tools/validate.sh

@@ -61,6 +61,8 @@ function do_single()
 		rm "${2}/${TESTNAME}.status"
 	 fi
 	cp "$1/description" "${2}/${TESTNAME}.desc"
+	# sleep, if a file called 'delay' exists
+	[ -e "$1/delay" ] && sleep "$(<$1/delay)"
 }
 
 
@@ -110,10 +112,10 @@ function import_style()
 	[ -d "$VALIDATE_REPORT_DIR/cryptobox-img" ] && rm -r "$VALIDATE_REPORT_DIR/cryptobox-img"
 	mkdir -p "$VALIDATE_REPORT_DIR/cryptobox-img"
 	[ -e "$VALIDATE_REPORT_DIR/cryptobox.css" ] && rm "$VALIDATE_REPORT_DIR/cryptobox.css"
-	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox.css" http://$VALIDATE_HOST_IP:$VALIDATE_HTTP_PORT/cryptobox.css
+	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox.css" http://$VALIDATE_HOST_IP_DEFAULT/cryptobox.css
 	# extract image file names
 	grep "url(/cryptobox-img/" "$VALIDATE_REPORT_DIR/cryptobox.css" | sed 's#^.*url(/cryptobox-img/\(.*\)).*$#\1#' | while read a
-		do	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-img/$a" "http://$VALIDATE_HOST_IP:$VALIDATE_HTTP_PORT/cryptobox-img/$a"
+		do	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-img/$a" "http://$VALIDATE_HOST_IP_DEFAULT/cryptobox-img/$a"
 	  done
 	
 	# change the stylesheet link in every html file in REPORT_DIR
@@ -125,7 +127,7 @@ function import_style()
 
 function substitute_constants()
 {
-	sed "s/_HOST_IP_/$VALIDATE_HOST_IP/g; s/_HTTP_PORT_/$VALIDATE_HTTP_PORT/g; s/_HTTPS_PORT_/$VALIDATE_HTTPS_PORT/g"
+	sed "s/_HOST_IP_DEFAULT_/$VALIDATE_HOST_IP_DEFAULT/g; s/_VALIDATE_HOST_IP_CHANGED_/$VALIDATE_HOST_IP_CHANGED/g"
 }
 
 ##################### main ###########################
@@ -141,8 +143,8 @@ case "$ACTION" in
 		;;
 	check )
 		[ $# -ne 2 ] && error_die 1 "Syntax: $(basename $0) check NAME"
-		CASE_DIR="$VALIDATE_TEST_CASES_DIR/$2"
-		[ ! -d "$VALIDATE_CASE_DIR" ] && error_die 2 "the test case was not found ($VALIDATE_CASE_DIR)!"
+		case_dir="$VALIDATE_TEST_CASES_DIR/$2"
+		[ ! -d "$case_dir" ] && error_die 2 "the test case was not found ($case_dir)!"
 		do_series "$2"
 		import_style
 		;;

validation/test-cases/1-init/000-main/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox

validation/test-cases/1-init/000-main/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/003-no_ssl/input.curl

@@ -1,2 +1 @@
-url	http://_HOST_IP_:_HTTP_PORT_/cryptobox
-data	action=init_ask
+url	http://_HOST_IP_DEFAULT_/cryptobox

validation/test-cases/1-init/003-no_ssl/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/005-file_not_found_404/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/croptyfox
+url	https://_HOST_IP_DEFAULT_/croptyfox

validation/test-cases/1-init/007-index_url/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_
+url	https://_HOST_IP_DEFAULT_

validation/test-cases/1-init/007-index_url/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/010-init_ask/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=init_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=init_ask

validation/test-cases/1-init/010-init_ask/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/020-init_empty_pw/input.curl

@@ -1,4 +1,4 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	password=
 data	password2=

validation/test-cases/1-init/020-init_empty_pw/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/030-init_different_pw/input.curl

@@ -1,4 +1,4 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	password=hallo
 data	password2=hall

validation/test-cases/1-init/030-init_different_pw/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/040-init_wrong_confirmation/input.curl

@@ -1,4 +1,4 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	password=hallo
 data	password2=hallo

validation/test-cases/1-init/040-init_wrong_confirmation/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/050-mount_ask_before_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=mount_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=mount_ask

validation/test-cases/1-init/050-mount_ask_before_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/060-mount_do_before_init/input.curl

@@ -1,3 +1,3 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
 data	password=hallo

validation/test-cases/1-init/060-mount_do_before_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/070-umount_ask_before_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=umount_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=umount_ask

validation/test-cases/1-init/070-umount_ask_before_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/080-umount_do_before_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=umount_do
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=umount_do

validation/test-cases/1-init/080-umount_do_before_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/090-config_ask_before_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=config_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=config_ask

validation/test-cases/1-init/090-config_ask_before_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/100-config_do_before_init/input.curl

@@ -1,5 +1,5 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=config_do
 data	language=de
-data	ip=192.168.0.23
+data	ip=_HOST_IP_DEFAULT_
 data	timeout=30

validation/test-cases/1-init/100-config_do_before_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=0
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/110-init_valid/input.curl

@@ -1,4 +1,4 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	password=hallo
 data	password2=hallo

validation/test-cases/1-init/110-init_valid/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/120-mount_ask_during_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=mount_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=mount_ask

validation/test-cases/1-init/120-mount_ask_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/130-mount_do_during_init/input.curl

@@ -1,3 +1,3 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
 data	password=hallo

validation/test-cases/1-init/130-mount_do_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/140-umount_ask_during_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=umount_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=umount_ask

validation/test-cases/1-init/140-umount_ask_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/150-umount_do_during_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=umount_do
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=umount_do

validation/test-cases/1-init/150-umount_do_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/160-config_ask_during_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=config_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=config_ask

validation/test-cases/1-init/160-config_ask_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/170-config_do_during_init/input.curl

@@ -1,5 +1,5 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=config_do
 data	language=en
-data	ip=192.168.0.23
+data	ip=_HOST_IP_DEFAULT_
 data	timeout=40

validation/test-cases/1-init/170-config_do_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/180-init_ask_during_init/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=init_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=init_ask

validation/test-cases/1-init/180-init_ask_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/1-init/190-init_do_during_init/input.curl

@@ -1,4 +1,4 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
 data	password=hallo
 data	password2=hallo

validation/test-cases/1-init/190-init_do_during_init/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=1
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/2-mount/010-mount_ask/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=mount_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=mount_ask

validation/test-cases/2-mount/010-mount_ask/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/2-mount/020-mount_empty_pw/input.curl

@@ -1,3 +1,3 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
 data	password=

validation/test-cases/2-mount/020-mount_empty_pw/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/2-mount/025-mount_no_pw/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=mount_do
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=mount_do

validation/test-cases/2-mount/025-mount_no_pw/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl

@@ -1,3 +1,3 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
 data	password=hallo

validation/test-cases/2-mount/030-mount_do_invalid_pw/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/2-mount/040-mount_do_valid/input.curl

@@ -1,3 +1,3 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
 data	password=hallo

validation/test-cases/2-mount/040-mount_do_valid/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=1

validation/test-cases/2-mount/050-mount_ask_while_mounted/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=mount_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=mount_ask

validation/test-cases/2-mount/050-mount_ask_while_mounted/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=1

validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl

@@ -1,3 +1,3 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
 data	password=hallo

validation/test-cases/2-mount/060-mount_do_while_mounted/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=1

validation/test-cases/2-mount/070-umount_ask/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=umount_ask
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=umount_ask

validation/test-cases/2-mount/070-umount_ask/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=1

validation/test-cases/2-mount/080-umount_do/input.curl

@@ -1 +1 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox?action=umount_do
+url	https://_HOST_IP_DEFAULT_/cryptobox?action=umount_do

validation/test-cases/2-mount/080-umount_do/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/3-config/100-config_invalid_lang/input.curl

@@ -1,5 +1,5 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=config_do
 data	language=xy
-data	ip=192.168.0.23
+data	ip=_HOST_IP_DEFAULT_
 data	timeout=30

validation/test-cases/3-config/100-config_invalid_lang/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/3-config/110-config_invalid_ip/input.curl

@@ -1,5 +1,5 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=config_do
 data	language=de
-data	ip=192.168.0.23
+data	ip=_HOST_IP_DEFAULT_
 data	timeout=30

validation/test-cases/3-config/110-config_invalid_ip/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/3-config/120-config_invalid_timeout/input.curl

@@ -1,5 +1,5 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=config_do
 data	language=de
-data	ip=192.168.0.23
+data	ip=_HOST_IP_DEFAULT_
 data	timeout=X

validation/test-cases/3-config/120-config_invalid_timeout/output

@@ -1,7 +1,7 @@
-Data.Config.IP=192.168.0.23
+Data.Config.IP=_HOST_IP_DEFAULT_
 Data.Config.Language=de
 Data.Config.TimeOut=30
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/3-config/500-config_valid/delay

@@ -0,0 +1 @@
+20

validation/test-cases/3-config/500-config_valid/input.curl

@@ -1,5 +1,5 @@
-url	http://_HOST_IP_:_HTTPS_PORT_/cryptobox
+url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=config_do
 data	language=en
-data	ip=10.1.1.1
+data	ip=_HOST_IP_CHANGED_
 data	timeout=7

validation/test-cases/3-config/500-config_valid/output

@@ -1,7 +1,7 @@
-Data.Config.IP=10.1.1.1
+Data.Config.IP=_HOST_IP_CHANGED_
 Data.Config.Language=en
 Data.Config.TimeOut=7
 Data.Status.Config=1
 Data.Status.InitRunning=0
-Data.Status.IP=192.168.0.23
+Data.Status.IP=_HOST_IP_DEFAULT_
 Data.Status.Mounted=0

validation/test-cases/3-config/510-config-restore/delay

@@ -0,0 +1 @@
+20

validation/test-cases/3-config/510-config-restore/description

@@ -0,0 +1 @@
+restore default settings

validation/test-cases/3-config/510-config-restore/input.curl

@@ -0,0 +1,5 @@
+url	https://_HOST_IP_CHANGED_/cryptobox
+data	action=config_do
+data	language=de
+data	ip=_HOST_IP_CHANGED_
+data	timeout=10

validation/test-cases/3-config/510-config-restore/output

@@ -0,0 +1,7 @@
+Data.Config.IP=_HOST_IP_DEFAULT_
+Data.Config.Language=de
+Data.Config.TimeOut=10
+Data.Status.Config=1
+Data.Status.InitRunning=0
+Data.Status.IP=_HOST_IP_CHANGED_
+Data.Status.Mounted=0