d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
60 lines
1.6 KiB
Go
60 lines
1.6 KiB
Go
package quicdialer
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net"
|
|
|
|
"github.com/lucas-clemente/quic-go"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/dialid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/dialer"
|
|
)
|
|
|
|
// DNSDialer is a dialer that uses the configured Resolver to resolve a
|
|
// domain name to IP addresses
|
|
type DNSDialer struct {
|
|
Dialer ContextDialer
|
|
Resolver Resolver
|
|
}
|
|
|
|
// DialContext implements ContextDialer.DialContext
|
|
func (d DNSDialer) DialContext(
|
|
ctx context.Context, network, host string,
|
|
tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlySession, error) {
|
|
onlyhost, onlyport, err := net.SplitHostPort(host)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// TODO(kelmenhorst): Should this be somewhere else?
|
|
// failure if tlsCfg is nil but that should not happen
|
|
if tlsCfg.ServerName == "" {
|
|
tlsCfg.ServerName = onlyhost
|
|
}
|
|
ctx = dialid.WithDialID(ctx)
|
|
var addrs []string
|
|
addrs, err = d.LookupHost(ctx, onlyhost)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var errorslist []error
|
|
for _, addr := range addrs {
|
|
target := net.JoinHostPort(addr, onlyport)
|
|
sess, err := d.Dialer.DialContext(
|
|
ctx, network, target, tlsCfg, cfg)
|
|
if err == nil {
|
|
return sess, nil
|
|
}
|
|
errorslist = append(errorslist, err)
|
|
}
|
|
// TODO(bassosimone): maybe ReduceErrors could be in netx/internal.
|
|
return nil, dialer.ReduceErrors(errorslist)
|
|
}
|
|
|
|
// LookupHost implements Resolver.LookupHost
|
|
func (d DNSDialer) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
|
if net.ParseIP(hostname) != nil {
|
|
return []string{hostname}, nil
|
|
}
|
|
return d.Resolver.LookupHost(ctx, hostname)
|
|
}
|