mirror of
https://github.com/renorris/openfsd
synced 2026-03-22 14:35:36 +08:00
1. Database Enhancements (db/repositories.go): - Added ConfigRepository interface and implementations for PostgreSQL and SQLite - Updated Repositories struct to include ConfigRepository - Modified NewRepositories to initialize both UserRepo and ConfigRepo 2. FSD Server Improvements: - Removed hardcoded jwtSecret, now retrieved from ConfigRepository (fsd/conn.go, web/auth.go) - Added dynamic welcome message retrieval from ConfigRepository (fsd/conn.go) - Optimized METAR buffer size from 4096 to 512 bytes (fsd/metar.go) - Reduced minimum fields for DeleteATC and DeletePilot packets (fsd/packet.go) - Improved Haversine distance calculation with constants (fsd/postoffice.go) - Added thread-safety documentation for sendError (fsd/client.go) 3. Server Configuration (fsd/server.go): - Added NewDefaultServer to initialize server with environment-based config - Implemented automatic database migration and default admin user creation - Added configurable METAR worker count - Improved logging with slog and environment-based debug level 4. Web Interface Enhancements: - Added user and config editor frontend routes (web/frontend.go, web/routes.go) - Improved JWT handling by retrieving secret from ConfigRepository (web/auth.go) - Enhanced user management API endpoints (web/user.go) - Updated dashboard to display CID and conditional admin links (web/templates/dashboard.html) - Embedded templates using go:embed (web/templates.go) 5. Frontend JavaScript Improvements: - Added networkRatingFromInt helper for readable ratings (web/static/js/openfsd/dashboard.js) - Improved API request handling with auth/no-auth variants (web/static/js/openfsd/api.js) 6. Miscellaneous: - Added sethvargo/go-envconfig dependency for environment variable parsing - Fixed parseVisRange to use 64-bit float parsing (fsd/util.go) - Added strPtr utility function (fsd/util.go, web/main.go) - Improved SVG logo rendering in layout (web/templates/layout.html)
62 lines
1.4 KiB
Go
62 lines
1.4 KiB
Go
package db
|
|
|
|
import (
|
|
"database/sql"
|
|
"errors"
|
|
)
|
|
|
|
type PostgresConfigRepository struct {
|
|
db *sql.DB
|
|
}
|
|
|
|
// InitDefault initializes the default configuration values.
|
|
func (p *PostgresConfigRepository) InitDefault() (err error) {
|
|
if err = p.ensureSecretKeyExists(); err != nil {
|
|
return
|
|
}
|
|
return
|
|
}
|
|
|
|
func (p *PostgresConfigRepository) ensureSecretKeyExists() (err error) {
|
|
secretKey, err := GenerateJwtSecretKey()
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
querystr := `
|
|
INSERT INTO config (key, value)
|
|
SELECT $1, $2
|
|
WHERE NOT EXISTS (
|
|
SELECT 1 FROM config WHERE key = $1
|
|
);`
|
|
_, err = p.db.Exec(querystr, ConfigJwtSecretKey, secretKey)
|
|
return
|
|
}
|
|
|
|
// Set sets the value for the given key in the configuration.
|
|
// If the key already exists, it updates the value.
|
|
func (p *PostgresConfigRepository) Set(key string, value string) (err error) {
|
|
querystr := `
|
|
INSERT INTO config (key, value) VALUES ($1, $2)
|
|
ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value;
|
|
`
|
|
_, err = p.db.Exec(querystr, key, value)
|
|
return
|
|
}
|
|
|
|
// Get retrieves the value for the given key from the configuration.
|
|
// If the key does not exist, it returns ErrConfigKeyNotFound.
|
|
func (p *PostgresConfigRepository) Get(key string) (value string, err error) {
|
|
querystr := `
|
|
SELECT value FROM config WHERE key = $1;
|
|
`
|
|
err = p.db.QueryRow(querystr, key).Scan(&value)
|
|
if err != nil {
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
err = ErrConfigKeyNotFound
|
|
}
|
|
return
|
|
}
|
|
return
|
|
}
|