J3vb/OwnCord
1
0
Fork 0
mirror of https://github.com/J3vb/OwnCord.git synced 2026-09-03 03:50:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: close DB before backup restore to prevent corruption (BUG-096)

Browse Source 
The restore handler was overwriting the live SQLite database while the
old *sql.DB handle remained open. Now: broadcasts server_restart to
clients, checkpoints WAL, closes the DB connection, then copies the
backup file over the closed database. Server must restart after restore.
This commit is contained in:
jevb
2026-04-02 11:45:09 +02:00
parent d2705dff92
commit 9249ff0a78
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/admin/api.go
+1 -1
View File
@@ -56,7 +56,7 @@ func NewAdminAPI(database *db.DB, version string, hub HubBroadcaster, u *updater
ownerOnlyMiddleware(database, handleDeleteBackup(database)).ServeHTTP(w, req)
}))
r.Post("/backups/{name}/restore", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
ownerOnlyMiddleware(database, handleRestoreBackup(database)).ServeHTTP(w, req)
ownerOnlyMiddleware(database, handleRestoreBackup(database, hub)).ServeHTTP(w, req)
}))
r.Get("/updates", handleCheckUpdate(u))
r.Post("/updates/apply", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
Server/admin/handlers_backup.go
+17 -7
View File
@@ -134,7 +134,7 @@ func handleDeleteBackup(database *db.DB) http.Handler {
})
}
func handleRestoreBackup(database *db.DB) http.Handler {
func handleRestoreBackup(database *db.DB, hub HubBroadcaster) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
name := chi.URLParam(r, "name")
if name == "" || strings.Contains(name, "..") || strings.ContainsAny(name, `/\`) {
@@ -169,25 +169,35 @@ func handleRestoreBackup(database *db.DB) http.Handler {
slog.Warn("pre-restore backup failed", "err", err)
}
// Notify clients that the server is restarting.
hub.BroadcastServerRestart("backup_restore", 5)
// Checkpoint the WAL and close the database connection before overwriting
// to prevent corruption from concurrent writes.
// to prevent corruption from concurrent writes (BUG-096).
if _, checkpointErr := database.SQLDb().Exec("PRAGMA wal_checkpoint(TRUNCATE)"); checkpointErr != nil {
slog.Warn("pre-restore WAL checkpoint failed", "err", checkpointErr)
}
// Stream the backup file over the live database to avoid loading
actor := actorFromContext(r)
slog.Warn("database restored from backup — closing DB", "actor_id", actor, "backup", name)
if err := database.Close(); err != nil {
slog.Error("failed to close database before restore", "err", err)
writeErr(w, http.StatusInternalServerError, "INTERNAL_ERROR", "failed to close database")
return
}
// Stream the backup file over the (now closed) database to avoid loading
// the entire DB into memory (could be hundreds of MiB).
if err := copyFile(backupPath, dbPath); err != nil {
writeErr(w, http.StatusInternalServerError, "INTERNAL_ERROR", "failed to restore database file")
return
}
actor := actorFromContext(r)
slog.Warn("database restored from backup", "actor_id", actor, "backup", name)
_ = database.LogAudit(actor, "backup_restore", "server", 0, "restored from "+name)
slog.Warn("database file replaced — server must restart to use restored data", "backup", name)
writeJSON(w, http.StatusOK, map[string]string{
"message": "database restored — server restart recommended",
"message": "database restored — server restarting",
"backup": name,
})
})