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
74 lines
1.7 KiB
Go
74 lines
1.7 KiB
Go
package resolver
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
|
|
)
|
|
|
|
// SaverResolver is a resolver that saves events
|
|
type SaverResolver struct {
|
|
Resolver
|
|
Saver *trace.Saver
|
|
}
|
|
|
|
// LookupHost implements Resolver.LookupHost
|
|
func (r SaverResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
|
start := time.Now()
|
|
r.Saver.Write(trace.Event{
|
|
Address: r.Resolver.Address(),
|
|
Hostname: hostname,
|
|
Name: "resolve_start",
|
|
Proto: r.Resolver.Network(),
|
|
Time: start,
|
|
})
|
|
addrs, err := r.Resolver.LookupHost(ctx, hostname)
|
|
stop := time.Now()
|
|
r.Saver.Write(trace.Event{
|
|
Addresses: addrs,
|
|
Address: r.Resolver.Address(),
|
|
Duration: stop.Sub(start),
|
|
Err: err,
|
|
Hostname: hostname,
|
|
Name: "resolve_done",
|
|
Proto: r.Resolver.Network(),
|
|
Time: stop,
|
|
})
|
|
return addrs, err
|
|
}
|
|
|
|
// SaverDNSTransport is a DNS transport that saves events
|
|
type SaverDNSTransport struct {
|
|
RoundTripper
|
|
Saver *trace.Saver
|
|
}
|
|
|
|
// RoundTrip implements RoundTripper.RoundTrip
|
|
func (txp SaverDNSTransport) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
|
|
start := time.Now()
|
|
txp.Saver.Write(trace.Event{
|
|
Address: txp.Address(),
|
|
DNSQuery: query,
|
|
Name: "dns_round_trip_start",
|
|
Proto: txp.Network(),
|
|
Time: start,
|
|
})
|
|
reply, err := txp.RoundTripper.RoundTrip(ctx, query)
|
|
stop := time.Now()
|
|
txp.Saver.Write(trace.Event{
|
|
Address: txp.Address(),
|
|
DNSQuery: query,
|
|
DNSReply: reply,
|
|
Duration: stop.Sub(start),
|
|
Err: err,
|
|
Name: "dns_round_trip_done",
|
|
Proto: txp.Network(),
|
|
Time: stop,
|
|
})
|
|
return reply, err
|
|
}
|
|
|
|
var _ Resolver = SaverResolver{}
|
|
var _ RoundTripper = SaverDNSTransport{}
|