2021-02-02 12:05:47 +01:00
|
|
|
package geolocate
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"math/rand"
|
|
|
|
"net"
|
|
|
|
"net/http"
|
|
|
|
"time"
|
|
|
|
|
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
|
|
|
"github.com/ooni/probe-cli/v3/internal/multierror"
|
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
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
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,
|
|
|
|
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 {
|
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.
|
|
|
|
Resolver Resolver
|
2021-02-02 12:05:47 +01:00
|
|
|
|
|
|
|
// 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) {
|
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.
|
|
|
|
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)
|
2021-02-02 12:05:47 +01:00
|
|
|
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() {
|
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)
|
|
|
|
}
|
|
|
|
return DefaultProbeIP, union
|
|
|
|
}
|