273b70bacc
## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: https://github.com/ooni/probe/issues/1885 - [x] related ooni/spec pull request: N/A Location of the issue tracker: https://github.com/ooni/probe ## Description This PR contains a set of changes to move important interfaces and data types into the `./internal/model` package. The criteria for including an interface or data type in here is roughly that the type should be important and used by several packages. We are especially interested to move more interfaces here to increase modularity. An additional side effect is that, by reading this package, one should be able to understand more quickly how different parts of the codebase interact with each other. This is what I want to move in `internal/model`: - [x] most important interfaces from `internal/netxlite` - [x] everything that was previously part of `internal/engine/model` - [x] mocks from `internal/netxlite/mocks` should also be moved in here as a subpackage
121 lines
2.6 KiB
Go
121 lines
2.6 KiB
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"math/rand"
|
|
"net"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/multierror"
|
|
)
|
|
|
|
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 model.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 model.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
|
|
}
|