Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"log"
"log/slog"
"net/http"
"strings"
Expand Down Expand Up @@ -71,7 +70,7 @@ func handleLogin(fetcher UserFetcher, secret []byte) http.HandlerFunc {
writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "invalid email or password"})
return
}
log.Printf("login: database error: %v", err)
slog.Error("login: database error", "error", err)
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "internal server error"})
return
}
Expand All @@ -82,14 +81,14 @@ func handleLogin(fetcher UserFetcher, secret []byte) http.HandlerFunc {
writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "invalid email or password"})
return
}
log.Printf("login: bcrypt error: %v", err)
slog.Error("login: bcrypt error", "error", err)
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "internal server error"})
return
}

tokenStr, err := generateJWT(user, secret)
if err != nil {
log.Printf("login: failed to generate JWT: %v", err)
slog.Error("token generation failed", "error", err)
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": "internal server error"})
return
}
Expand Down Expand Up @@ -162,7 +161,7 @@ func requireAuth(secret []byte) func(http.Handler) http.Handler {
}, jwt.WithValidMethods([]string{"HS256"}), jwt.WithIssuer("vehicle-positions-api"))

if err != nil || !token.Valid {
log.Printf("auth: token validation failed: %v", err)
slog.Warn("token validation failed", "error", err)
writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "invalid token"})
return
}
Expand Down
4 changes: 2 additions & 2 deletions ratelimit.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"log"
"log/slog"
"sync"
"time"

Expand Down Expand Up @@ -46,7 +46,7 @@ func (vrl *VehicleRateLimiter) Allow(key string) bool {
entry, ok := vrl.limiters[key]
if !ok {
if len(vrl.limiters) >= maxTrackedRates {
log.Printf("rate limiter at capacity (%d entries), allowing untracked key %q", maxTrackedRates, key)
slog.Warn("rate limiter at capacity, allowing untracked key", "capacity", maxTrackedRates, "key", key)
return true
}
entry = &rateLimiterEntry{
Expand Down
Loading