Restore detailed backup mail reports with bounded local delivery

lib/common.sh

@@ -35,6 +35,9 @@ load_config() {
   : "${RCLONE_STATS_INTERVAL:=1m}"
   : "${RCLONE_TRANSFERS:=2}" "${RCLONE_CHECKERS:=4}" "${RCLONE_ONEDRIVE_CHUNK_SIZE:=80Mi}"
   : "${RCLONE_BWLIMIT:=0}" "${ENABLE_MAIL_REPORT:=true}" "${MAIL_TO:=johannes}"
+  # Keep the old report settings; an empty sender uses app-backup@<FQDN>.
+  : "${MAIL_FROM:=}" "${MAIL_SUBJECT_PREFIX:=[app-backup]}" "${MAIL_INCLUDE_LOG_TAIL_LINES:=200}"
+  : "${MAIL_SENDMAIL_BIN:=/usr/sbin/sendmail}" "${MAIL_SEND_TIMEOUT:=30}"
   : "${ENABLE_WORDPRESS:=false}" "${ENABLE_NEXTCLOUD:=false}" "${ENABLE_NEXTCLOUD_DATA:=true}"
   : "${ENABLE_GITEA:=false}" "${ENABLE_MAIL:=false}" "${ENABLE_DB_DUMPS:=true}"
   : "${ENABLE_NEXTCLOUD_MAINTENANCE:=true}" "${NC_OCC_USER:=apache}"
@@ -116,10 +119,16 @@ init_runtime() {
   done
   RUN_ID="${ARCHIVE_PREFIX}_$(date -u +%Y-%m-%d_%H-%M-%S)_$(python3 -c 'import secrets; print(secrets.token_hex(4))')"
   LOG_FILE="$LOG_DIR/${OPERATION}_${RUN_ID}.log"
+  RUN_STARTED_EPOCH=$(date +%s)
+  BACKUP_PHASE=preflight
+  UPLOAD_STATUS=NOT_STARTED
+  if [[ $ENABLE_UPLOAD != true ]]; then UPLOAD_STATUS=DISABLED; fi
   # Journald already captures service stdout. No dependency on systemd-cat in terminals.
   # Keep the log pipe alive while systemd sends TERM to the whole control group.
   # tee exits on EOF after the recovery traps close their writers.
+  exec {REPORT_STDOUT}>&1 {REPORT_STDERR}>&2
   exec > >(trap '' INT TERM; exec tee -a "$LOG_FILE") 2>&1
+  REPORT_LOGGER_PID=$!
   echo "== $OPERATION $RUN_ID =="
   local security_context
   if security_context=$(id -Z 2>/dev/null); then echo "-- SELinux process context: $security_context"; fi
@@ -484,17 +493,32 @@ finish() {
   else
     resume_services || code=1
   fi
+  local report_sizes="$LOG_DIR/report_$RUN_ID.sizes.json"
+  if [[ ${CHECK:-false} != true && $ENABLE_MAIL_REPORT == true && $OPERATION == backup ]]; then
+    # Collect after service recovery but before successful staging cleanup.
+    python3 "$LIB_DIR/report.py" snapshot "$report_sizes" "${STAGING_DIR:-}" "${RUN_DIR:-${PARTIAL_DIR:-}}" ||
+      echo 'WARNING: Report sizes unavailable'
+  fi
   if [[ $code == 0 && -n ${STAGING_DIR:-} ]]; then rm -rf -- "$STAGING_DIR" || code=1; fi
   if [[ $code != 0 ]]; then echo "FAILED (exit $code). Retained work: ${STAGING_DIR:-none}"; fi
+  # Close the logger's writers and wait for EOF so the mail tail includes the
+  # final recovery/status messages. Reporting itself uses the original stdout.
+  exec 1>&"$REPORT_STDOUT" 2>&"$REPORT_STDERR"
+  exec {REPORT_STDOUT}>&- {REPORT_STDERR}>&-
+  wait "$REPORT_LOGGER_PID" || code=1
   # Persist status separately from --check; failed status writes also fail the job.
   if [[ ${CHECK:-false} != true ]]; then
     helper status "$WORKDIR" "$OPERATION" "$RUN_ID" "$code" || code=1
   fi
   if [[ ${CHECK:-false} != true && $ENABLE_MAIL_REPORT == true && $OPERATION == backup ]]; then
-    if [[ -x /usr/sbin/sendmail && $MAIL_TO != *$'\n'* && $MAIL_TO != *$'\r'* ]]; then
-      { printf 'To: %s\nSubject: [app-backup] exit=%s %s\nContent-Type: text/plain; charset=UTF-8\n\nLog: %s\n' "$MAIL_TO" "$code" "$RUN_ID" "$LOG_FILE"; tail -n 80 "$LOG_FILE"; } |
-        /usr/sbin/sendmail -t || echo "WARNING: report delivery failed"
-    else echo "WARNING: mail report unavailable (sendmail/recipient)"; fi
+    python3 "$LIB_DIR/report.py" deliver --sizes "$report_sizes" --log "$LOG_FILE" \
+      --output "$LOG_DIR/report_$RUN_ID.eml" --to "$MAIL_TO" --sender "$MAIL_FROM" \
+      --subject-prefix "$MAIL_SUBJECT_PREFIX" --run "$RUN_ID" --exit-code "$code" \
+      --started "$RUN_STARTED_EPOCH" --phase "$BACKUP_PHASE" --upload-status "$UPLOAD_STATUS" \
+      --config "$CONFIG_FILE" --workdir "$WORKDIR" --archive-dir "$ARCHIVE_DIR" \
+      --compression "$COMPRESSOR" --remote "$RCLONE_REMOTE_BASE" --sendmail "$MAIL_SENDMAIL_BIN" \
+      --tail-lines "$MAIL_INCLUDE_LOG_TAIL_LINES" --timeout "$MAIL_SEND_TIMEOUT" 2>&1 | tee -a "$LOG_FILE"
+    rm -f -- "$report_sizes"
   fi
   exit "$code"
 }