j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-11 04:36:48 +00:00
Code Issues Projects Releases Wiki Activity

feat(installer): idempotent secret-key, settings, perms and nginx primitives

Browse source
This commit is contained in:
catborise 2026-10-07 15:01:59 +03:00
parent e84db7542d
commit 3e4f3f339c
2 changed files with 130 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

70
conf/test_install_lib.sh Executable file
View file

@ -0,0 +1,70 @@
#!/usr/bin/env bash
# Unit tests for conf/install-lib.sh. Run: bash conf/test_install_lib.sh
set -u
here="$(cd "$(dirname "$0")" && pwd)"
# shellcheck source=/dev/null
. "$here/install-lib.sh"
fail=0
check() { if eval "$2"; then echo "ok - $1"; else echo "NOT ok - $1"; fail=1; fi; }
tmp="$(mktemp -d)"
trap 'rm -rf "$tmp"' EXIT
# wvc_ensure_secret_key: creates, keeps, mode 600, regenerates when empty
wvc_ensure_secret_key "$tmp/data"
check "secret key created" "[ -s '$tmp/data/secret_key' ]"
check "secret key mode 600" "[ \"\$(stat -c %a '$tmp/data/secret_key')\" = 600 ]"
first="$(cat "$tmp/data/secret_key")"
wvc_ensure_secret_key "$tmp/data"
check "existing key kept" "[ \"\$(cat '$tmp/data/secret_key')\" = \"$first\" ]"
: > "$tmp/data/secret_key" # truncate
wvc_ensure_secret_key "$tmp/data"
check "empty key regenerated" "[ -s '$tmp/data/secret_key' ]"
check "data dir is 700" "[ \"\$(stat -c %a '$tmp/data')\" = 700 ]"
# wvc_ensure_settings: creates once, keeps on re-run
echo "TEMPLATE" > "$tmp/tpl"
check "ensure_settings returns 0 on create" "wvc_ensure_settings '$tmp/tpl' '$tmp/settings.py'"
echo "EDITED" > "$tmp/settings.py"
check "ensure_settings returns 1 when present" "! wvc_ensure_settings '$tmp/tpl' '$tmp/settings.py'"
check "existing settings kept" "[ \"\$(cat '$tmp/settings.py')\" = EDITED ]"
# wvc_harden_modes
mkdir -p "$tmp/app/webvirtcloud" "$tmp/app/data"
echo x > "$tmp/app/webvirtcloud/settings.py"; echo x > "$tmp/app/db.sqlite3"
echo k > "$tmp/app/data/secret_key"
wvc_harden_modes "$tmp/app/webvirtcloud/settings.py" "$tmp/app/db.sqlite3" "$tmp/app/data"
check "settings 600" "[ \"\$(stat -c %a '$tmp/app/webvirtcloud/settings.py')\" = 600 ]"
check "db 600" "[ \"\$(stat -c %a '$tmp/app/db.sqlite3')\" = 600 ]"
check "data 700" "[ \"\$(stat -c %a '$tmp/app/data')\" = 700 ]"
check "secret 600" "[ \"\$(stat -c %a '$tmp/app/data/secret_key')\" = 600 ]"
# wvc_install_nginx: first run installs main + snippet, keeps backup; re-run keeps main
etc="$tmp/etc/nginx"; mkdir -p "$etc"
echo "ORIGINAL" > "$etc/nginx.conf"
echo "MAINTPL" > "$tmp/main_tpl"; echo "SNIPPET" > "$tmp/snippet"
wvc_install_nginx "$tmp/main_tpl" "$tmp/snippet" "$etc"
check "main replaced on first run" "[ \"\$(cat '$etc/nginx.conf')\" = MAINTPL ]"
check "original backed up" "[ \"\$(cat '$etc/nginx.conf.wvc-orig')\" = ORIGINAL ]"
check "snippet installed" "[ \"\$(cat '$etc/conf.d/webvirtcloud.conf')\" = SNIPPET ]"
echo "HANDEDITED" > "$etc/nginx.conf"
echo "SNIPPET2" > "$tmp/snippet"
wvc_install_nginx "$tmp/main_tpl" "$tmp/snippet" "$etc"
check "main NOT replaced on re-run" "[ \"\$(cat '$etc/nginx.conf')\" = HANDEDITED ]"
check "snippet refreshed on re-run" "[ \"\$(cat '$etc/conf.d/webvirtcloud.conf')\" = SNIPPET2 ]"
# fresh host: no existing main nginx.conf must not error
etc2="$tmp/etc2/nginx"; mkdir -p "$etc2"
wvc_install_nginx "$tmp/main_tpl" "$tmp/snippet" "$etc2"
check "fresh host installs main" "[ \"\$(cat '$etc2/nginx.conf')\" = MAINTPL ]"
# fresh host (no original config): a second run must NOT clobber operator edits
etc3="$tmp/etc3/nginx"; mkdir -p "$etc3"
wvc_install_nginx "$tmp/main_tpl" "$tmp/snippet" "$etc3"
echo "OP_EDIT" > "$etc3/nginx.conf"
wvc_install_nginx "$tmp/main_tpl" "$tmp/snippet" "$etc3"
check "no-orig second run keeps operator edit" "[ \"\$(cat '$etc3/nginx.conf')\" = OP_EDIT ]"
[ "$fail" = 0 ] && echo "ALL PASS" || echo "FAILURES"
exit "$fail"