Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 98722536f1 | |||
| 50e3b46cc9 | |||
| 41f2ce85cc | |||
| 0dd2464108 | |||
| faa65dde2f | |||
| d714f95cb7 | |||
| 688f93cfb9 |
@@ -0,0 +1,71 @@
|
|||||||
|
# darktable-sync — Projektdokumentation für Claude
|
||||||
|
|
||||||
|
## Zweck
|
||||||
|
Bash-Skripte zur bidirektionalen Synchronisation der Darktable-Datenbank und Fotobibliothek zwischen lokalem Rechner und einem Server via rsync/SSH. Entwickelt für Linux mit systemd.
|
||||||
|
|
||||||
|
## Architektur
|
||||||
|
|
||||||
|
```
|
||||||
|
darktable_wrapper.sh → Startet Pre-/Post-Sync, dann Darktable
|
||||||
|
darktable_sync.sh → Hauptsync-Engine (Upload + Download)
|
||||||
|
darktable_common.sh → Gemeinsame Hilfsfunktionen (wird per source eingebunden)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Ablauf darktable_sync.sh
|
||||||
|
1. Dependencies prüfen (rsync, ssh, notify-send, darktable)
|
||||||
|
2. Config laden und validieren
|
||||||
|
3. Lock erwerben (atomares `mkdir`)
|
||||||
|
4. Dry-Run-Modus prüfen (Standard: Trockenlauf; `--execute`/`-e` für echten Sync)
|
||||||
|
5. Darktable-Prozess prüfen (Sync verboten wenn darktable läuft)
|
||||||
|
6. Server-Erreichbarkeit prüfen → `sync_pending` bei Fehler
|
||||||
|
7. Active-Marker prüfen (verhindert gleichzeitige Clients)
|
||||||
|
8. Darktable-Versionen abgleichen (Major.Minor müssen übereinstimmen)
|
||||||
|
9. Sync-Token prüfen (Konflikterkennung bei mehreren Clients)
|
||||||
|
10. DB-Backup erstellen (library.db.bak, data.db.bak) — nur bei `--execute`
|
||||||
|
11. Backup-Verzeichnisse anlegen (`${LOCAL_PHOTO_DIR}-bak`, `${LOCAL_DARKTABLE_DB_DIR}-bak`)
|
||||||
|
12. Upload: DB und Fotos mit `--delete` (lokal gelöscht → Server gelöscht)
|
||||||
|
13. Download: DB und Fotos mit `--delete --backup --backup-dir` (lokal gelöscht → ins `-bak`-Verzeichnis)
|
||||||
|
14. Sync-Token und Versionsdatei speichern
|
||||||
|
15. Alte Backups bereinigen (`cleanup_old_backups`, >730 Tage)
|
||||||
|
|
||||||
|
## Konfiguration
|
||||||
|
- Datei: `~/.config/darktable-sync/.env` (Permissions: 600)
|
||||||
|
- Wichtige Variablen: `SERVER_IP`, `SERVER_USER`, `SERVER_SSH_PORT`, `SERVER_DB_DIR`, `SERVER_PHOTO_DIR`, `LOCAL_DARKTABLE_DB_DIR`, `LOCAL_PHOTO_DIR`, `DARKTABLE_BIN`, `SYNC_BIN`
|
||||||
|
- Vorlage: `.env.example`
|
||||||
|
|
||||||
|
## rsync-Flags
|
||||||
|
| Operation | Flags |
|
||||||
|
|---|---|
|
||||||
|
| Upload DB | `-uavh --itemize-changes --delete --exclude '*.lock' --exclude 'darktable_version'` |
|
||||||
|
| Upload Fotos | `-uavh --itemize-changes --delete --exclude '*.lock'` |
|
||||||
|
| Download DB | `-uavh --itemize-changes --delete --backup --backup-dir="${LOCAL_DARKTABLE_DB_DIR}-bak"` |
|
||||||
|
| Download Fotos | `-uavh --itemize-changes --delete --backup --backup-dir="${LOCAL_PHOTO_DIR}-bak"` |
|
||||||
|
|
||||||
|
Dry-Run: `RSYNC_DRY_FLAG=(--dry-run)` wird zu allen Aufrufen hinzugefügt.
|
||||||
|
|
||||||
|
## itemize-changes Format
|
||||||
|
- `>f+++++++++` — neue Datei (Upload)
|
||||||
|
- `<f+++++++++` — neue Datei (Download)
|
||||||
|
- `>f` / `<f` ohne `+` — aktualisiert
|
||||||
|
- `*deleting` — gelöscht
|
||||||
|
|
||||||
|
## Sicherheitsmechanismen
|
||||||
|
- `validate_path`: Blockiert `' " ; | & \` $ ( ) \` und `..` in Pfaden (Server- UND lokale Pfade)
|
||||||
|
- `load_config`: Blockiert `; | & \`` in der .env vor dem source
|
||||||
|
- Leeres Quellverzeichnis vor Upload → Abbruch (Schutz vor falschem Mount)
|
||||||
|
- Atomares Locking via `mkdir`
|
||||||
|
- SSH immer mit `BatchMode=yes` und `ConnectTimeout=5`
|
||||||
|
|
||||||
|
## Test-Infrastruktur
|
||||||
|
- Framework: **BATS** (`tests/*.bats`)
|
||||||
|
- Stubs in `tests/stubs/`: `rsync`, `ssh`, `darktable`, `notify-send`, `pgrep`, `zenity`, `kdialog`
|
||||||
|
- Stub-Aktivierung: `run_with_stubs` setzt `tests/stubs/` vorne in PATH
|
||||||
|
- Steuerung via Env-Variablen: `RSYNC_STUB_FAIL`, `RSYNC_STUB_DRY_LINES`, `RSYNC_STUB_ARGS_FILE`, `SSH_STUB_FAIL`, `SSH_STUB_OUTPUT`, `PGREP_STUB_FOUND`
|
||||||
|
- Setup: `create_valid_env` in `tests/helpers/setup.bash`; jeder Test bekommt isoliertes `$HOME` in `$BATS_TMPDIR`
|
||||||
|
- Tests ausführen: `bats tests/`
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
`install.sh` — interaktiv, prüft Dependencies, kopiert Skripte nach `~/.local/bin/`, richtet systemd-Service ein.
|
||||||
|
|
||||||
|
## Bekannte offene Punkte
|
||||||
|
- **M1 (Security, niedrig):** `validate_path` sieht `$VAR` nicht, da bash beim `source .env` bereits expandiert. Angreifer braucht Schreibzugriff auf `.env` — begrenzter Schaden.
|
||||||
@@ -59,6 +59,8 @@ validate_config() {
|
|||||||
|
|
||||||
validate_path SERVER_DB_DIR
|
validate_path SERVER_DB_DIR
|
||||||
validate_path SERVER_PHOTO_DIR
|
validate_path SERVER_PHOTO_DIR
|
||||||
|
validate_path LOCAL_DARKTABLE_DB_DIR
|
||||||
|
validate_path LOCAL_PHOTO_DIR
|
||||||
|
|
||||||
# DARKTABLE_BIN: basename muss 'darktable' sein
|
# DARKTABLE_BIN: basename muss 'darktable' sein
|
||||||
if [[ "$(basename "$DARKTABLE_BIN")" != "darktable" ]]; then
|
if [[ "$(basename "$DARKTABLE_BIN")" != "darktable" ]]; then
|
||||||
@@ -81,6 +83,7 @@ log() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
log_step() {
|
log_step() {
|
||||||
|
echo ""
|
||||||
echo "=== $* ==="
|
echo "=== $* ==="
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,6 +130,18 @@ gelöscht:^\*deleting
|
|||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cleanup_old_backups() {
|
||||||
|
local backup_dir="$1"
|
||||||
|
[ -d "$backup_dir" ] || return 0
|
||||||
|
local count
|
||||||
|
count=$(find "$backup_dir" -type f -mtime +730 | wc -l)
|
||||||
|
if [ "$count" -gt 0 ]; then
|
||||||
|
log "Backup-Bereinigung: $count Datei(en) älter als 2 Jahre in $backup_dir"
|
||||||
|
find "$backup_dir" -type f -mtime +730 -delete
|
||||||
|
find "$backup_dir" -type d -empty -delete 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
confirm_dry_run() {
|
confirm_dry_run() {
|
||||||
[ "${DRY_RUN_SKIP_CONFIRM:-0}" = "1" ] && return 0
|
[ "${DRY_RUN_SKIP_CONFIRM:-0}" = "1" ] && return 0
|
||||||
ask_user "Darktable Sync – Trockenlauf" \
|
ask_user "Darktable Sync – Trockenlauf" \
|
||||||
@@ -157,14 +172,15 @@ server_reachable() {
|
|||||||
|
|
||||||
ask_user() {
|
ask_user() {
|
||||||
local title="$1" text="$2" ans
|
local title="$1" text="$2" ans
|
||||||
if command -v zenity &>/dev/null; then
|
if [ "${DARKTABLE_SYNC_MODE:-}" = "gui" ] && command -v zenity &>/dev/null; then
|
||||||
zenity --question --title="$title" --text="$text" 2>/dev/null
|
zenity --question --title="$title" --text="$text" 2>/dev/null
|
||||||
return $?
|
return $?
|
||||||
elif command -v kdialog &>/dev/null; then
|
elif [ "${DARKTABLE_SYNC_MODE:-}" = "gui" ] && command -v kdialog &>/dev/null; then
|
||||||
kdialog --title "$title" --yesno "$text" 2>/dev/null
|
kdialog --title "$title" --yesno "$text" 2>/dev/null
|
||||||
return $?
|
return $?
|
||||||
else
|
else
|
||||||
read -r -p "$text [j/N] " ans || true
|
printf '%b\n' "$text"
|
||||||
|
read -r -p "[j/N] " ans || true
|
||||||
[[ "$ans" =~ ^[jJyY] ]]
|
[[ "$ans" =~ ^[jJyY] ]]
|
||||||
return $?
|
return $?
|
||||||
fi
|
fi
|
||||||
@@ -176,7 +192,7 @@ ask_conflict_resolution() {
|
|||||||
local TITLE="Darktable Sync – Konflikt"
|
local TITLE="Darktable Sync – Konflikt"
|
||||||
local EXPLAIN="Ein anderer Rechner hat die Datenbank seit deinem letzten Sync verändert.\nDeine lokalen Änderungen wurden noch NICHT auf den Server übertragen.\n\nWas soll passieren?"
|
local EXPLAIN="Ein anderer Rechner hat die Datenbank seit deinem letzten Sync verändert.\nDeine lokalen Änderungen wurden noch NICHT auf den Server übertragen.\n\nWas soll passieren?"
|
||||||
|
|
||||||
if command -v zenity &>/dev/null; then
|
if [ "${DARKTABLE_SYNC_MODE:-}" = "gui" ] && command -v zenity &>/dev/null; then
|
||||||
local choice
|
local choice
|
||||||
choice=$(zenity --list \
|
choice=$(zenity --list \
|
||||||
--title="$TITLE" \
|
--title="$TITLE" \
|
||||||
@@ -193,7 +209,7 @@ ask_conflict_resolution() {
|
|||||||
*) echo "download" ;;
|
*) echo "download" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
elif command -v kdialog &>/dev/null; then
|
elif [ "${DARKTABLE_SYNC_MODE:-}" = "gui" ] && command -v kdialog &>/dev/null; then
|
||||||
local btn
|
local btn
|
||||||
btn=$(kdialog --title "$TITLE" \
|
btn=$(kdialog --title "$TITLE" \
|
||||||
--menu "$EXPLAIN" \
|
--menu "$EXPLAIN" \
|
||||||
|
|||||||
+40
-12
@@ -180,6 +180,13 @@ TMPFILES+=("$DOWNLOAD_LOG_DB")
|
|||||||
DOWNLOAD_LOG_PHOTOS=$(mktemp)
|
DOWNLOAD_LOG_PHOTOS=$(mktemp)
|
||||||
TMPFILES+=("$DOWNLOAD_LOG_PHOTOS")
|
TMPFILES+=("$DOWNLOAD_LOG_PHOTOS")
|
||||||
|
|
||||||
|
BACKUP_PHOTO_DIR="${LOCAL_PHOTO_DIR}-bak"
|
||||||
|
BACKUP_DB_DIR="${LOCAL_DARKTABLE_DB_DIR}-bak"
|
||||||
|
|
||||||
|
if [ "$DRY_RUN" = false ]; then
|
||||||
|
mkdir -p "$BACKUP_PHOTO_DIR" "$BACKUP_DB_DIR"
|
||||||
|
fi
|
||||||
|
|
||||||
RSYNC_DRY_FLAG=()
|
RSYNC_DRY_FLAG=()
|
||||||
[ "$DRY_RUN" = true ] && RSYNC_DRY_FLAG=(--dry-run)
|
[ "$DRY_RUN" = true ] && RSYNC_DRY_FLAG=(--dry-run)
|
||||||
[ "$DRY_RUN" = true ] && DRY_SUFFIX=" (Trockenlauf)" || DRY_SUFFIX=""
|
[ "$DRY_RUN" = true ] && DRY_SUFFIX=" (Trockenlauf)" || DRY_SUFFIX=""
|
||||||
@@ -191,7 +198,12 @@ if [ "$UPLOAD_ALLOWED" = true ]; then
|
|||||||
log_step "Upload: Datenbank${DRY_SUFFIX}"
|
log_step "Upload: Datenbank${DRY_SUFFIX}"
|
||||||
log " Quelle: $LOCAL_DARKTABLE_DB_DIR/"
|
log " Quelle: $LOCAL_DARKTABLE_DB_DIR/"
|
||||||
log " Ziel: $SERVER_USER@$SERVER_IP:$SERVER_DB_DIR/"
|
log " Ziel: $SERVER_USER@$SERVER_IP:$SERVER_DB_DIR/"
|
||||||
if ! rsync -uavh --itemize-changes \
|
if [ -z "$(ls -A "$LOCAL_DARKTABLE_DB_DIR" 2>/dev/null)" ]; then
|
||||||
|
log_error "Upload abgebrochen: Quellverzeichnis leer ($LOCAL_DARKTABLE_DB_DIR). Falscher Mount?"
|
||||||
|
touch "$CONFIG_DIR/sync_pending"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! rsync -uavh --itemize-changes --delete \
|
||||||
"${RSYNC_DRY_FLAG[@]}" \
|
"${RSYNC_DRY_FLAG[@]}" \
|
||||||
--exclude '*.lock' \
|
--exclude '*.lock' \
|
||||||
--exclude 'darktable_version' \
|
--exclude 'darktable_version' \
|
||||||
@@ -208,7 +220,12 @@ if [ "$UPLOAD_ALLOWED" = true ]; then
|
|||||||
log_step "Upload: Fotos${DRY_SUFFIX}"
|
log_step "Upload: Fotos${DRY_SUFFIX}"
|
||||||
log " Quelle: $LOCAL_PHOTO_DIR/"
|
log " Quelle: $LOCAL_PHOTO_DIR/"
|
||||||
log " Ziel: $SERVER_USER@$SERVER_IP:$SERVER_PHOTO_DIR/"
|
log " Ziel: $SERVER_USER@$SERVER_IP:$SERVER_PHOTO_DIR/"
|
||||||
if ! rsync -uavh --itemize-changes \
|
if [ -z "$(ls -A "$LOCAL_PHOTO_DIR" 2>/dev/null)" ]; then
|
||||||
|
log_error "Upload abgebrochen: Quellverzeichnis leer ($LOCAL_PHOTO_DIR). Falscher Mount?"
|
||||||
|
touch "$CONFIG_DIR/sync_pending"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if ! rsync -uavh --itemize-changes --delete \
|
||||||
"${RSYNC_DRY_FLAG[@]}" \
|
"${RSYNC_DRY_FLAG[@]}" \
|
||||||
--exclude '*.lock' \
|
--exclude '*.lock' \
|
||||||
-e "ssh -p $SERVER_SSH_PORT" \
|
-e "ssh -p $SERVER_SSH_PORT" \
|
||||||
@@ -227,7 +244,9 @@ fi
|
|||||||
log_step "Download: Datenbank${DRY_SUFFIX}"
|
log_step "Download: Datenbank${DRY_SUFFIX}"
|
||||||
log " Quelle: $SERVER_USER@$SERVER_IP:$SERVER_DB_DIR/"
|
log " Quelle: $SERVER_USER@$SERVER_IP:$SERVER_DB_DIR/"
|
||||||
log " Ziel: $LOCAL_DARKTABLE_DB_DIR/"
|
log " Ziel: $LOCAL_DARKTABLE_DB_DIR/"
|
||||||
if ! rsync -uavh --itemize-changes \
|
log " Backup: $BACKUP_DB_DIR/"
|
||||||
|
if ! rsync -uavh --itemize-changes --delete \
|
||||||
|
--backup --backup-dir="$BACKUP_DB_DIR" \
|
||||||
"${RSYNC_DRY_FLAG[@]}" \
|
"${RSYNC_DRY_FLAG[@]}" \
|
||||||
--exclude '*.lock' \
|
--exclude '*.lock' \
|
||||||
-e "ssh -p $SERVER_SSH_PORT" \
|
-e "ssh -p $SERVER_SSH_PORT" \
|
||||||
@@ -243,7 +262,9 @@ log "Datenbank-Download abgeschlossen: $RECEIVED_DB Datei(en) empfangen."
|
|||||||
log_step "Download: Fotos${DRY_SUFFIX}"
|
log_step "Download: Fotos${DRY_SUFFIX}"
|
||||||
log " Quelle: $SERVER_USER@$SERVER_IP:$SERVER_PHOTO_DIR/"
|
log " Quelle: $SERVER_USER@$SERVER_IP:$SERVER_PHOTO_DIR/"
|
||||||
log " Ziel: $LOCAL_PHOTO_DIR/"
|
log " Ziel: $LOCAL_PHOTO_DIR/"
|
||||||
if ! rsync -uavh --itemize-changes \
|
log " Backup: $BACKUP_PHOTO_DIR/"
|
||||||
|
if ! rsync -uavh --itemize-changes --delete \
|
||||||
|
--backup --backup-dir="$BACKUP_PHOTO_DIR" \
|
||||||
"${RSYNC_DRY_FLAG[@]}" \
|
"${RSYNC_DRY_FLAG[@]}" \
|
||||||
--exclude '*.lock' \
|
--exclude '*.lock' \
|
||||||
-e "ssh -p $SERVER_SSH_PORT" \
|
-e "ssh -p $SERVER_SSH_PORT" \
|
||||||
@@ -266,22 +287,29 @@ if [ "$DRY_RUN" = false ]; then
|
|||||||
|
|
||||||
rm -f "$CONFIG_DIR/sync_pending"
|
rm -f "$CONFIG_DIR/sync_pending"
|
||||||
log "sync_pending entfernt."
|
log "sync_pending entfernt."
|
||||||
|
|
||||||
|
log_step "Backup-Bereinigung (älter als 2 Jahre)"
|
||||||
|
cleanup_old_backups "$BACKUP_PHOTO_DIR"
|
||||||
|
cleanup_old_backups "$BACKUP_DB_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TOTAL_SENT=$((SENT_DB + SENT_PHOTOS))
|
TOTAL_SENT=$((SENT_DB + SENT_PHOTOS))
|
||||||
TOTAL_RECEIVED=$((RECEIVED_DB + RECEIVED_PHOTOS))
|
TOTAL_RECEIVED=$((RECEIVED_DB + RECEIVED_PHOTOS))
|
||||||
|
|
||||||
if [ "$DRY_RUN" = true ]; then
|
if [ "$DRY_RUN" = true ]; then
|
||||||
UP_NEW=$( cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null | grep -cE '^>f[+]{9}' || echo 0)
|
upload_log=$(cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null || true)
|
||||||
UP_UPD=$( cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null | grep -E '^>f' | grep -cvE '^>f[+]{9}' || echo 0)
|
download_log=$(cat "$DOWNLOAD_LOG_DB" "$DOWNLOAD_LOG_PHOTOS" 2>/dev/null || true)
|
||||||
UP_DEL=$( cat "$UPLOAD_LOG_DB" "$UPLOAD_LOG_PHOTOS" 2>/dev/null | grep -cE '^\*deleting' || echo 0)
|
|
||||||
DN_NEW=$( cat "$DOWNLOAD_LOG_DB" "$DOWNLOAD_LOG_PHOTOS" 2>/dev/null | grep -cE '^<f[+]{9}' || echo 0)
|
UP_NEW=$( echo "$upload_log" | grep -cE '^>f[+]{9}' || echo 0)
|
||||||
DN_UPD=$( cat "$DOWNLOAD_LOG_DB" "$DOWNLOAD_LOG_PHOTOS" 2>/dev/null | grep -E '^<f' | grep -cvE '^<f[+]{9}' || echo 0)
|
UP_UPD=$( echo "$upload_log" | grep -E '^>f' | grep -cvE '^>f[+]{9}' || echo 0)
|
||||||
DN_DEL=$( cat "$DOWNLOAD_LOG_DB" "$DOWNLOAD_LOG_PHOTOS" 2>/dev/null | grep -cE '^\*deleting' || echo 0)
|
UP_DEL=$( echo "$upload_log" | grep -cE '^\*deleting' || echo 0)
|
||||||
|
DN_NEW=$( echo "$download_log" | grep -cE '^<f[+]{9}' || echo 0)
|
||||||
|
DN_UPD=$( echo "$download_log" | grep -E '^<f' | grep -cvE '^<f[+]{9}' || echo 0)
|
||||||
|
DN_DEL=$( echo "$download_log" | grep -cE '^\*deleting' || echo 0)
|
||||||
|
|
||||||
log_step "Trockenlauf-Ergebnis"
|
log_step "Trockenlauf-Ergebnis"
|
||||||
log " Upload: $UP_NEW neu | $UP_UPD aktualisiert | $UP_DEL gelöscht"
|
log " Upload: $UP_NEW neu | $UP_UPD aktualisiert | $UP_DEL gelöscht (Server)"
|
||||||
log " Download: $DN_NEW neu | $DN_UPD aktualisiert | $DN_DEL gelöscht"
|
log " Download: $DN_NEW neu | $DN_UPD aktualisiert | $DN_DEL gelöscht → Backup: $BACKUP_PHOTO_DIR"
|
||||||
|
|
||||||
if [ "$((TOTAL_SENT + TOTAL_RECEIVED))" -gt 0 ]; then
|
if [ "$((TOTAL_SENT + TOTAL_RECEIVED))" -gt 0 ]; then
|
||||||
if ask_user "Details" "Details der zu übertragenden Dateien anzeigen?"; then
|
if ask_user "Details" "Details der zu übertragenden Dateien anzeigen?"; then
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ validate_config
|
|||||||
log "Konfiguration geladen: Server=$SERVER_USER@$SERVER_IP:$SERVER_SSH_PORT"
|
log "Konfiguration geladen: Server=$SERVER_USER@$SERVER_IP:$SERVER_SSH_PORT"
|
||||||
|
|
||||||
export DISPLAY="${DISPLAY:-:0}"
|
export DISPLAY="${DISPLAY:-:0}"
|
||||||
|
export DARKTABLE_SYNC_MODE=gui
|
||||||
|
|
||||||
log "Prüfen ob Darktable bereits läuft..."
|
log "Prüfen ob Darktable bereits läuft..."
|
||||||
if pgrep -x darktable &>/dev/null; then
|
if pgrep -x darktable &>/dev/null; then
|
||||||
|
|||||||
@@ -75,3 +75,40 @@ COMMON_SCRIPT="$BATS_TEST_DIRNAME/../scripts/darktable_common.sh"
|
|||||||
rm -f "$TMP_SCRIPT"
|
rm -f "$TMP_SCRIPT"
|
||||||
[ "$status" -eq 1 ]
|
[ "$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"
|
touch "$HOME/.config/darktable/data.db"
|
||||||
rm -f "$HOME/.config/darktable/"*.bak
|
rm -f "$HOME/.config/darktable/"*.bak
|
||||||
mkdir -p "$HOME/Pictures"
|
mkdir -p "$HOME/Pictures"
|
||||||
|
touch "$HOME/Pictures/test.jpg"
|
||||||
export DISPLAY=:99
|
export DISPLAY=:99
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,3 +110,51 @@ setup() {
|
|||||||
[ "$status" -eq 0 ]
|
[ "$status" -eq 0 ]
|
||||||
[[ "$output" == *"neu"* ]]
|
[[ "$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
|
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() {
|
teardown() {
|
||||||
rm -rf "$CONFIG_DIR/sync.lock"
|
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
|
# 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/library.db"
|
||||||
touch "$HOME/.config/darktable/data.db"
|
touch "$HOME/.config/darktable/data.db"
|
||||||
mkdir -p "$HOME/Pictures"
|
mkdir -p "$HOME/Pictures"
|
||||||
|
touch "$HOME/Pictures/test.jpg"
|
||||||
export DISPLAY=:99
|
export DISPLAY=:99
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -145,3 +146,125 @@ EOF
|
|||||||
[ "$status" -eq 0 ]
|
[ "$status" -eq 0 ]
|
||||||
[ ! -d "$CONFIG_DIR/sync.lock" ]
|
[ ! -d "$CONFIG_DIR/sync.lock" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# --- Dry-Run Security Tests ---
|
||||||
|
|
||||||
|
@test "security: DRY_RUN_SKIP_CONFIRM akzeptiert nur exakt '1'" {
|
||||||
|
# Wert '1' wird akzeptiert (kein Abbruch, kein zenity-Prompt)
|
||||||
|
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 bash "$SYNC_SCRIPT"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[[ "$output" == *"TROCKENLAUF"* ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: DRY_RUN_SKIP_CONFIRM mit beliebigem String wird nicht als true behandelt" {
|
||||||
|
# Jeder Wert ausser '1' muss den Dialog triggern – zenity-Stub liest stdin,
|
||||||
|
# bekommt kein 'j', also lehnt ab -> Script bricht sauber ab
|
||||||
|
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=true bash "$SYNC_SCRIPT" <<< "n"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[[ "$output" == *"abgebrochen"* ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: classify_filetype ist sicher bei Sonderzeichen in Dateinamen" {
|
||||||
|
# Dateiname mit Shell-Metazeichen darf keine Ausfuehrung ausloesen
|
||||||
|
run bash -c "source '$COMMON_SCRIPT'; classify_filetype '\$(touch /tmp/evil).jpg'"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[ "$output" = "Foto" ]
|
||||||
|
[ ! -f /tmp/evil ]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: classify_filetype ist sicher bei Backticks in Dateinamen" {
|
||||||
|
run bash -c "source '$COMMON_SCRIPT'; classify_filetype '\`touch /tmp/evil\`.jpg'"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[ "$output" = "Foto" ]
|
||||||
|
[ ! -f /tmp/evil ]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: classify_filetype bei leerem Argument" {
|
||||||
|
run bash -c "source '$COMMON_SCRIPT'; classify_filetype ''"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[ "$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'"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[ -z "$output" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: format_rsync_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 ]
|
||||||
|
rm -f "$evil_log"
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: RSYNC_DRY_FLAG ist leer bei --execute" {
|
||||||
|
# Verifiziere dass bei --execute kein --dry-run an rsync uebergeben wird
|
||||||
|
run_with_stubs env SSH_STUB_FAIL=0 bash "$SYNC_SCRIPT" --execute
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
# Backup muss existieren (nur bei echtem Sync)
|
||||||
|
[ -f "$HOME/.config/darktable/library.db.bak" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: Trockenlauf schreibt keinen Sync-Token" {
|
||||||
|
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 bash "$SYNC_SCRIPT"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
# sync_token darf im Trockenlauf nicht aktualisiert werden
|
||||||
|
[ ! -f "$CONFIG_DIR/sync_token" ] || {
|
||||||
|
# Falls aus vorherigem Test vorhanden: Inhalt pruefen
|
||||||
|
local token_before token_after
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: Trockenlauf schreibt keine darktable_version" {
|
||||||
|
# Sicherstellen dass im Trockenlauf keine Versionsdatei geschrieben wird
|
||||||
|
rm -f "$HOME/.config/darktable/darktable_version"
|
||||||
|
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 bash "$SYNC_SCRIPT"
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[ ! -f "$HOME/.config/darktable/darktable_version" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: unbekannte Argumente werden ignoriert" {
|
||||||
|
# Unbekannte Flags duerfen keinen Fehler oder unerwartetes Verhalten ausloesen
|
||||||
|
run_with_stubs env SSH_STUB_FAIL=0 DRY_RUN_SKIP_CONFIRM=1 bash "$SYNC_SCRIPT" --unknown-flag
|
||||||
|
[ "$status" -eq 0 ]
|
||||||
|
[[ "$output" == *"TROCKENLAUF"* ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "security: echo -e im rsync-Stub fuehrt keinen Code aus" {
|
||||||
|
# RSYNC_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"
|
||||||
|
[ "$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
|
#!/bin/bash
|
||||||
# rsync-Stub: Verhalten per Umgebungsvariable steuerbar
|
# rsync-Stub: Verhalten per Umgebungsvariable steuerbar
|
||||||
# RSYNC_STUB_FAIL=1 → schlaegt fehl
|
# RSYNC_STUB_FAIL=1 → schlaegt fehl
|
||||||
# RSYNC_STUB_DRY_LINES → Ausgabe bei --dry-run (Zeilenumbrüche als \n)
|
# 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
|
if [ "${RSYNC_STUB_FAIL:-0}" = "1" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user