fbee736e90
* 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
53 lines
1.1 KiB
Go
53 lines
1.1 KiB
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
)
|
|
|
|
func TestIPLookupGood(t *testing.T) {
|
|
ip, err := (ipLookupClient{
|
|
Logger: log.Log,
|
|
UserAgent: "ooniprobe-engine/0.1.0",
|
|
}).LookupProbeIP(context.Background())
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if net.ParseIP(ip) == nil {
|
|
t.Fatal("not an IP address")
|
|
}
|
|
}
|
|
|
|
func TestIPLookupAllFailed(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel() // immediately cancel to cause Do() to fail
|
|
ip, err := (ipLookupClient{
|
|
Logger: log.Log,
|
|
UserAgent: "ooniprobe-engine/0.1.0",
|
|
}).LookupProbeIP(ctx)
|
|
if !errors.Is(err, context.Canceled) {
|
|
t.Fatal("expected an error here")
|
|
}
|
|
if ip != DefaultProbeIP {
|
|
t.Fatal("expected the default IP here")
|
|
}
|
|
}
|
|
|
|
func TestIPLookupInvalidIP(t *testing.T) {
|
|
ctx := context.Background()
|
|
ip, err := (ipLookupClient{
|
|
Logger: log.Log,
|
|
UserAgent: "ooniprobe-engine/0.1.0",
|
|
}).doWithCustomFunc(ctx, invalidIPLookup)
|
|
if !errors.Is(err, ErrInvalidIPAddress) {
|
|
t.Fatal("expected an error here")
|
|
}
|
|
if ip != DefaultProbeIP {
|
|
t.Fatal("expected the default IP here")
|
|
}
|
|
}
|