feat: Lösch-Synchronisation mit lokalem Backup und Bereinigung
Gelöschte Dateien werden beim Download ins Backup-Verzeichnis verschoben
(${LOCAL_PHOTO_DIR}-bak, ${LOCAL_DARKTABLE_DB_DIR}-bak) statt permanent
gelöscht. Upload verwendet --delete ohne Backup. Backups älter als 2 Jahre
werden automatisch bereinigt. Safeguard verhindert --delete bei leerem
Quellverzeichnis. validate_path prüft jetzt auch lokale Pfade.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -75,3 +75,40 @@ COMMON_SCRIPT="$BATS_TEST_DIRNAME/../scripts/darktable_common.sh"
|
||||
rm -f "$TMP_SCRIPT"
|
||||
[ "$status" -eq 1 ]
|
||||
}
|
||||
|
||||
# --- cleanup_old_backups ---
|
||||
|
||||
@test "cleanup_old_backups: nicht existierendes Verzeichnis gibt kein Fehler" {
|
||||
run bash -c "source '$COMMON_SCRIPT'; cleanup_old_backups '/tmp/nonexistent_bak_$RANDOM'"
|
||||
[ "$status" -eq 0 ]
|
||||
}
|
||||
|
||||
@test "cleanup_old_backups: Datei juenger als 730 Tage bleibt erhalten" {
|
||||
BACKUP="$BATS_TMPDIR/backup_test"
|
||||
mkdir -p "$BACKUP"
|
||||
touch "$BACKUP/recent.jpg"
|
||||
run bash -c "source '$COMMON_SCRIPT'; cleanup_old_backups '$BACKUP'"
|
||||
[ "$status" -eq 0 ]
|
||||
[ -f "$BACKUP/recent.jpg" ]
|
||||
rm -rf "$BACKUP"
|
||||
}
|
||||
|
||||
@test "cleanup_old_backups: Datei aelter als 730 Tage wird geloescht" {
|
||||
BACKUP="$BATS_TMPDIR/backup_old"
|
||||
mkdir -p "$BACKUP"
|
||||
touch -d "3 years ago" "$BACKUP/old.jpg"
|
||||
run bash -c "source '$COMMON_SCRIPT'; cleanup_old_backups '$BACKUP'"
|
||||
[ "$status" -eq 0 ]
|
||||
[ ! -f "$BACKUP/old.jpg" ]
|
||||
rm -rf "$BACKUP"
|
||||
}
|
||||
|
||||
@test "cleanup_old_backups: leere Unterverzeichnisse werden entfernt" {
|
||||
BACKUP="$BATS_TMPDIR/backup_empty"
|
||||
mkdir -p "$BACKUP/subdir"
|
||||
touch -d "3 years ago" "$BACKUP/subdir/old.jpg"
|
||||
run bash -c "source '$COMMON_SCRIPT'; cleanup_old_backups '$BACKUP'"
|
||||
[ "$status" -eq 0 ]
|
||||
[ ! -d "$BACKUP/subdir" ]
|
||||
rm -rf "$BACKUP"
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ setup() {
|
||||
touch "$HOME/.config/darktable/data.db"
|
||||
rm -f "$HOME/.config/darktable/"*.bak
|
||||
mkdir -p "$HOME/Pictures"
|
||||
touch "$HOME/Pictures/test.jpg"
|
||||
export DISPLAY=:99
|
||||
}
|
||||
|
||||
@@ -109,3 +110,51 @@ setup() {
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"neu"* ]]
|
||||
}
|
||||
|
||||
# --- Tests: --delete und Backup-Verhalten ---
|
||||
|
||||
@test "Upload-rsync enthaelt --delete Flag" {
|
||||
ARGS_FILE=$(mktemp)
|
||||
run_with_stubs env SSH_STUB_FAIL=0 RSYNC_STUB_ARGS_FILE="$ARGS_FILE" bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 0 ]
|
||||
grep -q -- "--delete" "$ARGS_FILE"
|
||||
rm -f "$ARGS_FILE"
|
||||
}
|
||||
|
||||
@test "Download-rsync enthaelt --backup und --backup-dir" {
|
||||
ARGS_FILE=$(mktemp)
|
||||
run_with_stubs env SSH_STUB_FAIL=0 RSYNC_STUB_ARGS_FILE="$ARGS_FILE" bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 0 ]
|
||||
grep -q -- "--backup" "$ARGS_FILE"
|
||||
grep -q -- "--backup-dir=" "$ARGS_FILE"
|
||||
rm -f "$ARGS_FILE"
|
||||
}
|
||||
|
||||
@test "Backup-Verzeichnisse werden bei echtem Sync angelegt" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 0 ]
|
||||
[ -d "$HOME/Pictures-bak" ]
|
||||
[ -d "$HOME/.config/darktable-bak" ]
|
||||
}
|
||||
|
||||
@test "Trockenlauf legt keine Backup-Verzeichnisse an" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 bash "$SYNC_SCRIPT"
|
||||
[ "$status" -eq 0 ]
|
||||
[ ! -d "$HOME/Pictures-bak" ]
|
||||
[ ! -d "$HOME/.config/darktable-bak" ]
|
||||
}
|
||||
|
||||
@test "Upload bricht ab wenn Foto-Quellverzeichnis leer ist" {
|
||||
rm -f "$HOME/Pictures/"*
|
||||
run_with_stubs env SSH_STUB_FAIL=0 bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 1 ]
|
||||
[[ "$output" == *"leer"* ]]
|
||||
[ -f "$CONFIG_DIR/sync_pending" ]
|
||||
}
|
||||
|
||||
@test "Trockenlauf-Ergebnis zeigt Backup-Hinweis bei Loeschungen" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 \
|
||||
RSYNC_STUB_DRY_LINES="*deleting foto.jpg" bash "$SYNC_SCRIPT"
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"Backup"* ]]
|
||||
}
|
||||
|
||||
@@ -23,9 +23,10 @@ SYNC_BIN=$HOME/.local/bin/darktable_sync.sh
|
||||
EOF
|
||||
}
|
||||
|
||||
# Raeumt nach jedem Test auf (verhindert Lock-Leakage zwischen Tests)
|
||||
# Raeumt nach jedem Test auf (verhindert Lock- und Backup-Dir-Leakage zwischen Tests)
|
||||
teardown() {
|
||||
rm -rf "$CONFIG_DIR/sync.lock"
|
||||
rm -rf "$HOME/Pictures-bak" "$HOME/.config/darktable-bak"
|
||||
}
|
||||
|
||||
# Fuehrt ein Script mit dem Stubs-Verzeichnis vorne im PATH aus
|
||||
|
||||
@@ -13,6 +13,7 @@ setup() {
|
||||
touch "$HOME/.config/darktable/library.db"
|
||||
touch "$HOME/.config/darktable/data.db"
|
||||
mkdir -p "$HOME/Pictures"
|
||||
touch "$HOME/Pictures/test.jpg"
|
||||
export DISPLAY=:99
|
||||
}
|
||||
|
||||
@@ -241,3 +242,29 @@ EOF
|
||||
[ "$status" -eq 0 ]
|
||||
[ ! -f /tmp/evil_stub ]
|
||||
}
|
||||
|
||||
# --- Backup-Pfad Security ---
|
||||
|
||||
@test "security: LOCAL_PHOTO_DIR mit Path-Traversal wird geblockt" {
|
||||
create_valid_env
|
||||
echo "LOCAL_PHOTO_DIR=/home/user/../../../etc/photos" >> "$CONFIG_DIR/.env"
|
||||
run bash -c "source '$COMMON_SCRIPT'; load_config; validate_config"
|
||||
[ "$status" -eq 1 ]
|
||||
[[ "$output" == *"LOCAL_PHOTO_DIR"* ]]
|
||||
}
|
||||
|
||||
@test "security: LOCAL_DARKTABLE_DB_DIR mit Path-Traversal wird geblockt" {
|
||||
create_valid_env
|
||||
echo "LOCAL_DARKTABLE_DB_DIR=/home/user/../../../etc/dt" >> "$CONFIG_DIR/.env"
|
||||
run bash -c "source '$COMMON_SCRIPT'; load_config; validate_config"
|
||||
[ "$status" -eq 1 ]
|
||||
[[ "$output" == *"LOCAL_DARKTABLE_DB_DIR"* ]]
|
||||
}
|
||||
|
||||
@test "security: LOCAL_PHOTO_DIR mit Single-Quote wird geblockt" {
|
||||
create_valid_env
|
||||
printf 'LOCAL_PHOTO_DIR="/home/user/pics'"'"'injection"\n' >> "$CONFIG_DIR/.env"
|
||||
run bash -c "source '$COMMON_SCRIPT'; load_config; validate_config"
|
||||
[ "$status" -eq 1 ]
|
||||
[[ "$output" == *"LOCAL_PHOTO_DIR"* ]]
|
||||
}
|
||||
|
||||
+6
-2
@@ -1,7 +1,11 @@
|
||||
#!/bin/bash
|
||||
# rsync-Stub: Verhalten per Umgebungsvariable steuerbar
|
||||
# RSYNC_STUB_FAIL=1 → schlaegt fehl
|
||||
# RSYNC_STUB_DRY_LINES → Ausgabe bei --dry-run (Zeilenumbrüche als \n)
|
||||
# RSYNC_STUB_FAIL=1 → schlaegt fehl
|
||||
# RSYNC_STUB_DRY_LINES → Ausgabe bei --dry-run (Zeilenumbrüche als \n)
|
||||
# RSYNC_STUB_ARGS_FILE → Pfad zu Datei, in die alle Argumente geschrieben werden
|
||||
if [ -n "${RSYNC_STUB_ARGS_FILE:-}" ]; then
|
||||
echo "$*" >> "$RSYNC_STUB_ARGS_FILE"
|
||||
fi
|
||||
if [ "${RSYNC_STUB_FAIL:-0}" = "1" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user