2021-02-02 12:05:47 +01:00
|
|
|
package geolocate
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"math/rand"
|
|
|
|
"net"
|
|
|
|
"net/http"
|
|
|
|
"time"
|
|
|
|
|
2022-01-03 13:53:23 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
2021-06-04 15:15:41 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/multierror"
|
2022-05-25 09:12:02 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
2021-02-02 12:05:47 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
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,
|
2022-01-03 13:53:23 +01:00
|
|
|
logger model.Logger, userAgent string,
|
2021-02-02 12:05:47 +01:00
|
|
|
) (string, error)
|
|
|
|
|
|
|
|
type method struct {
|
|
|
|
name string
|
|
|
|
fn lookupFunc
|
|
|
|
}
|
|
|
|
|
|
|
|
var (
|
|
|
|
methods = []method{
|
2022-02-09 11:54:19 +01:00
|
|
|
{
|
|
|
|
name: "cloudflare",
|
|
|
|
fn: cloudflareIPLookup,
|
|
|
|
},
|
2021-02-02 12:05:47 +01:00
|
|
|
{
|
|
|
|
name: "stun_ekiga",
|
|
|
|
fn: stunEkigaIPLookup,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "stun_google",
|
|
|
|
fn: stunGoogleIPLookup,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "ubuntu",
|
|
|
|
fn: ubuntuIPLookup,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
)
|
|
|
|
|
|
|
|
type ipLookupClient struct {
|
fix(geolocate): no proxy when discovering our IP address (#251)
* fix(geolocate): no proxy when discovering our IP address
The use case of --proxy is that you cannot contact the OONI
backend otherwise. It is wrong, though, using the proxy when
discovering our IP address. The measurement won't use the
proxy anyway. Therefore, we need to use the IP address that
is performing the measurement. Not the one of the proxy.
What's more, stun is not using a proxy. Therefore, it does
not make much sense that http IP resolvers use a proxy. This
leads to inconsistencies. So, here's anothe reason why this
patch is a good thing (TM).
Finally, because knowing the IP address enables us to sanitize
the data, it's important we discover the correct IP.
Now, up until this point, the `--proxy` option has mostly
been a developers toy. But, users have asked us to have the
possibility of configuring a proxy.
This explains why I have been looking into making `--proxy`
right for a couple of hours now.
See https://github.com/ooni/probe/issues/1382
* fix(session): properly configure the IP lookupper
2021-03-10 12:01:08 +01:00
|
|
|
// Resolver is the resolver to use for HTTP.
|
2022-01-07 18:33:37 +01:00
|
|
|
Resolver model.Resolver
|
2021-02-02 12:05:47 +01:00
|
|
|
|
|
|
|
// Logger is the logger to use
|
2022-01-03 13:53:23 +01:00
|
|
|
Logger model.Logger
|
2021-02-02 12:05:47 +01:00
|
|
|
|
|
|
|
// 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) {
|
2022-02-09 13:22:01 +01:00
|
|
|
// Reliability fix: let these mechanisms timeout earlier.
|
|
|
|
const timeout = 7 * time.Second
|
|
|
|
ctx, cancel := context.WithTimeout(ctx, timeout)
|
|
|
|
defer cancel()
|
fix(geolocate): no proxy when discovering our IP address (#251)
* fix(geolocate): no proxy when discovering our IP address
The use case of --proxy is that you cannot contact the OONI
backend otherwise. It is wrong, though, using the proxy when
discovering our IP address. The measurement won't use the
proxy anyway. Therefore, we need to use the IP address that
is performing the measurement. Not the one of the proxy.
What's more, stun is not using a proxy. Therefore, it does
not make much sense that http IP resolvers use a proxy. This
leads to inconsistencies. So, here's anothe reason why this
patch is a good thing (TM).
Finally, because knowing the IP address enables us to sanitize
the data, it's important we discover the correct IP.
Now, up until this point, the `--proxy` option has mostly
been a developers toy. But, users have asked us to have the
possibility of configuring a proxy.
This explains why I have been looking into making `--proxy`
right for a couple of hours now.
See https://github.com/ooni/probe/issues/1382
* fix(session): properly configure the IP lookupper
2021-03-10 12:01:08 +01:00
|
|
|
// 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.
|
2022-06-08 15:13:01 +02:00
|
|
|
txp := netxlite.NewHTTPTransportWithResolver(c.Logger, c.Resolver)
|
2022-05-25 09:12:02 +02:00
|
|
|
clnt := &http.Client{Transport: txp}
|
fix(geolocate): no proxy when discovering our IP address (#251)
* fix(geolocate): no proxy when discovering our IP address
The use case of --proxy is that you cannot contact the OONI
backend otherwise. It is wrong, though, using the proxy when
discovering our IP address. The measurement won't use the
proxy anyway. Therefore, we need to use the IP address that
is performing the measurement. Not the one of the proxy.
What's more, stun is not using a proxy. Therefore, it does
not make much sense that http IP resolvers use a proxy. This
leads to inconsistencies. So, here's anothe reason why this
patch is a good thing (TM).
Finally, because knowing the IP address enables us to sanitize
the data, it's important we discover the correct IP.
Now, up until this point, the `--proxy` option has mostly
been a developers toy. But, users have asked us to have the
possibility of configuring a proxy.
This explains why I have been looking into making `--proxy`
right for a couple of hours now.
See https://github.com/ooni/probe/issues/1382
* fix(session): properly configure the IP lookupper
2021-03-10 12:01:08 +01:00
|
|
|
defer clnt.CloseIdleConnections()
|
|
|
|
ip, err := fn(ctx, clnt, c.Logger, c.UserAgent)
|
2021-02-02 12:05:47 +01:00
|
|
|
if err != nil {
|
2022-08-28 20:00:25 +02:00
|
|
|
return model.DefaultProbeIP, err
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
if net.ParseIP(ip) == nil {
|
2022-08-28 20:00:25 +02:00
|
|
|
return model.DefaultProbeIP, fmt.Errorf("%w: %s", ErrInvalidIPAddress, ip)
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
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() {
|
fix(geolocate): no proxy when discovering our IP address (#251)
* fix(geolocate): no proxy when discovering our IP address
The use case of --proxy is that you cannot contact the OONI
backend otherwise. It is wrong, though, using the proxy when
discovering our IP address. The measurement won't use the
proxy anyway. Therefore, we need to use the IP address that
is performing the measurement. Not the one of the proxy.
What's more, stun is not using a proxy. Therefore, it does
not make much sense that http IP resolvers use a proxy. This
leads to inconsistencies. So, here's anothe reason why this
patch is a good thing (TM).
Finally, because knowing the IP address enables us to sanitize
the data, it's important we discover the correct IP.
Now, up until this point, the `--proxy` option has mostly
been a developers toy. But, users have asked us to have the
possibility of configuring a proxy.
This explains why I have been looking into making `--proxy`
right for a couple of hours now.
See https://github.com/ooni/probe/issues/1382
* fix(session): properly configure the IP lookupper
2021-03-10 12:01:08 +01:00
|
|
|
c.Logger.Infof("iplookup: using %s", method.name)
|
2021-02-02 12:05:47 +01:00
|
|
|
ip, err := c.doWithCustomFunc(ctx, method.fn)
|
|
|
|
if err == nil {
|
|
|
|
return ip, nil
|
|
|
|
}
|
|
|
|
union.Add(err)
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
return model.DefaultProbeIP, union
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|