Files
whatismyip/router/geo.go
T
dcarrillo 49ffcadb0a Fix data races, nil-record panics, scanner SSRF, log date layout, shutdown timeouts, and enable stricter linters (#54)
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)
2026-07-19 12:09:52 +02:00

167 lines
3.5 KiB
Go

package router
import (
"fmt"
"net"
"net/http"
"sort"
"strings"
"github.com/dcarrillo/whatismyip/models"
"github.com/gin-gonic/gin"
)
type geoDataFormatter struct {
title string
format func(*models.GeoRecord) string
}
type asnDataFormatter struct {
title string
format func(*models.ASNRecord) string
}
var geoOutput = map[string]geoDataFormatter{
"country": {
title: "Country",
format: func(record *models.GeoRecord) string {
return record.Country.Names["en"]
},
},
"country_code": {
title: "Country Code",
format: func(record *models.GeoRecord) string {
return record.Country.ISOCode
},
},
"city": {
title: "City",
format: func(record *models.GeoRecord) string {
return record.City.Names["en"]
},
},
"latitude": {
title: "Latitude",
format: func(record *models.GeoRecord) string {
return fmt.Sprintf("%f", record.Location.Latitude)
},
},
"longitude": {
title: "Longitude",
format: func(record *models.GeoRecord) string {
return fmt.Sprintf("%f", record.Location.Longitude)
},
},
"postal_code": {
title: "Postal Code",
format: func(record *models.GeoRecord) string {
return record.Postal.Code
},
},
"time_zone": {
title: "Time Zone",
format: func(record *models.GeoRecord) string {
return record.Location.TimeZone
},
},
}
var asnOutput = map[string]asnDataFormatter{
"number": {
title: "ASN Number",
format: func(record *models.ASNRecord) string {
return fmt.Sprintf("%d", record.AutonomousSystemNumber)
},
},
"organization": {
title: "ASN Organization",
format: func(record *models.ASNRecord) string {
return record.AutonomousSystemOrganization
},
},
}
func getGeoAsString(ctx *gin.Context) {
if geoSvc == nil {
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
return
}
record := geoSvc.LookUpCity(net.ParseIP(ctx.ClientIP()))
if record == nil {
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
return
}
field := strings.ToLower(ctx.Params.ByName("field"))
if field == "" {
ctx.String(http.StatusOK, geoCityRecordToString(record))
return
}
g, ok := geoOutput[field]
if !ok {
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
return
}
ctx.String(http.StatusOK, g.format(record))
}
func getASNAsString(ctx *gin.Context) {
if geoSvc == nil {
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
return
}
record := geoSvc.LookUpASN(net.ParseIP(ctx.ClientIP()))
if record == nil {
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
return
}
field := strings.ToLower(ctx.Params.ByName("field"))
if field == "" {
ctx.String(http.StatusOK, geoASNRecordToString(record))
return
}
g, ok := asnOutput[field]
if !ok {
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
return
}
ctx.String(http.StatusOK, g.format(record))
}
func geoCityRecordToString(record *models.GeoRecord) string {
var output string
keys := make([]string, 0, len(geoOutput))
for k := range geoOutput {
keys = append(keys, k)
}
sort.Strings(keys)
for _, k := range keys {
output += fmt.Sprintf("%s: %v\n", geoOutput[k].title, geoOutput[k].format(record))
}
return output
}
func geoASNRecordToString(record *models.ASNRecord) string {
var output string
keys := make([]string, 0, len(asnOutput))
for k := range asnOutput {
keys = append(keys, k)
}
sort.Strings(keys)
for _, k := range keys {
output += fmt.Sprintf("%s: %v\n", asnOutput[k].title, asnOutput[k].format(record))
}
return output
}