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
99 lines
2.2 KiB
Go
99 lines
2.2 KiB
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/pion/stun"
|
|
)
|
|
|
|
// TODO(bassosimone): we should modify the stun code to use
|
|
// the session resolver rather than using its own.
|
|
//
|
|
// See https://github.com/ooni/probe/issues/1383.
|
|
|
|
type stunClient interface {
|
|
Close() error
|
|
Start(m *stun.Message, h stun.Handler) error
|
|
}
|
|
|
|
type stunConfig struct {
|
|
Dial func(network string, address string) (stunClient, error)
|
|
Endpoint string
|
|
Logger model.Logger
|
|
}
|
|
|
|
func stunDialer(network string, address string) (stunClient, error) {
|
|
return stun.Dial(network, address)
|
|
}
|
|
|
|
func stunIPLookup(ctx context.Context, config stunConfig) (string, error) {
|
|
config.Logger.Debugf("STUNIPLookup: start using %s", config.Endpoint)
|
|
ip, err := func() (string, error) {
|
|
dial := config.Dial
|
|
if dial == nil {
|
|
dial = stunDialer
|
|
}
|
|
clnt, err := dial("udp", config.Endpoint)
|
|
if err != nil {
|
|
return DefaultProbeIP, err
|
|
}
|
|
defer clnt.Close()
|
|
message := stun.MustBuild(stun.TransactionID, stun.BindingRequest)
|
|
errch, ipch := make(chan error, 1), make(chan string, 1)
|
|
err = clnt.Start(message, func(ev stun.Event) {
|
|
if ev.Error != nil {
|
|
errch <- ev.Error
|
|
return
|
|
}
|
|
var xorAddr stun.XORMappedAddress
|
|
if err := xorAddr.GetFrom(ev.Message); err != nil {
|
|
errch <- err
|
|
return
|
|
}
|
|
ipch <- xorAddr.IP.String()
|
|
})
|
|
if err != nil {
|
|
return DefaultProbeIP, err
|
|
}
|
|
select {
|
|
case err := <-errch:
|
|
return DefaultProbeIP, err
|
|
case ip := <-ipch:
|
|
return ip, nil
|
|
case <-ctx.Done():
|
|
return DefaultProbeIP, ctx.Err()
|
|
}
|
|
}()
|
|
if err != nil {
|
|
config.Logger.Debugf("STUNIPLookup: failure using %s: %+v", config.Endpoint, err)
|
|
return DefaultProbeIP, err
|
|
}
|
|
return ip, nil
|
|
}
|
|
|
|
func stunEkigaIPLookup(
|
|
ctx context.Context,
|
|
httpClient *http.Client,
|
|
logger model.Logger,
|
|
userAgent string,
|
|
) (string, error) {
|
|
return stunIPLookup(ctx, stunConfig{
|
|
Endpoint: "stun.ekiga.net:3478",
|
|
Logger: logger,
|
|
})
|
|
}
|
|
|
|
func stunGoogleIPLookup(
|
|
ctx context.Context,
|
|
httpClient *http.Client,
|
|
logger model.Logger,
|
|
userAgent string,
|
|
) (string, error) {
|
|
return stunIPLookup(ctx, stunConfig{
|
|
Endpoint: "stun.l.google.com:19302",
|
|
Logger: logger,
|
|
})
|
|
}
|