root/golib
1
0
Fork 0
mirror of https://github.com/therootcompany/golib.git synced 2026-04-24 12:48:00 +00:00
Code Issues Projects Releases Wiki Activity

refactor(check-ip): manage geoip via dataset.Group

Browse Source 
Conditional Fetcher: httpcache cachers when GeoIP.conf basic auth is
present, dataset.PollFiles otherwise. geo is now a *dataset.View so the
background Tick in the serve branch refreshes it alongside blocklists.
This commit is contained in:
AJ ONeal 2026-04-20 16:38:40 -06:00
parent 35046bb17a
commit 6bcb493d02
No known key found for this signature in database
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/check-ip/main.go
View File

@ -43,7 +43,7 @@ type IPCheck struct {
inbound *dataset.View[ipcohort.Cohort] inbound *dataset.View[ipcohort.Cohort]
outbound *dataset.View[ipcohort.Cohort] outbound *dataset.View[ipcohort.Cohort]
geo *geoip.Databases geo *dataset.View[geoip.Databases]
} }
func main() { func main() {
@ -124,38 +124,50 @@ func main() {
} }
// GeoIP: with credentials, download the City + ASN tar.gz archives via // GeoIP: with credentials, download the City + ASN tar.gz archives via
// httpcache conditional GETs. Without them, expect the tar.gz files to // httpcache conditional GETs. Without them, poll the existing tar.gz
// already be in maxmindDir. geoip.Open extracts in-memory — no .mmdb // files in maxmindDir. geoip.Open extracts in-memory — no .mmdb files
// files are written to disk. // are written to disk.
maxmindDir := filepath.Join(cfg.CacheDir, "maxmind") maxmindDir := filepath.Join(cfg.CacheDir, "maxmind")
cityTarPath := filepath.Join(maxmindDir, "GeoLite2-City.tar.gz")
asnTarPath := filepath.Join(maxmindDir, "GeoLite2-ASN.tar.gz")
var geoFetcher dataset.Fetcher
if cfg.GeoIPBasicAuth != "" { if cfg.GeoIPBasicAuth != "" {
city := &httpcache.Cacher{ city := &httpcache.Cacher{
URL: geoip.DownloadBase + "/GeoLite2-City/download?suffix=tar.gz", URL: geoip.DownloadBase + "/GeoLite2-City/download?suffix=tar.gz",
Path: filepath.Join(maxmindDir, "GeoLite2-City.tar.gz"), Path: cityTarPath,
MaxAge: 3 * 24 * time.Hour, MaxAge: 3 * 24 * time.Hour,
AuthHeader: "Authorization", AuthHeader: "Authorization",
AuthValue: cfg.GeoIPBasicAuth, AuthValue: cfg.GeoIPBasicAuth,
} }
asn := &httpcache.Cacher{ asn := &httpcache.Cacher{
URL: geoip.DownloadBase + "/GeoLite2-ASN/download?suffix=tar.gz", URL: geoip.DownloadBase + "/GeoLite2-ASN/download?suffix=tar.gz",
Path: filepath.Join(maxmindDir, "GeoLite2-ASN.tar.gz"), Path: asnTarPath,
MaxAge: 3 * 24 * time.Hour, MaxAge: 3 * 24 * time.Hour,
AuthHeader: "Authorization", AuthHeader: "Authorization",
AuthValue: cfg.GeoIPBasicAuth, AuthValue: cfg.GeoIPBasicAuth,
} }
if _, err := city.Fetch(); err != nil { geoFetcher = dataset.FetcherFunc(func() (bool, error) {
log.Fatalf("fetch GeoLite2-City: %v", err) cityUpdated, err := city.Fetch()
} if err != nil {
if _, err := asn.Fetch(); err != nil { return false, fmt.Errorf("fetch GeoLite2-City: %w", err)
log.Fatalf("fetch GeoLite2-ASN: %v", err) }
} asnUpdated, err := asn.Fetch()
if err != nil {
return false, fmt.Errorf("fetch GeoLite2-ASN: %w", err)
}
return cityUpdated || asnUpdated, nil
})
} else {
geoFetcher = dataset.PollFiles(cityTarPath, asnTarPath)
} }
geo, err := geoip.Open(maxmindDir) geoGroup := dataset.NewGroup(geoFetcher)
if err != nil { cfg.geo = dataset.Add(geoGroup, func() (*geoip.Databases, error) {
return geoip.Open(maxmindDir)
})
if err := geoGroup.Load(context.Background()); err != nil {
log.Fatalf("geoip: %v", err) log.Fatalf("geoip: %v", err)
} }
defer func() { _ = geo.Close() }() defer func() { _ = cfg.geo.Value().Close() }()
cfg.geo = geo
if cfg.Bind == "" { if cfg.Bind == "" {
return return
@ -166,6 +178,9 @@ func main() {
go group.Tick(ctx, refreshInterval, func(err error) { go group.Tick(ctx, refreshInterval, func(err error) {
log.Printf("blocklists refresh: %v", err) log.Printf("blocklists refresh: %v", err)
}) })
go geoGroup.Tick(ctx, refreshInterval, func(err error) {
log.Printf("geoip refresh: %v", err)
})
if err := cfg.serve(ctx); err != nil { if err := cfg.serve(ctx); err != nil {
log.Fatalf("serve: %v", err) log.Fatalf("serve: %v", err)
} }

2
cmd/check-ip/server.go
View File

@ -42,7 +42,7 @@ func (c *IPCheck) handle(w http.ResponseWriter, r *http.Request) {
Blocked: in || out, Blocked: in || out,
BlockedInbound: in, BlockedInbound: in,
BlockedOutbound: out, BlockedOutbound: out,
Geo: c.geo.Lookup(ip), Geo: c.geo.Value().Lookup(ip),
} }
if r.URL.Query().Get("format") == "json" || if r.URL.Query().Get("format") == "json" ||