feat(auth): store the token signing secret in the metadata layer
- app_settings table (PostgreSQL migration 000010, SQLite 000002) - internal/settings repository (Get/Set/Ensure) wired into store.Repos - secret generated with crypto/rand on first start and persisted; reused on restart - drop required JWT_SECRET from env/config; app.New takes a TokenManager and storage.Open takes the resolved secret (URL_SECRET still overrides) - docs updated
This commit is contained in:
@@ -9,8 +9,9 @@ import (
|
||||
|
||||
"shared-album/internal/config"
|
||||
"shared-album/internal/db"
|
||||
"shared-album/internal/photos"
|
||||
"shared-album/internal/settings"
|
||||
"shared-album/internal/storage"
|
||||
"shared-album/internal/store"
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -35,14 +36,20 @@ func main() {
|
||||
}
|
||||
defer pool.Close()
|
||||
|
||||
store, err := storage.Open(ctx, cfg)
|
||||
repos := store.NewPostgres(pool)
|
||||
secret, err := repos.Settings.Ensure(ctx, settings.JWTSecretKey, settings.GenerateSecret)
|
||||
if err != nil {
|
||||
slog.Error("secret init failed", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
blob, err := storage.Open(ctx, cfg, secret)
|
||||
if err != nil {
|
||||
slog.Error("storage init failed", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
photoStore := photos.NewStore(pool)
|
||||
updated, err := photoStore.BackfillEXIF(ctx, store.Get)
|
||||
updated, err := repos.Photos.BackfillEXIF(ctx, blob.Get)
|
||||
if err != nil {
|
||||
slog.Error("backfill failed", "error", err)
|
||||
os.Exit(1)
|
||||
|
||||
@@ -18,6 +18,7 @@ import (
|
||||
"shared-album/internal/config"
|
||||
"shared-album/internal/db"
|
||||
"shared-album/internal/reconcile"
|
||||
"shared-album/internal/settings"
|
||||
"shared-album/internal/storage"
|
||||
"shared-album/internal/store"
|
||||
)
|
||||
@@ -50,7 +51,13 @@ func main() {
|
||||
}
|
||||
defer closer()
|
||||
|
||||
blob, err := storage.Open(ctx, cfg)
|
||||
secret, err := repos.Settings.Ensure(ctx, settings.JWTSecretKey, settings.GenerateSecret)
|
||||
if err != nil {
|
||||
slog.Error("secret init failed", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
blob, err := storage.Open(ctx, cfg, secret)
|
||||
if err != nil {
|
||||
slog.Error("storage init failed", "error", err)
|
||||
os.Exit(1)
|
||||
|
||||
@@ -15,8 +15,10 @@ import (
|
||||
|
||||
assets "shared-album"
|
||||
"shared-album/internal/app"
|
||||
"shared-album/internal/auth"
|
||||
"shared-album/internal/config"
|
||||
"shared-album/internal/db"
|
||||
"shared-album/internal/settings"
|
||||
"shared-album/internal/sse"
|
||||
"shared-album/internal/storage"
|
||||
"shared-album/internal/store"
|
||||
@@ -84,7 +86,14 @@ func main() {
|
||||
defer closer()
|
||||
slog.Info("migrations applied", "db_backend", cfg.Database.Backend)
|
||||
|
||||
blob, err := storage.Open(ctx, cfg)
|
||||
secret, err := repos.Settings.Ensure(ctx, settings.JWTSecretKey, settings.GenerateSecret)
|
||||
if err != nil {
|
||||
slog.Error("secret init failed", "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
tm := auth.NewTokenManager(secret, cfg.Auth.AccessTTL, cfg.Auth.RefreshTTL)
|
||||
|
||||
blob, err := storage.Open(ctx, cfg, secret)
|
||||
if err != nil {
|
||||
slog.Error("storage init failed", "error", err)
|
||||
os.Exit(1)
|
||||
@@ -96,7 +105,7 @@ func main() {
|
||||
}
|
||||
|
||||
hub := sse.NewHub(cfg.SSE.ClientBuffer)
|
||||
server := app.New(cfg, repos, ping, blob, hub)
|
||||
server := app.New(cfg, repos, ping, tm, blob, hub)
|
||||
|
||||
go server.StartWorker(ctx)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user