Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(backup): fail the run on any non-vanished cp error
Yudhi Armyndharisec8fb9aba40d
diff --git a/scripts/backup.sh b/scripts/backup.shindex 64aa3f6d4..e1012938e 100755--- a/scripts/backup.sh+++ b/scripts/backup.sh@@ -149,11 +149,13 @@ EOF# cp walked the tree (Chromium cache and LevelDB churn, the Baileys store's temp files and consumed# keys, media retention and plugin storage writes) is a torn copy, not a failed backup. With a label# the copy is engine auth state and goes in ENGINE-STATE-NOTE; without one it is only logged. Every-# other cp error stays fatal.+# other cp error stays fatal. cp runs in the C locale so the error text matched here is the one it+# prints, and grep reads a here-string: piped from printf, a grep -q that stops at the first fatal line+# breaks the pipe once the errors outgrow its buffer, and pipefail then reads a failure as benign.copy_live_tree() {local err- if ! err="$(cp -pRH "$1" "$2" 2>&1)"; then- if printf '%s\n' "$err" | grep -qv 'No such file or directory'; then+ if ! err="$(LC_ALL=C cp -pRH "$1" "$2" 2>&1)"; then+ if grep -qv 'No such file or directory' <<<"$err"; thenprintf '%s\n' "$err" >&2exit 1fidiff --git a/scripts/smoke-test-backup-restore.sh b/scripts/smoke-test-backup-restore.shindex 119f12e94..3a5d38b62 100755--- a/scripts/smoke-test-backup-restore.sh+++ b/scripts/smoke-test-backup-restore.sh@@ -45,7 +45,7 @@# (ac) a missing Baileys auth dir is reported when data/.env.generated selects the Baileys engine# (ad) a file an engine deletes during the sessions/ or baileys/ copy is noted instead of failing the# backup, a file the app deletes during the media or plugin copies is logged, and any other cp-# error still fails it+# error still fails it, however long its output and whatever the host's locale## Usage: ./scripts/smoke-test-backup-restore.sh# Requires: bash, tar, node (restore.sh path resolution). sqlite3 is optional (see (c) and (k)).@@ -1280,11 +1280,24 @@ printf 'profile\n' >"$AD/data/sessions/session-s1/Preferences"printf '{}' >"$AD/data/baileys/s1/creds.json"printf 'jpeg\n' >"$AD/data/media/status.jpg"printf '{}' >"$AD/data/plugins/registry.json"+# SHIM_CP_LINES repeats the error past a pipe buffer, the size of a real tree's worth of failures. Without+# LC_ALL=C the vanished-file text comes out translated, as cp prints it on a localized host.cat >"$AD/shim/cp" <<SHIM#!/bin/sh$(command -v cp) "\$@" || exit+msg="\$SHIM_CP_ERROR"+if [ "\${LC_ALL:-}" != C ] && [ "\$msg" = 'No such file or directory' ]; then+ msg='Datei oder Verzeichnis nicht gefunden'+ficase "\$3" in- */sessions | */baileys | */media | */plugin-*) echo "cp: cannot stat '\$2/gone': \$SHIM_CP_ERROR" >&2; exit 1 ;;+ */sessions | */baileys | */media | */plugin-*)+ i=0+ while [ "\$i" -lt "\${SHIM_CP_LINES:-1}" ]; do+ echo "cp: cannot stat '\$2/gone\$i': \$msg" >&2+ i=\$((i + 1))+ done+ exit 1+ ;;esacSHIMchmod +x "$AD/shim/cp"@@ -1306,12 +1319,13 @@ for tree in media plugins; dofidoneset +e-OUT_AD="$(cd "$AD" && SHIM_CP_ERROR='Permission denied' PATH="$AD/shim:$PATH" BACKUP_DIR="$AD/out2" "$BACKUP" 2>&1)"+OUT_AD="$(cd "$AD" && SHIM_CP_ERROR='Permission denied' SHIM_CP_LINES=20000 PATH="$AD/shim:$PATH" \+ BACKUP_DIR="$AD/out2" "$BACKUP" 2>&1)"RC_AD=$?set -e-if [ "$RC_AD" -eq 0 ] || ! printf '%s' "$OUT_AD" | grep -q 'Permission denied' ||+if [ "$RC_AD" -eq 0 ] || ! grep -q 'Permission denied' <<<"$OUT_AD" ||[ -n "$(ls "$AD"/out2/openwa-backup-*.tar.gz 2>/dev/null)" ]; then- fail "(ad) a cp error other than a vanished file did not fail the backup: $OUT_AD"+ fail "(ad) a cp error other than a vanished file did not fail the backup: $(tail -n 5 <<<"$OUT_AD")"fipass "(ad) a vanished engine file is noted, a vanished media or plugin file logged, other cp errors fatal"