fix: use sql.NullString for reason field in audit log

Update reason field handling in auth.go and db.go to properly support
NULL values using sql.NullString. When inserting expired temp entries
and serializing logs to JSON, extract the string value to avoid
JSON marshaling issues with nullable fields.
This commit is contained in:
db123-test
2026-05-04 17:48:18 +03:30
parent 6425158f61
commit a352adb441
2 changed files with 12 additions and 8 deletions

View File

@@ -182,8 +182,8 @@ func logsHandler(cfg Config, db *sql.DB) http.HandlerFunc {
logs := make([]map[string]interface{}, 0)
for rows.Next() {
var ts time.Time
var action, apiClientIP, reason string
var ip, cidr sql.NullString
var action, apiClientIP string
var ip, cidr, reason sql.NullString
var ttlSeconds sql.NullInt64
if err := rows.Scan(&ts, &action, &ip, &cidr, &ttlSeconds, &reason, &apiClientIP); err != nil {
continue
@@ -192,7 +192,7 @@ func logsHandler(cfg Config, db *sql.DB) http.HandlerFunc {
"timestamp": ts,
"action": action,
"api_client_ip": apiClientIP,
"reason": reason,
"reason": reason.String,
}
if ip.Valid {
entry["ip"] = ip.String

14
db.go
View File

@@ -205,11 +205,14 @@ func CleanupExpiredTemp(db *sql.DB) error {
return err
}
var reason string
reason = "expired"
for _, ip := range expiredIPs {
_, err = db.Exec(`
INSERT INTO audit_log(action, ip)
VALUES('expire_temp', ?)
`, ip)
INSERT INTO audit_log(action, ip, reason)
VALUES('expire_temp', ?, ?)
`, ip, reason)
if err != nil {
slog.Warn("failed to log expired temp entry", "ip", ip, "error", err)
}
@@ -231,15 +234,16 @@ func ListTempEntries(db *sql.DB) ([]map[string]interface{}, error) {
defer rows.Close()
var list []map[string]interface{} = make([]map[string]interface{}, 0)
for rows.Next() {
var ip, reason string
var ip string
var expiresAt time.Time
var reason sql.NullString
if err := rows.Scan(&ip, &expiresAt, &reason); err != nil {
continue
}
list = append(list, map[string]interface{}{
"ip": ip,
"expires": expiresAt,
"reason": reason,
"reason": reason.String,
})
}
return list, nil