fix backend audit findings (auth, upload, sync, data, ocr, contract)
CI / lint-backend (push) Failing after 1m39s
CI / lint-mobile (push) Canceled after 11m8s
CI / test-backend (push) Canceled after 0s
CI / test-mobile (push) Canceled after 0s
CI / build-backend (push) Canceled after 0s
CI / docker (push) Canceled after 0s
CI / lint-backend (push) Failing after 1m39s
CI / lint-mobile (push) Canceled after 11m8s
CI / test-backend (push) Canceled after 0s
CI / test-mobile (push) Canceled after 0s
CI / build-backend (push) Canceled after 0s
CI / docker (push) Canceled after 0s
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
"net/http"
|
||||
"os"
|
||||
"os/signal"
|
||||
"sync"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
@@ -41,14 +42,19 @@ func main() {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
|
||||
// Migrations AVANT l'ouverture du pool applicatif : un seul *sql.DB vit à
|
||||
// la fois (MigrateDatabase ouvre/ferme sa propre connexion éphémère).
|
||||
// Inter-lots : pour partager strictement le même pool, db doit exposer
|
||||
// Migrate(conn *sql.DB) — fichier LOT 4 (db/db.go), non édité ici.
|
||||
if err := db.MigrateDatabase(cfg.DatabaseURL); err != nil {
|
||||
log.Fatalf("migrations postgres: %v", err)
|
||||
}
|
||||
|
||||
conn, err := db.Open(cfg.DatabaseURL)
|
||||
if err != nil {
|
||||
log.Fatalf("connexion postgres: %v", err)
|
||||
}
|
||||
|
||||
if err := db.MigrateDatabase(cfg.DatabaseURL); err != nil {
|
||||
log.Fatalf("migrations postgres: %v", err)
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
authManager, err := auth.NewManager(cfg.AuthSecret)
|
||||
if err != nil {
|
||||
@@ -59,8 +65,19 @@ func main() {
|
||||
repo := repository.NewRepository(conn)
|
||||
|
||||
// Premier admin (users vide) — refus de démarrer si identifiants absents.
|
||||
// Concurrence au boot (2 instances, users vide) : le perdant de l'INSERT
|
||||
// reçoit ErrNameConflict (UNIQUE username_normalized) → recompte avant de
|
||||
// refuser de démarrer (retry logique, sans toucher bootstrap.go — LOT 4).
|
||||
if err := service.EnsureAdmin(repo, cfg.AdminUsername, cfg.AdminPassword); err != nil {
|
||||
log.Fatalln(err)
|
||||
if errors.Is(err, repository.ErrNameConflict) {
|
||||
if n, cerr := repo.Users.Count(); cerr == nil && n > 0 {
|
||||
log.Println("bootstrap admin: compte créé par une instance concurrente, démarrage poursuivi")
|
||||
} else {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
} else {
|
||||
log.Fatalln(err)
|
||||
}
|
||||
}
|
||||
|
||||
handlers.Store = service.NewResources(
|
||||
@@ -74,7 +91,15 @@ func main() {
|
||||
defer stop()
|
||||
|
||||
// Worker OCR borné (OCR_WORKERS) : file `ocr_jobs`, hors request handlers.
|
||||
go handlers.Ocr.Run(ctx, cfg.OcrWorkers)
|
||||
// WaitGroup + budget d'arrêt partagé (5s, voir shutdown plus bas) : le
|
||||
// worker finit le job en cours ; passé le délai, le process sort et le job
|
||||
// resté `processing` sera requeue au prochain boot (ResetStaleProcessing).
|
||||
var ocrWg sync.WaitGroup
|
||||
ocrWg.Add(1)
|
||||
go func() {
|
||||
defer ocrWg.Done()
|
||||
handlers.Ocr.Run(ctx, cfg.OcrWorkers)
|
||||
}()
|
||||
log.Printf("ocr worker démarré (%d workers)", cfg.OcrWorkers)
|
||||
|
||||
srv := &http.Server{
|
||||
@@ -95,5 +120,19 @@ func main() {
|
||||
if err := srv.Shutdown(shutdownCtx); err != nil {
|
||||
log.Printf("shutdown: %v", err)
|
||||
}
|
||||
// Le worker OCR dispose du même budget de 5s : on attend la fin du job en
|
||||
// cours, passé ce délai le process sort (job resté `processing` → requeue
|
||||
// au prochain boot via ResetStaleProcessing, jamais de job perdu).
|
||||
ocrDone := make(chan struct{})
|
||||
go func() {
|
||||
ocrWg.Wait()
|
||||
close(ocrDone)
|
||||
}()
|
||||
select {
|
||||
case <-ocrDone:
|
||||
log.Println("worker OCR arrêté")
|
||||
case <-shutdownCtx.Done():
|
||||
log.Println("worker OCR: budget 5s écoulé, arrêt forcé (jobs `processing` requeues au prochain boot)")
|
||||
}
|
||||
log.Println("arrêt propre")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user