Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

fix: resolve credential draft and backup fallback review [skip version]

Juan Denis5a4036e9b2cf
diff --git a/frontend/src/components/settings/AIConnectionsSettings.jsx b/frontend/src/components/settings/AIConnectionsSettings.jsx
index 91e994e5..5ebb6365 100644
--- a/frontend/src/components/settings/AIConnectionsSettings.jsx
+++ b/frontend/src/components/settings/AIConnectionsSettings.jsx
@@ -34,8 +34,9 @@ export default function AIConnectionsSettings({ connections, providers, defaultI
};
const setField = (field, value, clear = false) => {
const config = { ...draft.config, [field.name]: value };
- if (field.secret && !value && !clear) delete config[field.name];
+ if (field.secret && !value && !clear && draft.secrets_set.includes(field.name)) delete config[field.name];
let secretsSet = draft.secrets_set;
+ if (field.secret && clear) secretsSet = secretsSet.filter((name) => name !== field.name);
if (field.type === 'url') {
for (const secret of meta.fields.filter((item) => item.secret)) delete config[secret.name];
secretsSet = [];
diff --git a/scripts/test/test_update.sh b/scripts/test/test_update.sh
index 158d9f75..90370656 100644
--- a/scripts/test/test_update.sh
+++ b/scripts/test/test_update.sh
@@ -1629,5 +1629,31 @@ else
fi
# --------------------------------------------------------------------------
+if (
+ set -Eeuo pipefail
+ source_tree="$WORK/snapshot-source"
+ target_tree="$WORK/snapshot-target"
+ mkdir -p "$source_tree/backend/instance" "$source_tree/backend/venv" "$source_tree/node_modules"
+ printf 'code' > "$source_tree/app.py"
+ printf 'settings' > "$source_tree/backend/instance/settings.json"
+ touch "$source_tree/backend/instance/serverkit.db" \
+ "$source_tree/backend/instance/serverkit.db-wal" \
+ "$source_tree/backend/instance/serverkit.db-shm" \
+ "$source_tree/backend/venv/dependency" "$source_tree/node_modules/dependency"
+ rsync() { return 127; }
+ snapshot_install_tree "$source_tree" "$target_tree"
+ [ "$(cat "$target_tree/app.py")" = code ]
+ [ "$(cat "$target_tree/backend/instance/settings.json")" = settings ]
+ [ ! -e "$target_tree/backend/instance/serverkit.db" ]
+ [ ! -e "$target_tree/backend/instance/serverkit.db-wal" ]
+ [ ! -e "$target_tree/backend/instance/serverkit.db-shm" ]
+ [ ! -e "$target_tree/backend/venv" ]
+ [ ! -e "$target_tree/node_modules" ]
+); then
+ ok "tree snapshot fallback preserves code and excludes database copies and dependencies"
+else
+ bad "tree snapshot fallback loses files or duplicates excluded data"
+fi
+
printf '\n%d passed, %d failed, %d skipped\n\n' "$PASS" "$FAIL" "$SKIP"
[ "$FAIL" -eq 0 ]
diff --git a/scripts/update.sh b/scripts/update.sh
index a55b0679..465a4ee92 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -986,6 +986,26 @@ pg_url_from_env() {
# ---------------------------------------------------------------------------
# Backup
# ---------------------------------------------------------------------------
+snapshot_install_tree() {
+ local source_dir="$1" target_dir="$2"
+ rsync -a --exclude=venv --exclude=backups --exclude=node_modules \
+ --exclude='backend/instance/*.db' \
+ --exclude='backend/instance/*.db-wal' \
+ --exclude='backend/instance/*.db-shm' \
+ "$source_dir/" "$target_dir/" 2>/dev/null && return 0
+ # Preserve the exclusions even on hosts without rsync; never stage a
+ # second database copy just to delete it after copying the tree.
+ mkdir -p "$target_dir" || return 1
+ (set -o pipefail
+ tar -C "$source_dir" --exclude=venv --exclude=backups --exclude=node_modules \
+ --exclude='./backend/instance/*.db' \
+ --exclude='./backend/instance/*.db-wal' \
+ --exclude='./backend/instance/*.db-shm' -cf - . \
+ | tar -C "$target_dir" -xpf -
+ )
+}
+
+
backup_current() {
phase "Database Backup"
mkdir -p "$BACKUP_DIR"
@@ -1077,13 +1097,11 @@ backup_current() {
# that copy, never from the tree. Copying it here too doubled every
# update's backup footprint (a 450 MB database became 900 MB per run),
# which is how small VPSes kept filling their disk with backups.
- run_or_dry rsync -a --exclude=venv --exclude=backups --exclude=node_modules \
- --exclude='backend/instance/*.db' \
- --exclude='backend/instance/*.db-wal' \
- --exclude='backend/instance/*.db-shm' \
- "$active/" "$tree_backup/" 2>/dev/null || \
- run_or_dry cp -a "$active" "$tree_backup" 2>/dev/null || true
- good "Install tree backed up to $tree_backup"
+ if run_or_dry snapshot_install_tree "$active" "$tree_backup"; then
+ good "Install tree backed up to $tree_backup"
+ else
+ warn "Install tree backup failed: $tree_backup may be incomplete"
+ fi
fi
}