mirror of
https://github.com/dcarrillo/whatismyip.git
synced 2026-07-23 15:55:45 +00:00
dcarrillo
49ffcadb0a
High (behavioral bugs):
- service.Geo: add RLock on lookups, handle Reload error, keep old DBs on failure
- models.GeoDB.Reload: open new DBs before closing old ones (no reader gap)
- router: guard nil geo records (404 instead of 500) in geo.go, generic.go, dns.go
- router/port_scanner: reject undetermined client IPs (nil->localhost dial)
- internal/httputils: fix access log date layout (02/Jan/2006, not literal Nov)
- server/quic: log.Printf instead of log.Fatal in request handler
Medium:
- server/*: 10s shutdown timeout; SIGTERM drains servers before closing geo DBs
- httputils: Clone() request headers instead of mutating the live map; strings.Builder
- setting/app: handle all os.Stat errors; fix "truster" typos; use errors.New;
remove dead Token field
- cmd: errors.Is for sentinel checks; os.Stderr; log.Fatal instead of panic;
pass http.Handler by value (not pointer-to-interface)
- resolver: validate config at startup (pre-parse RRs, validate IPs); check WriteMsg
errors; Setup returns error
Low:
- .golangci.yaml: enable errcheck, govet, errorlint; fix all resulting findings
- server/tls: explicit TLSConfig{MinVersion: tls.VersionTLS12}
- router/dns: label-exact vhost suffix check, strip port; template.Must
- models: errors.Join instead of %s on []error
- service/geo_test: race-regression test (concurrent lookups during Reload)
- README: Go >= 1.25; fix latent test bug (store.Add->Set in dns_test.go)
92 lines
1.5 KiB
Go
92 lines
1.5 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"log"
|
|
"net"
|
|
"sync"
|
|
|
|
"github.com/dcarrillo/whatismyip/internal/metrics"
|
|
"github.com/dcarrillo/whatismyip/models"
|
|
)
|
|
|
|
type Geo struct {
|
|
ctx context.Context
|
|
cancel context.CancelFunc
|
|
db *models.GeoDB
|
|
mu sync.RWMutex
|
|
}
|
|
|
|
func NewGeo(ctx context.Context, cityPath string, asnPath string) (*Geo, error) {
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
|
|
db, err := models.Setup(cityPath, asnPath)
|
|
if err != nil {
|
|
cancel()
|
|
return nil, err
|
|
}
|
|
|
|
geo := &Geo{
|
|
ctx: ctx,
|
|
cancel: cancel,
|
|
db: db,
|
|
}
|
|
|
|
return geo, nil
|
|
}
|
|
|
|
func (g *Geo) LookUpCity(ip net.IP) *models.GeoRecord {
|
|
g.mu.RLock()
|
|
defer g.mu.RUnlock()
|
|
|
|
record, err := g.db.LookupCity(ip)
|
|
if err != nil {
|
|
log.Print(err)
|
|
return nil
|
|
}
|
|
|
|
metrics.RecordGeoLookup("city")
|
|
return record
|
|
}
|
|
|
|
func (g *Geo) LookUpASN(ip net.IP) *models.ASNRecord {
|
|
g.mu.RLock()
|
|
defer g.mu.RUnlock()
|
|
|
|
record, err := g.db.LookupASN(ip)
|
|
if err != nil {
|
|
log.Print(err)
|
|
return nil
|
|
}
|
|
|
|
metrics.RecordGeoLookup("asn")
|
|
return record
|
|
}
|
|
|
|
func (g *Geo) Shutdown() {
|
|
g.cancel()
|
|
|
|
g.mu.Lock()
|
|
defer g.mu.Unlock()
|
|
|
|
if err := g.db.CloseDBs(); err != nil {
|
|
log.Printf("Error closing geo databases: %s", err)
|
|
}
|
|
}
|
|
|
|
func (g *Geo) Reload() {
|
|
if err := g.ctx.Err(); err != nil {
|
|
log.Printf("Skipping reload, service is shutting down: %v", err)
|
|
return
|
|
}
|
|
|
|
g.mu.Lock()
|
|
defer g.mu.Unlock()
|
|
|
|
if err := g.db.Reload(); err != nil {
|
|
log.Printf("Geo database reload failed: %s", err)
|
|
return
|
|
}
|
|
log.Print("Geo database reloaded")
|
|
}
|