/" - in perl, please! - $pagedata->setValue('Data.ProgOutput',"$output") if ($output); + # wipe and mkfs takes some time - it will be done in background + system("echo $CB_SCRIPT box-init-bg | at now + 1 minutes >>$LOG_FILE 2>&1"); } diff --git a/dfs.cbox.conf b/dfs.cbox.conf index d0bd86f..29ff192 100644 --- a/dfs.cbox.conf +++ b/dfs.cbox.conf @@ -145,6 +145,7 @@ ramdisk_files = /etc/resolv.conf /var/lib/misc /var/lib/urandom /etc/hotpug + /var/spool/cron # Directories to create on live fs makedirs = /root/.elinks diff --git a/cryptobox.conf.d/var/www/cgi-bin/validate.sh b/validation/cgi-bin/validate.sh similarity index 100% rename from cryptobox.conf.d/var/www/cgi-bin/validate.sh rename to validation/cgi-bin/validate.sh diff --git a/cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/README b/validation/templates/README similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/README rename to validation/templates/README diff --git a/cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/footer b/validation/templates/footer similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/footer rename to validation/templates/footer diff --git a/cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/header b/validation/templates/header similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/header rename to validation/templates/header diff --git a/cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/result-error b/validation/templates/result-error similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/result-error rename to validation/templates/result-error diff --git a/cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/result-ok b/validation/templates/result-ok similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/result-ok rename to validation/templates/result-ok diff --git a/cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/single_footer b/validation/templates/single_footer similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/single_footer rename to validation/templates/single_footer diff --git a/cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/single_header b/validation/templates/single_header similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/templates/test-summary/single_header rename to validation/templates/single_header diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/000-main/description b/validation/test-cases/1-init/000-main/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/000-main/description rename to validation/test-cases/1-init/000-main/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/000-main/input.curl b/validation/test-cases/1-init/000-main/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/000-main/input.curl rename to validation/test-cases/1-init/000-main/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/000-main/output b/validation/test-cases/1-init/000-main/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/000-main/output rename to validation/test-cases/1-init/000-main/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/003-no_ssl/description b/validation/test-cases/1-init/003-no_ssl/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/003-no_ssl/description rename to validation/test-cases/1-init/003-no_ssl/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/003-no_ssl/input.curl b/validation/test-cases/1-init/003-no_ssl/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/003-no_ssl/input.curl rename to validation/test-cases/1-init/003-no_ssl/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/003-no_ssl/output b/validation/test-cases/1-init/003-no_ssl/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/003-no_ssl/output rename to validation/test-cases/1-init/003-no_ssl/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/005-file_not_found_404/description b/validation/test-cases/1-init/005-file_not_found_404/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/005-file_not_found_404/description rename to validation/test-cases/1-init/005-file_not_found_404/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/005-file_not_found_404/input.curl b/validation/test-cases/1-init/005-file_not_found_404/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/005-file_not_found_404/input.curl rename to validation/test-cases/1-init/005-file_not_found_404/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/005-file_not_found_404/output b/validation/test-cases/1-init/005-file_not_found_404/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/005-file_not_found_404/output rename to validation/test-cases/1-init/005-file_not_found_404/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/007-index_url/description b/validation/test-cases/1-init/007-index_url/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/007-index_url/description rename to validation/test-cases/1-init/007-index_url/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/007-index_url/input.curl b/validation/test-cases/1-init/007-index_url/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/007-index_url/input.curl rename to validation/test-cases/1-init/007-index_url/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/007-index_url/output b/validation/test-cases/1-init/007-index_url/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/007-index_url/output rename to validation/test-cases/1-init/007-index_url/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/010-init_ask/description b/validation/test-cases/1-init/010-init_ask/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/010-init_ask/description rename to validation/test-cases/1-init/010-init_ask/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/010-init_ask/input.curl b/validation/test-cases/1-init/010-init_ask/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/010-init_ask/input.curl rename to validation/test-cases/1-init/010-init_ask/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/010-init_ask/output b/validation/test-cases/1-init/010-init_ask/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/010-init_ask/output rename to validation/test-cases/1-init/010-init_ask/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/020-init_empty_pw/description b/validation/test-cases/1-init/020-init_empty_pw/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/020-init_empty_pw/description rename to validation/test-cases/1-init/020-init_empty_pw/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/020-init_empty_pw/input.curl b/validation/test-cases/1-init/020-init_empty_pw/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/020-init_empty_pw/input.curl rename to validation/test-cases/1-init/020-init_empty_pw/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/020-init_empty_pw/output b/validation/test-cases/1-init/020-init_empty_pw/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/020-init_empty_pw/output rename to validation/test-cases/1-init/020-init_empty_pw/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/030-init_different_pw/description b/validation/test-cases/1-init/030-init_different_pw/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/030-init_different_pw/description rename to validation/test-cases/1-init/030-init_different_pw/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/030-init_different_pw/input.curl b/validation/test-cases/1-init/030-init_different_pw/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/030-init_different_pw/input.curl rename to validation/test-cases/1-init/030-init_different_pw/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/030-init_different_pw/output b/validation/test-cases/1-init/030-init_different_pw/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/030-init_different_pw/output rename to validation/test-cases/1-init/030-init_different_pw/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/040-init_wrong_confirmation/description b/validation/test-cases/1-init/040-init_wrong_confirmation/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/040-init_wrong_confirmation/description rename to validation/test-cases/1-init/040-init_wrong_confirmation/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/040-init_wrong_confirmation/input.curl b/validation/test-cases/1-init/040-init_wrong_confirmation/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/040-init_wrong_confirmation/input.curl rename to validation/test-cases/1-init/040-init_wrong_confirmation/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/040-init_wrong_confirmation/output b/validation/test-cases/1-init/040-init_wrong_confirmation/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/040-init_wrong_confirmation/output rename to validation/test-cases/1-init/040-init_wrong_confirmation/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/050-mount_ask_before_init/description b/validation/test-cases/1-init/050-mount_ask_before_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/050-mount_ask_before_init/description rename to validation/test-cases/1-init/050-mount_ask_before_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/050-mount_ask_before_init/input.curl b/validation/test-cases/1-init/050-mount_ask_before_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/050-mount_ask_before_init/input.curl rename to validation/test-cases/1-init/050-mount_ask_before_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/050-mount_ask_before_init/output b/validation/test-cases/1-init/050-mount_ask_before_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/050-mount_ask_before_init/output rename to validation/test-cases/1-init/050-mount_ask_before_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/060-mount_do_before_init/description b/validation/test-cases/1-init/060-mount_do_before_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/060-mount_do_before_init/description rename to validation/test-cases/1-init/060-mount_do_before_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/060-mount_do_before_init/input.curl b/validation/test-cases/1-init/060-mount_do_before_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/060-mount_do_before_init/input.curl rename to validation/test-cases/1-init/060-mount_do_before_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/060-mount_do_before_init/output b/validation/test-cases/1-init/060-mount_do_before_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/060-mount_do_before_init/output rename to validation/test-cases/1-init/060-mount_do_before_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/070-umount_ask_before_init/description b/validation/test-cases/1-init/070-umount_ask_before_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/070-umount_ask_before_init/description rename to validation/test-cases/1-init/070-umount_ask_before_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/070-umount_ask_before_init/input.curl b/validation/test-cases/1-init/070-umount_ask_before_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/070-umount_ask_before_init/input.curl rename to validation/test-cases/1-init/070-umount_ask_before_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/070-umount_ask_before_init/output b/validation/test-cases/1-init/070-umount_ask_before_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/070-umount_ask_before_init/output rename to validation/test-cases/1-init/070-umount_ask_before_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/080-umount_do_before_init/description b/validation/test-cases/1-init/080-umount_do_before_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/080-umount_do_before_init/description rename to validation/test-cases/1-init/080-umount_do_before_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/080-umount_do_before_init/input.curl b/validation/test-cases/1-init/080-umount_do_before_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/080-umount_do_before_init/input.curl rename to validation/test-cases/1-init/080-umount_do_before_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/080-umount_do_before_init/output b/validation/test-cases/1-init/080-umount_do_before_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/080-umount_do_before_init/output rename to validation/test-cases/1-init/080-umount_do_before_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/090-config_ask_before_init/description b/validation/test-cases/1-init/090-config_ask_before_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/090-config_ask_before_init/description rename to validation/test-cases/1-init/090-config_ask_before_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/090-config_ask_before_init/input.curl b/validation/test-cases/1-init/090-config_ask_before_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/090-config_ask_before_init/input.curl rename to validation/test-cases/1-init/090-config_ask_before_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/090-config_ask_before_init/output b/validation/test-cases/1-init/090-config_ask_before_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/090-config_ask_before_init/output rename to validation/test-cases/1-init/090-config_ask_before_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/100-config_do_before_init/description b/validation/test-cases/1-init/100-config_do_before_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/100-config_do_before_init/description rename to validation/test-cases/1-init/100-config_do_before_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/100-config_do_before_init/input.curl b/validation/test-cases/1-init/100-config_do_before_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/100-config_do_before_init/input.curl rename to validation/test-cases/1-init/100-config_do_before_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/100-config_do_before_init/output b/validation/test-cases/1-init/100-config_do_before_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/100-config_do_before_init/output rename to validation/test-cases/1-init/100-config_do_before_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/110-init_valid/description b/validation/test-cases/1-init/110-init_valid/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/110-init_valid/description rename to validation/test-cases/1-init/110-init_valid/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/110-init_valid/input.curl b/validation/test-cases/1-init/110-init_valid/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/110-init_valid/input.curl rename to validation/test-cases/1-init/110-init_valid/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/110-init_valid/output b/validation/test-cases/1-init/110-init_valid/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/110-init_valid/output rename to validation/test-cases/1-init/110-init_valid/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/120-mount_ask_during_init/description b/validation/test-cases/1-init/120-mount_ask_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/120-mount_ask_during_init/description rename to validation/test-cases/1-init/120-mount_ask_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/120-mount_ask_during_init/input.curl b/validation/test-cases/1-init/120-mount_ask_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/120-mount_ask_during_init/input.curl rename to validation/test-cases/1-init/120-mount_ask_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/120-mount_ask_during_init/output b/validation/test-cases/1-init/120-mount_ask_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/120-mount_ask_during_init/output rename to validation/test-cases/1-init/120-mount_ask_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/130-mount_do_during_init/description b/validation/test-cases/1-init/130-mount_do_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/130-mount_do_during_init/description rename to validation/test-cases/1-init/130-mount_do_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/130-mount_do_during_init/input.curl b/validation/test-cases/1-init/130-mount_do_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/130-mount_do_during_init/input.curl rename to validation/test-cases/1-init/130-mount_do_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/130-mount_do_during_init/output b/validation/test-cases/1-init/130-mount_do_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/130-mount_do_during_init/output rename to validation/test-cases/1-init/130-mount_do_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/140-umount_ask_during_init/description b/validation/test-cases/1-init/140-umount_ask_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/140-umount_ask_during_init/description rename to validation/test-cases/1-init/140-umount_ask_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/140-umount_ask_during_init/input.curl b/validation/test-cases/1-init/140-umount_ask_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/140-umount_ask_during_init/input.curl rename to validation/test-cases/1-init/140-umount_ask_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/140-umount_ask_during_init/output b/validation/test-cases/1-init/140-umount_ask_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/140-umount_ask_during_init/output rename to validation/test-cases/1-init/140-umount_ask_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/150-umount_do_during_init/description b/validation/test-cases/1-init/150-umount_do_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/150-umount_do_during_init/description rename to validation/test-cases/1-init/150-umount_do_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/150-umount_do_during_init/input.curl b/validation/test-cases/1-init/150-umount_do_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/150-umount_do_during_init/input.curl rename to validation/test-cases/1-init/150-umount_do_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/150-umount_do_during_init/output b/validation/test-cases/1-init/150-umount_do_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/150-umount_do_during_init/output rename to validation/test-cases/1-init/150-umount_do_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/160-config_ask_during_init/description b/validation/test-cases/1-init/160-config_ask_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/160-config_ask_during_init/description rename to validation/test-cases/1-init/160-config_ask_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/160-config_ask_during_init/input.curl b/validation/test-cases/1-init/160-config_ask_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/160-config_ask_during_init/input.curl rename to validation/test-cases/1-init/160-config_ask_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/160-config_ask_during_init/output b/validation/test-cases/1-init/160-config_ask_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/160-config_ask_during_init/output rename to validation/test-cases/1-init/160-config_ask_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/170-config_do_during_init/description b/validation/test-cases/1-init/170-config_do_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/170-config_do_during_init/description rename to validation/test-cases/1-init/170-config_do_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/170-config_do_during_init/input.curl b/validation/test-cases/1-init/170-config_do_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/170-config_do_during_init/input.curl rename to validation/test-cases/1-init/170-config_do_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/170-config_do_during_init/output b/validation/test-cases/1-init/170-config_do_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/170-config_do_during_init/output rename to validation/test-cases/1-init/170-config_do_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/180-init_ask_during_init/description b/validation/test-cases/1-init/180-init_ask_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/180-init_ask_during_init/description rename to validation/test-cases/1-init/180-init_ask_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/180-init_ask_during_init/input.curl b/validation/test-cases/1-init/180-init_ask_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/180-init_ask_during_init/input.curl rename to validation/test-cases/1-init/180-init_ask_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/180-init_ask_during_init/output b/validation/test-cases/1-init/180-init_ask_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/180-init_ask_during_init/output rename to validation/test-cases/1-init/180-init_ask_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/190-init_do_during_init/description b/validation/test-cases/1-init/190-init_do_during_init/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/190-init_do_during_init/description rename to validation/test-cases/1-init/190-init_do_during_init/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/190-init_do_during_init/input.curl b/validation/test-cases/1-init/190-init_do_during_init/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/190-init_do_during_init/input.curl rename to validation/test-cases/1-init/190-init_do_during_init/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/190-init_do_during_init/output b/validation/test-cases/1-init/190-init_do_during_init/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/190-init_do_during_init/output rename to validation/test-cases/1-init/190-init_do_during_init/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/010-mount_ask/description b/validation/test-cases/2-mount/010-mount_ask/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/010-mount_ask/description rename to validation/test-cases/2-mount/010-mount_ask/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/010-mount_ask/input.curl b/validation/test-cases/2-mount/010-mount_ask/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/010-mount_ask/input.curl rename to validation/test-cases/2-mount/010-mount_ask/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/010-mount_ask/output b/validation/test-cases/2-mount/010-mount_ask/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/010-mount_ask/output rename to validation/test-cases/2-mount/010-mount_ask/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/020-mount_empty_pw/description b/validation/test-cases/2-mount/020-mount_empty_pw/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/020-mount_empty_pw/description rename to validation/test-cases/2-mount/020-mount_empty_pw/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/020-mount_empty_pw/input.curl b/validation/test-cases/2-mount/020-mount_empty_pw/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/020-mount_empty_pw/input.curl rename to validation/test-cases/2-mount/020-mount_empty_pw/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/020-mount_empty_pw/output b/validation/test-cases/2-mount/020-mount_empty_pw/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/020-mount_empty_pw/output rename to validation/test-cases/2-mount/020-mount_empty_pw/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/025-mount_no_pw/description b/validation/test-cases/2-mount/025-mount_no_pw/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/025-mount_no_pw/description rename to validation/test-cases/2-mount/025-mount_no_pw/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/025-mount_no_pw/input.curl b/validation/test-cases/2-mount/025-mount_no_pw/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/025-mount_no_pw/input.curl rename to validation/test-cases/2-mount/025-mount_no_pw/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/025-mount_no_pw/output b/validation/test-cases/2-mount/025-mount_no_pw/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/025-mount_no_pw/output rename to validation/test-cases/2-mount/025-mount_no_pw/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/030-mount_do_invalid_pw/description b/validation/test-cases/2-mount/030-mount_do_invalid_pw/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/030-mount_do_invalid_pw/description rename to validation/test-cases/2-mount/030-mount_do_invalid_pw/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/030-mount_do_invalid_pw/input.curl b/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/030-mount_do_invalid_pw/input.curl rename to validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/030-mount_do_invalid_pw/output b/validation/test-cases/2-mount/030-mount_do_invalid_pw/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/030-mount_do_invalid_pw/output rename to validation/test-cases/2-mount/030-mount_do_invalid_pw/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/040-mount_do_valid/description b/validation/test-cases/2-mount/040-mount_do_valid/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/040-mount_do_valid/description rename to validation/test-cases/2-mount/040-mount_do_valid/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/040-mount_do_valid/input.curl b/validation/test-cases/2-mount/040-mount_do_valid/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/040-mount_do_valid/input.curl rename to validation/test-cases/2-mount/040-mount_do_valid/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/040-mount_do_valid/output b/validation/test-cases/2-mount/040-mount_do_valid/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/040-mount_do_valid/output rename to validation/test-cases/2-mount/040-mount_do_valid/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/050-mount_ask_while_mounted/description b/validation/test-cases/2-mount/050-mount_ask_while_mounted/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/050-mount_ask_while_mounted/description rename to validation/test-cases/2-mount/050-mount_ask_while_mounted/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/050-mount_ask_while_mounted/input.curl b/validation/test-cases/2-mount/050-mount_ask_while_mounted/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/050-mount_ask_while_mounted/input.curl rename to validation/test-cases/2-mount/050-mount_ask_while_mounted/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/050-mount_ask_while_mounted/output b/validation/test-cases/2-mount/050-mount_ask_while_mounted/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/050-mount_ask_while_mounted/output rename to validation/test-cases/2-mount/050-mount_ask_while_mounted/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/060-mount_do_while_mounted/description b/validation/test-cases/2-mount/060-mount_do_while_mounted/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/060-mount_do_while_mounted/description rename to validation/test-cases/2-mount/060-mount_do_while_mounted/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/060-mount_do_while_mounted/input.curl b/validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/060-mount_do_while_mounted/input.curl rename to validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/060-mount_do_while_mounted/output b/validation/test-cases/2-mount/060-mount_do_while_mounted/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/060-mount_do_while_mounted/output rename to validation/test-cases/2-mount/060-mount_do_while_mounted/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/070-umount_ask/description b/validation/test-cases/2-mount/070-umount_ask/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/070-umount_ask/description rename to validation/test-cases/2-mount/070-umount_ask/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/070-umount_ask/input.curl b/validation/test-cases/2-mount/070-umount_ask/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/070-umount_ask/input.curl rename to validation/test-cases/2-mount/070-umount_ask/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/070-umount_ask/output b/validation/test-cases/2-mount/070-umount_ask/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/070-umount_ask/output rename to validation/test-cases/2-mount/070-umount_ask/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/080-umount_do/description b/validation/test-cases/2-mount/080-umount_do/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/080-umount_do/description rename to validation/test-cases/2-mount/080-umount_do/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/080-umount_do/input.curl b/validation/test-cases/2-mount/080-umount_do/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/080-umount_do/input.curl rename to validation/test-cases/2-mount/080-umount_do/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/080-umount_do/output b/validation/test-cases/2-mount/080-umount_do/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/2-mount/080-umount_do/output rename to validation/test-cases/2-mount/080-umount_do/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/100-config_invalid_lang/description b/validation/test-cases/3-config/100-config_invalid_lang/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/100-config_invalid_lang/description rename to validation/test-cases/3-config/100-config_invalid_lang/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/100-config_invalid_lang/input.curl b/validation/test-cases/3-config/100-config_invalid_lang/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/100-config_invalid_lang/input.curl rename to validation/test-cases/3-config/100-config_invalid_lang/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/100-config_invalid_lang/output b/validation/test-cases/3-config/100-config_invalid_lang/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/100-config_invalid_lang/output rename to validation/test-cases/3-config/100-config_invalid_lang/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/110-config_invalid_ip/description b/validation/test-cases/3-config/110-config_invalid_ip/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/110-config_invalid_ip/description rename to validation/test-cases/3-config/110-config_invalid_ip/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/110-config_invalid_ip/input.curl b/validation/test-cases/3-config/110-config_invalid_ip/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/110-config_invalid_ip/input.curl rename to validation/test-cases/3-config/110-config_invalid_ip/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/110-config_invalid_ip/output b/validation/test-cases/3-config/110-config_invalid_ip/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/110-config_invalid_ip/output rename to validation/test-cases/3-config/110-config_invalid_ip/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/120-config_invalid_timeout/description b/validation/test-cases/3-config/120-config_invalid_timeout/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/120-config_invalid_timeout/description rename to validation/test-cases/3-config/120-config_invalid_timeout/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/120-config_invalid_timeout/input.curl b/validation/test-cases/3-config/120-config_invalid_timeout/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/120-config_invalid_timeout/input.curl rename to validation/test-cases/3-config/120-config_invalid_timeout/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/120-config_invalid_timeout/output b/validation/test-cases/3-config/120-config_invalid_timeout/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/120-config_invalid_timeout/output rename to validation/test-cases/3-config/120-config_invalid_timeout/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/500-config_valid/description b/validation/test-cases/3-config/500-config_valid/description similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/500-config_valid/description rename to validation/test-cases/3-config/500-config_valid/description diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/500-config_valid/input.curl b/validation/test-cases/3-config/500-config_valid/input.curl similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/500-config_valid/input.curl rename to validation/test-cases/3-config/500-config_valid/input.curl diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/500-config_valid/output b/validation/test-cases/3-config/500-config_valid/output similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/3-config/500-config_valid/output rename to validation/test-cases/3-config/500-config_valid/output diff --git a/cryptobox.conf.d/usr/share/cryptobox/test-cases/README b/validation/test-cases/README similarity index 100% rename from cryptobox.conf.d/usr/share/cryptobox/test-cases/README rename to validation/test-cases/README diff --git a/cryptobox.conf.d/usr/lib/cryptobox/validate.sh b/validation/validate.sh similarity index 71% rename from cryptobox.conf.d/usr/lib/cryptobox/validate.sh rename to validation/validate.sh index f5a2053..b5eb84e 100755 --- a/cryptobox.conf.d/usr/lib/cryptobox/validate.sh +++ b/validation/validate.sh @@ -1,19 +1,19 @@ #!/bin/sh # -# do a validation - ONLY FOR DEVELOPMENT! -# -# it will not work, if /var/www/report is read-only (as for a production cd) +# do a validation # # use "--help" for a list of possible actions # -# called by: -# - /var/www/cgi-bin/validate.sh for conducting validation tests -# set -eu -# parse config file -. /etc/cryptobox/cryptobox.conf +CB_ROOT_DIR=$(dirname $0)/.. +TEST_CASES_DIR=$CB_ROOT_DIR/validation/test-cases +# TODO: take care, that this file exists! (it is created during "upload", "diff" or "merge") +HOST_IP=192.168.0.23 +REPORT_DIR=/tmp/cryptobox-validation-$$ +REPORT_DIR=$CB_ROOT_DIR/validation/report +SUMMARY_TEMPLATE_DIR=$CB_ROOT_DIR/validation/templates function error_die() @@ -45,7 +45,7 @@ function do_series() { [ -d "$REPORT_DIR/$1" ] && rm -r "$REPORT_DIR/$1" mkdir -p "$REPORT_DIR/$1" - find "$TEST_CASES_DIR/$1" -type d -maxdepth 1 -mindepth 1 | grep -v "/\.\.*$" | sort | while read a + find "$TEST_CASES_DIR/$1" -type d -maxdepth 1 -mindepth 1 | grep -v "/\.[^/]*$" | sort | while read a do do_single "$a" "$REPORT_DIR/$1" done create_summary "$REPORT_DIR/$1" >"$REPORT_DIR/$1/summary.html" @@ -79,12 +79,32 @@ create_summary() } +import_style() +# get the stylesheet file and images +# change the stylesheet link +{ + [ -d "REPORT_DIR/img" ] && rm -r "$REPORT_DIR/img" + mkdir -p "$REPORT_DIR/img" + [ -e "$REPORT_DIR/cryptobox.css" ] && rm "$REPORT_DIR/cryptobox.css" + wget -q -O "$REPORT_DIR/cryptobox.css" http://$HOST_IP/cryptobox.css + # extract image file names + grep "url(img/" "$REPORT_DIR/cryptobox.css" | sed 's#^.*url(img/\(.*\)).*$#\1#' | while read a + do wget -q -O "$REPORT_DIR/img/$a" "http://$HOST_IP/img/$a" + done + + # change the stylesheet link in every html file in REPORT_DIR + find "$REPORT_DIR" -type f -name \*.html | while read a + do sed -i '#link rel="stylesheet"#s#href="/cryptobox.css"#href="../cryptobox.css"#g' "$a" + done +} + + ACTION="--help" [ $# -gt 0 ] && ACTION=$1 case "$ACTION" in list ) - find "$TEST_CASES_DIR" -type d -maxdepth 1 -mindepth 1 | grep -v "/\.\.*$" | sort | while read a + find "$TEST_CASES_DIR" -type d -maxdepth 1 -mindepth 1 | grep -v "/\.[^/]*$" | sort | while read a do echo $(basename "$a") done ;; @@ -93,6 +113,7 @@ case "$ACTION" in CASE_DIR="$TEST_CASES_DIR/$2" [ ! -d "$CASE_DIR" ] && error_die 2 "the test case was not found ($CASE_DIR)!" do_series "$2" + import_style ;; check_all ) "$0" list | sort | while read a