ooni-probe-cli/internal/engine/geolocate/iplookup.go
Simone Basso 33de701263
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package

After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.

The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.

While there, improve the documentation.

* fix: always use the atomicx package

For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.

While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.

* fix(atomicx): remove unnecessary constructor

We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.

* cleanup(atomicx): we are not using Float64

Because atomicx.Float64 is unused, we can safely zap it.

* cleanup(atomicx): simplify impl and improve tests

We can simplify the implementation by using defer and by letting
the Load() method call Add(0).

We can improve tests by making many goroutines updated the
atomic int64 value concurrently.

* refactor(fsx): can live in the ./internal pkg

Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.

* refactor: move runtimex to ./internal

* refactor: move shellx into the ./internal package

While there, remove unnecessary dependency between packages.

While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.

* refactor: move ooapi into the ./internal pkg

* refactor(humanize): move to ./internal and better docs

* refactor: move platform to ./internal

* refactor(randx): move to ./internal

* refactor(multierror): move into the ./internal pkg

* refactor(kvstore): all kvstores in ./internal

Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.

* fix(kvstore): always return ErrNoSuchKey on Get() error

It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.

* sessionresolver: make KVStore mandatory

Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.

* fix(ooapi): use the ./internal/kvstore package

* fix(platform): better documentation
2021-06-04 10:34:18 +02:00

120 lines
2.6 KiB
Go

package geolocate
import (
"context"
"errors"
"fmt"
"math/rand"
"net"
"net/http"
"time"
"github.com/ooni/probe-cli/v3/internal/multierror"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
)
var (
// ErrAllIPLookuppersFailed indicates that we failed with looking
// up the probe IP for with all the lookuppers that we tried.
ErrAllIPLookuppersFailed = errors.New("all IP lookuppers failed")
// ErrInvalidIPAddress indicates that the code returned to us a
// string that actually isn't a valid IP address.
ErrInvalidIPAddress = errors.New("lookupper did not return a valid IP")
)
type lookupFunc func(
ctx context.Context, client *http.Client,
logger Logger, userAgent string,
) (string, error)
type method struct {
name string
fn lookupFunc
}
var (
methods = []method{
{
name: "avast",
fn: avastIPLookup,
},
{
name: "ipconfig",
fn: ipConfigIPLookup,
},
{
name: "ipinfo",
fn: ipInfoIPLookup,
},
{
name: "stun_ekiga",
fn: stunEkigaIPLookup,
},
{
name: "stun_google",
fn: stunGoogleIPLookup,
},
{
name: "ubuntu",
fn: ubuntuIPLookup,
},
}
)
type ipLookupClient struct {
// Resolver is the resolver to use for HTTP.
Resolver Resolver
// Logger is the logger to use
Logger Logger
// UserAgent is the user agent to use
UserAgent string
}
func makeSlice() []method {
r := rand.New(rand.NewSource(time.Now().UnixNano()))
ret := make([]method, len(methods))
perm := r.Perm(len(methods))
for idx, randIdx := range perm {
ret[idx] = methods[randIdx]
}
return ret
}
func (c ipLookupClient) doWithCustomFunc(
ctx context.Context, fn lookupFunc,
) (string, error) {
// Implementation note: we MUST use an HTTP client that we're
// sure IS NOT using any proxy. To this end, we construct a
// client ourself that we know is not proxied.
clnt := &http.Client{Transport: netx.NewHTTPTransport(netx.Config{
Logger: c.Logger,
FullResolver: c.Resolver,
})}
defer clnt.CloseIdleConnections()
ip, err := fn(ctx, clnt, c.Logger, c.UserAgent)
if err != nil {
return DefaultProbeIP, err
}
if net.ParseIP(ip) == nil {
return DefaultProbeIP, fmt.Errorf("%w: %s", ErrInvalidIPAddress, ip)
}
c.Logger.Debugf("iplookup: IP: %s", ip)
return ip, nil
}
func (c ipLookupClient) LookupProbeIP(ctx context.Context) (string, error) {
union := multierror.New(ErrAllIPLookuppersFailed)
for _, method := range makeSlice() {
c.Logger.Infof("iplookup: using %s", method.name)
ip, err := c.doWithCustomFunc(ctx, method.fn)
if err == nil {
return ip, nil
}
union.Add(err)
}
return DefaultProbeIP, union
}