110a11828b
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
99 lines
2.2 KiB
Go
99 lines
2.2 KiB
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/pion/stun"
|
|
)
|
|
|
|
// TODO(bassosimone): we should modify the stun code to use
|
|
// the session resolver rather than using its own.
|
|
//
|
|
// See https://github.com/ooni/probe/issues/1383.
|
|
|
|
type stunClient interface {
|
|
Close() error
|
|
Start(m *stun.Message, h stun.Handler) error
|
|
}
|
|
|
|
type stunConfig struct {
|
|
Dial func(network string, address string) (stunClient, error)
|
|
Endpoint string
|
|
Logger model.Logger
|
|
}
|
|
|
|
func stunDialer(network string, address string) (stunClient, error) {
|
|
return stun.Dial(network, address)
|
|
}
|
|
|
|
func stunIPLookup(ctx context.Context, config stunConfig) (string, error) {
|
|
config.Logger.Debugf("STUNIPLookup: start using %s", config.Endpoint)
|
|
ip, err := func() (string, error) {
|
|
dial := config.Dial
|
|
if dial == nil {
|
|
dial = stunDialer
|
|
}
|
|
clnt, err := dial("udp", config.Endpoint)
|
|
if err != nil {
|
|
return model.DefaultProbeIP, err
|
|
}
|
|
defer clnt.Close()
|
|
message := stun.MustBuild(stun.TransactionID, stun.BindingRequest)
|
|
errch, ipch := make(chan error, 1), make(chan string, 1)
|
|
err = clnt.Start(message, func(ev stun.Event) {
|
|
if ev.Error != nil {
|
|
errch <- ev.Error
|
|
return
|
|
}
|
|
var xorAddr stun.XORMappedAddress
|
|
if err := xorAddr.GetFrom(ev.Message); err != nil {
|
|
errch <- err
|
|
return
|
|
}
|
|
ipch <- xorAddr.IP.String()
|
|
})
|
|
if err != nil {
|
|
return model.DefaultProbeIP, err
|
|
}
|
|
select {
|
|
case err := <-errch:
|
|
return model.DefaultProbeIP, err
|
|
case ip := <-ipch:
|
|
return ip, nil
|
|
case <-ctx.Done():
|
|
return model.DefaultProbeIP, ctx.Err()
|
|
}
|
|
}()
|
|
if err != nil {
|
|
config.Logger.Debugf("STUNIPLookup: failure using %s: %+v", config.Endpoint, err)
|
|
return model.DefaultProbeIP, err
|
|
}
|
|
return ip, nil
|
|
}
|
|
|
|
func stunEkigaIPLookup(
|
|
ctx context.Context,
|
|
httpClient *http.Client,
|
|
logger model.Logger,
|
|
userAgent string,
|
|
) (string, error) {
|
|
return stunIPLookup(ctx, stunConfig{
|
|
Endpoint: "stun.ekiga.net:3478",
|
|
Logger: logger,
|
|
})
|
|
}
|
|
|
|
func stunGoogleIPLookup(
|
|
ctx context.Context,
|
|
httpClient *http.Client,
|
|
logger model.Logger,
|
|
userAgent string,
|
|
) (string, error) {
|
|
return stunIPLookup(ctx, stunConfig{
|
|
Endpoint: "stun.l.google.com:19302",
|
|
Logger: logger,
|
|
})
|
|
}
|