31e478b04e
* fix(pkg.go.dev): import a subpackage containing the assets We're trying to fix this issue that pkg.go.dev does not build. Thanks to @hellais for this very neat idea! Let's keep our fingers crossed and see whether it fixes! * feat: use embedded geoip databases Closes https://github.com/ooni/probe/issues/1372. Work done as part of https://github.com/ooni/probe/issues/1369. * fix(assetsx): add tests * feat: simplify and just vendor uncompressed DBs * remove tests that seems not necessary anymore * fix: run go mod tidy * Address https://github.com/ooni/probe-cli/pull/260/files#r605181364 * rewrite a test in a better way * fix: gently cleanup the legacy assetsdir Do not remove the whole directory with brute force. Just zap the files whose name we know. Then attempt to delete the legacy directory as well. If not empty, just fail. This is fine because it means the user has stored other files inside the directory. * fix: create .miniooni if missing
55 lines
1.3 KiB
Go
55 lines
1.3 KiB
Go
package geolocate
|
|
|
|
import (
|
|
"net"
|
|
|
|
"github.com/ooni/probe-assets/assets"
|
|
"github.com/oschwald/geoip2-golang"
|
|
)
|
|
|
|
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
|
|
}
|
|
|
|
// LookupASN returns the ASN and the organization associated with the
|
|
// given ip using the ASN database at path.
|
|
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
|
|
}
|