mirror of
https://github.com/dcarrillo/whatismyip.git
synced 2026-07-23 18:15:44 +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)
105 lines
2.3 KiB
Go
105 lines
2.3 KiB
Go
package router
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
"net/http"
|
|
"strings"
|
|
|
|
validator "github.com/dcarrillo/whatismyip/internal/validator/uuid"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/google/uuid"
|
|
"github.com/patrickmn/go-cache"
|
|
)
|
|
|
|
type DNSJSONResponse struct {
|
|
DNS dnsData `json:"dns"`
|
|
}
|
|
type dnsGeoData struct {
|
|
Country string `json:"country,omitempty"`
|
|
AsnOrganization string `json:"provider,omitempty"`
|
|
}
|
|
|
|
type dnsData struct {
|
|
IP string `json:"ip"`
|
|
dnsGeoData
|
|
}
|
|
|
|
// TODO
|
|
// Implement a proper vhost manager instead of using a middleware
|
|
func GetDNSDiscoveryHandler(store *cache.Cache, domain string, redirectPort string) gin.HandlerFunc {
|
|
return func(ctx *gin.Context) {
|
|
host := hostWithoutPort(ctx.Request.Host)
|
|
if host != domain && !strings.HasSuffix(host, "."+domain) {
|
|
ctx.Next()
|
|
return
|
|
}
|
|
|
|
if host == domain && ctx.Request.URL.Path == "/" {
|
|
ctx.Redirect(http.StatusFound, fmt.Sprintf("http://%s.%s%s", uuid.New().String(), domain, redirectPort))
|
|
ctx.Abort()
|
|
return
|
|
}
|
|
|
|
handleDNS(ctx, store)
|
|
ctx.Abort()
|
|
}
|
|
}
|
|
|
|
func hostWithoutPort(host string) string {
|
|
if h, _, err := net.SplitHostPort(host); err == nil {
|
|
return h
|
|
}
|
|
return host
|
|
}
|
|
|
|
func handleDNS(ctx *gin.Context, store *cache.Cache) {
|
|
d := strings.Split(ctx.Request.Host, ".")[0]
|
|
if !validator.IsValid(d) {
|
|
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
|
|
return
|
|
}
|
|
|
|
v, found := store.Get(d)
|
|
if !found {
|
|
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
|
|
return
|
|
}
|
|
|
|
ipStr, ok := v.(string)
|
|
if !ok {
|
|
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
|
|
return
|
|
}
|
|
|
|
ip := net.ParseIP(ipStr)
|
|
if ip == nil {
|
|
ctx.String(http.StatusNotFound, http.StatusText(http.StatusNotFound))
|
|
return
|
|
}
|
|
|
|
geoResp := dnsGeoData{}
|
|
if geoSvc != nil {
|
|
if cityRecord := geoSvc.LookUpCity(ip); cityRecord != nil {
|
|
geoResp.Country = cityRecord.Country.Names["en"]
|
|
}
|
|
if asnRecord := geoSvc.LookUpASN(ip); asnRecord != nil {
|
|
geoResp.AsnOrganization = asnRecord.AutonomousSystemOrganization
|
|
}
|
|
}
|
|
|
|
j := DNSJSONResponse{
|
|
DNS: dnsData{
|
|
IP: ipStr,
|
|
dnsGeoData: geoResp,
|
|
},
|
|
}
|
|
|
|
switch ctx.NegotiateFormat(gin.MIMEPlain, gin.MIMEHTML, gin.MIMEJSON) {
|
|
case gin.MIMEJSON:
|
|
ctx.JSON(http.StatusOK, j)
|
|
default:
|
|
ctx.String(http.StatusOK, fmt.Sprintf("%s (%s / %s)\n", j.DNS.IP, j.DNS.Country, j.DNS.AsnOrganization))
|
|
}
|
|
}
|