c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: spin geoipx off geolocate (#893)

Browse source 
A bunch of packages (including oohelperd) just need the ability to
use MaxMind-like databases. They don't need the additional functionality
implemented by the geolocate package. Such a package, in fact, is
mostly (if not only) needed by the engine package.

Therefore, move code to query MaxMind-like databases to a separate
package, and avoid depending on geolocate in all the packages for
which it's sufficient to use geoipx.

Part of https://github.com/ooni/probe/issues/2240
This commit is contained in:
Simone Basso 2022-08-28 20:00:25 +02:00 • committed by GitHub
commit 110a11828b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 224 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

49
internal/engine/geolocate/mmdblookup.go
View file

@ -1,54 +1,15 @@
package geolocate
import (
"net"
"github.com/ooni/probe-assets/assets"
"github.com/oschwald/geoip2-golang"
"github.com/ooni/probe-cli/v3/internal/geoipx"
)
type mmdbLookupper struct{}
func (mmdbLookupper) LookupASN(ip string) (asn uint, org string, err error) {
asn, org = DefaultProbeASN, DefaultProbeNetworkName
db, err := geoip2.FromBytes(assets.ASNDatabaseData())
if err != nil {
return
}
defer db.Close()
record, err := db.ASN(net.ParseIP(ip))
if err != nil {
return
}
asn = record.AutonomousSystemNumber
if record.AutonomousSystemOrganization != "" {
org = record.AutonomousSystemOrganization
}
return
func (mmdbLookupper) LookupASN(ip string) (uint, string, error) {
return geoipx.LookupASN(ip)
}
// LookupASN returns the ASN and the organization associated with the
// given IP address.
func LookupASN(ip string) (asn uint, org string, err error) {
return (mmdbLookupper{}).LookupASN(ip)
}
func (mmdbLookupper) LookupCC(ip string) (cc string, err error) {
cc = DefaultProbeCC
db, err := geoip2.FromBytes(assets.CountryDatabaseData())
if err != nil {
return
}
defer db.Close()
record, err := db.Country(net.ParseIP(ip))
if err != nil {
return
}
// With MaxMind DB we used record.RegisteredCountry.IsoCode but that does
// not seem to work with the db-ip.com database. The record is empty, at
// least for my own IP address in Italy. --Simone (2020-02-25)
if record.Country.IsoCode != "" {
cc = record.Country.IsoCode
}
return
func (mmdbLookupper) LookupCC(ip string) (string, error) {
return geoipx.LookupCC(ip)
}