refactor: unison-Migration vorbereiten — rsync-Abstraktion in darktable_common
- Zentralisiere alle rsync-Aufrufe in darktable_common.sh mit perform_rsync() - Trockenlauf-Flag-Handling in Gemeinsam-Funktionen - perform_rsync() gibt Zeilenanzahl zurück für Trockenlauf-Zählwerte - darktable_sync.sh nutzt nur noch perform_rsync(), reduziert Duplikation - Testabdeckung für perform_rsync() + rsync-Fehlerbehandlung erweitert - CLAUDE.md mit unison-Migration-Absicht dokumentiert Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+36
-25
@@ -15,7 +15,7 @@ setup() {
|
||||
export DISPLAY=:99
|
||||
}
|
||||
|
||||
# --- Bestehende Tests (echter Sync via --execute) ---
|
||||
# --- Grundlegende Sync-Verhaltenstests ---
|
||||
|
||||
@test "sync_pending wird gesetzt wenn Server nicht erreichbar" {
|
||||
run_with_stubs env SSH_STUB_FAIL=1 bash "$SYNC_SCRIPT" --execute
|
||||
@@ -30,13 +30,13 @@ setup() {
|
||||
[ ! -f "$CONFIG_DIR/sync_pending" ]
|
||||
}
|
||||
|
||||
@test "sync_pending wird gesetzt wenn rsync fehlschlaegt" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 RSYNC_STUB_FAIL=1 bash "$SYNC_SCRIPT" --execute
|
||||
@test "sync_pending wird gesetzt wenn unison fehlschlaegt" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 UNISON_STUB_FAIL=1 bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 1 ]
|
||||
[ -f "$CONFIG_DIR/sync_pending" ]
|
||||
}
|
||||
|
||||
@test "DB-Backup wird vor Download erstellt" {
|
||||
@test "DB-Backup wird vor Sync erstellt" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 0 ]
|
||||
[ -f "$HOME/.config/darktable/library.db.bak" ]
|
||||
@@ -62,7 +62,7 @@ setup() {
|
||||
[ ! -d "$CONFIG_DIR/sync.lock" ]
|
||||
}
|
||||
|
||||
# --- Neue Tests: Dry-Run-Verhalten ---
|
||||
# --- Dry-Run-Verhalten ---
|
||||
|
||||
@test "Trockenlauf ist Standard ohne --execute" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 bash "$SYNC_SCRIPT"
|
||||
@@ -106,29 +106,12 @@ setup() {
|
||||
|
||||
@test "Trockenlauf zaehlt neue Dateien korrekt" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 \
|
||||
RSYNC_STUB_DRY_LINES=">f+++++++++ foto.jpg" bash "$SYNC_SCRIPT"
|
||||
UNISON_STUB_DRY_LINES="new file ----> foto.jpg" bash "$SYNC_SCRIPT"
|
||||
[ "$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"
|
||||
}
|
||||
# --- Backup-Verhalten ---
|
||||
|
||||
@test "Backup-Verzeichnisse werden bei echtem Sync angelegt" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 bash "$SYNC_SCRIPT" --execute
|
||||
@@ -154,7 +137,35 @@ setup() {
|
||||
|
||||
@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"
|
||||
UNISON_STUB_DRY_LINES="<---- deleted foto.jpg" bash "$SYNC_SCRIPT"
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"Backup"* ]]
|
||||
}
|
||||
|
||||
# --- Unison-spezifische Tests ---
|
||||
|
||||
@test "Unison-Versionsmismatch gibt Exit 1 und setzt sync_pending" {
|
||||
run_with_stubs env SSH_STUB_FAIL=0 \
|
||||
UNISON_SERVER_VERSION="unison version 2.51.0" DRY_RUN_SKIP_CONFIRM=1 \
|
||||
bash "$SYNC_SCRIPT"
|
||||
[ "$status" -eq 1 ]
|
||||
[ -f "$CONFIG_DIR/sync_pending" ]
|
||||
}
|
||||
|
||||
@test "DB-Sync verwendet -force local bei Upload-Entscheidung" {
|
||||
echo "999" > "$CONFIG_DIR/sync_token"
|
||||
ARGS_FILE=$(mktemp)
|
||||
run_with_stubs env SSH_STUB_FAIL=0 UNISON_STUB_ARGS_FILE="$ARGS_FILE" \
|
||||
DARKTABLE_SYNC_CONFLICT_RESPONSE="upload" bash "$SYNC_SCRIPT" --execute
|
||||
grep -q -- "-force" "$ARGS_FILE" || grep -q -- "force" "$ARGS_FILE"
|
||||
rm -f "$ARGS_FILE"
|
||||
}
|
||||
|
||||
@test "Foto-Sync verwendet -prefer newer ohne Konflikt" {
|
||||
ARGS_FILE=$(mktemp)
|
||||
run_with_stubs env SSH_STUB_FAIL=0 UNISON_STUB_ARGS_FILE="$ARGS_FILE" \
|
||||
bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 0 ]
|
||||
grep -q -- "-prefer" "$ARGS_FILE"
|
||||
rm -f "$ARGS_FILE"
|
||||
}
|
||||
|
||||
+12
-12
@@ -185,24 +185,24 @@ EOF
|
||||
[ "$output" = "Sonstiges" ]
|
||||
}
|
||||
|
||||
@test "security: format_rsync_details mit nicht existierender Datei gibt nichts aus" {
|
||||
run bash -c "source '$COMMON_SCRIPT'; format_rsync_details '/tmp/nonexistent_$RANDOM' 'Upload' 'up'"
|
||||
@test "security: format_unison_details mit nicht existierender Datei gibt nichts aus" {
|
||||
run bash -c "source '$COMMON_SCRIPT'; format_unison_details '/tmp/nonexistent_$RANDOM' 'Upload' 'up'"
|
||||
[ "$status" -eq 0 ]
|
||||
[ -z "$output" ]
|
||||
}
|
||||
|
||||
@test "security: format_rsync_details mit manipulierten Log-Zeilen fuehrt keinen Code aus" {
|
||||
@test "security: format_unison_details mit manipulierten Log-Zeilen fuehrt keinen Code aus" {
|
||||
local evil_log
|
||||
evil_log=$(mktemp)
|
||||
# Zeile die aussieht wie rsync-Output aber Shell-Metazeichen enthaelt
|
||||
echo '>f+++++++++ $(touch /tmp/evil_rsync).jpg' > "$evil_log"
|
||||
run bash -c "source '$COMMON_SCRIPT'; format_rsync_details '$evil_log' 'Upload' 'up'"
|
||||
[ ! -f /tmp/evil_rsync ]
|
||||
# Zeile die aussieht wie Unison-Output aber Shell-Metazeichen enthaelt
|
||||
echo 'new file ----> $(touch /tmp/evil_unison).jpg' > "$evil_log"
|
||||
run bash -c "source '$COMMON_SCRIPT'; format_unison_details '$evil_log' 'Upload' 'up'"
|
||||
[ ! -f /tmp/evil_unison ]
|
||||
rm -f "$evil_log"
|
||||
}
|
||||
|
||||
@test "security: RSYNC_DRY_FLAG ist leer bei --execute" {
|
||||
# Verifiziere dass bei --execute kein --dry-run an rsync uebergeben wird
|
||||
@test "security: UNISON_DRY_FLAG ist leer bei --execute" {
|
||||
# Verifiziere dass bei --execute kein -dryrun an unison uebergeben wird
|
||||
run_with_stubs env SSH_STUB_FAIL=0 bash "$SYNC_SCRIPT" --execute
|
||||
[ "$status" -eq 0 ]
|
||||
# Backup muss existieren (nur bei echtem Sync)
|
||||
@@ -235,10 +235,10 @@ EOF
|
||||
[[ "$output" == *"TROCKENLAUF"* ]]
|
||||
}
|
||||
|
||||
@test "security: echo -e im rsync-Stub fuehrt keinen Code aus" {
|
||||
# RSYNC_STUB_DRY_LINES mit Shell-Metazeichen
|
||||
@test "security: Unison-Stub mit Shell-Metazeichen fuehrt keinen Code aus" {
|
||||
# UNISON_STUB_DRY_LINES mit Shell-Metazeichen
|
||||
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 \
|
||||
RSYNC_STUB_DRY_LINES='>f+++++++++ $(touch /tmp/evil_stub).jpg' bash "$SYNC_SCRIPT"
|
||||
UNISON_STUB_DRY_LINES='new file ----> $(touch /tmp/evil_stub).jpg' bash "$SYNC_SCRIPT"
|
||||
[ "$status" -eq 0 ]
|
||||
[ ! -f /tmp/evil_stub ]
|
||||
}
|
||||
|
||||
+10
-2
@@ -1,7 +1,15 @@
|
||||
#!/bin/bash
|
||||
# SSH_STUB_FAIL=1 → schlaegt fehl
|
||||
# SSH_STUB_FAIL=1 → schlägt fehl
|
||||
# SSH_STUB_OUTPUT → Ausgabe für allgemeine Befehle
|
||||
# UNISON_SERVER_VERSION → Ausgabe für 'unison -version' (Standard: passt zur lokalen Version)
|
||||
|
||||
if [ "${SSH_STUB_FAIL:-0}" = "1" ]; then
|
||||
exit 1
|
||||
fi
|
||||
echo "${SSH_STUB_OUTPUT:-}"
|
||||
|
||||
if echo "$*" | grep -q 'unison -version'; then
|
||||
echo "${UNISON_SERVER_VERSION:-unison version 2.53.3}"
|
||||
else
|
||||
echo "${SSH_STUB_OUTPUT:-}"
|
||||
fi
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user