2021-09-28 12:42:01 +02:00
|
|
|
package netxlite
|
2021-02-02 12:05:47 +01:00
|
|
|
|
2022-05-13 17:36:58 +02:00
|
|
|
//
|
2022-05-15 19:25:27 +02:00
|
|
|
// Serial DNS resolver implementation
|
2022-05-13 17:36:58 +02:00
|
|
|
//
|
|
|
|
|
2021-02-02 12:05:47 +01:00
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"errors"
|
|
|
|
"net"
|
|
|
|
|
|
|
|
"github.com/miekg/dns"
|
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/atomicx"
|
2022-01-03 13:53:23 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
2021-02-02 12:05:47 +01:00
|
|
|
)
|
|
|
|
|
2022-05-13 17:36:58 +02:00
|
|
|
// SerialResolver uses a transport and performs a LookupHost
|
2021-09-29 20:21:25 +02:00
|
|
|
// operation in a serial fashion (query for A first, wait for response,
|
|
|
|
// then query for AAAA, and wait for response), hence its name.
|
|
|
|
//
|
|
|
|
// You should probably use NewSerialResolver to create a new instance.
|
2022-05-13 17:36:58 +02:00
|
|
|
//
|
2022-05-15 19:25:27 +02:00
|
|
|
// Deprecated: please use ParallelResolver in new code. We cannot
|
|
|
|
// remove this code as long as we use tracing for measuring.
|
|
|
|
//
|
2022-05-16 10:46:53 +02:00
|
|
|
// QUIRK: unlike the ParallelResolver, this resolver's LookupHost retries
|
|
|
|
// each query three times for soft errors.
|
2021-02-02 12:05:47 +01:00
|
|
|
type SerialResolver struct {
|
2021-09-29 20:21:25 +02:00
|
|
|
// Encoder is the MANDATORY encoder to use.
|
2022-01-03 13:53:23 +01:00
|
|
|
Encoder model.DNSEncoder
|
2021-09-29 20:21:25 +02:00
|
|
|
|
|
|
|
// Decoder is the MANDATORY decoder to use.
|
2022-01-03 13:53:23 +01:00
|
|
|
Decoder model.DNSDecoder
|
2021-09-29 20:21:25 +02:00
|
|
|
|
|
|
|
// NumTimeouts is MANDATORY and counts the number of timeouts.
|
2021-02-02 12:05:47 +01:00
|
|
|
NumTimeouts *atomicx.Int64
|
2021-09-29 20:21:25 +02:00
|
|
|
|
2022-05-13 17:36:58 +02:00
|
|
|
// Txp is the MANDATORY underlying DNS transport.
|
2022-01-03 13:53:23 +01:00
|
|
|
Txp model.DNSTransport
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
|
2021-09-29 20:21:25 +02:00
|
|
|
// NewSerialResolver creates a new SerialResolver instance.
|
2022-01-03 13:53:23 +01:00
|
|
|
func NewSerialResolver(t model.DNSTransport) *SerialResolver {
|
2021-09-09 20:58:04 +02:00
|
|
|
return &SerialResolver{
|
2021-09-28 10:47:59 +02:00
|
|
|
Encoder: &DNSEncoderMiekg{},
|
|
|
|
Decoder: &DNSDecoderMiekg{},
|
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
|
|
|
NumTimeouts: &atomicx.Int64{},
|
2021-02-02 12:05:47 +01:00
|
|
|
Txp: t,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Transport returns the transport being used.
|
2022-01-03 13:53:23 +01:00
|
|
|
func (r *SerialResolver) Transport() model.DNSTransport {
|
2021-02-02 12:05:47 +01:00
|
|
|
return r.Txp
|
|
|
|
}
|
|
|
|
|
2021-09-29 20:21:25 +02:00
|
|
|
// Network returns the "network" of the underlying transport.
|
2021-09-09 20:58:04 +02:00
|
|
|
func (r *SerialResolver) Network() string {
|
2021-02-02 12:05:47 +01:00
|
|
|
return r.Txp.Network()
|
|
|
|
}
|
|
|
|
|
2021-09-29 20:21:25 +02:00
|
|
|
// Address returns the "address" of the underlying transport.
|
2021-09-09 20:58:04 +02:00
|
|
|
func (r *SerialResolver) Address() string {
|
2021-02-02 12:05:47 +01:00
|
|
|
return r.Txp.Address()
|
|
|
|
}
|
|
|
|
|
2021-09-29 20:21:25 +02:00
|
|
|
// CloseIdleConnections closes idle connections, if any.
|
2021-09-09 20:58:04 +02:00
|
|
|
func (r *SerialResolver) CloseIdleConnections() {
|
|
|
|
r.Txp.CloseIdleConnections()
|
|
|
|
}
|
|
|
|
|
2021-09-29 20:21:25 +02:00
|
|
|
// LookupHost performs an A lookup followed by an AAAA lookup for hostname.
|
2021-09-09 20:58:04 +02:00
|
|
|
func (r *SerialResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
2021-02-02 12:05:47 +01:00
|
|
|
var addrs []string
|
2021-09-27 16:48:46 +02:00
|
|
|
addrsA, errA := r.lookupHostWithRetry(ctx, hostname, dns.TypeA)
|
|
|
|
addrsAAAA, errAAAA := r.lookupHostWithRetry(ctx, hostname, dns.TypeAAAA)
|
2021-02-02 12:05:47 +01:00
|
|
|
if errA != nil && errAAAA != nil {
|
2021-10-15 16:20:07 +02:00
|
|
|
// Note: we choose to return the errA because we assume that
|
|
|
|
// it's the more meaningful one: the errAAAA may just be telling
|
|
|
|
// us that there is no AAAA record for the website.
|
2021-02-02 12:05:47 +01:00
|
|
|
return nil, errA
|
|
|
|
}
|
|
|
|
addrs = append(addrs, addrsA...)
|
|
|
|
addrs = append(addrs, addrsAAAA...)
|
|
|
|
return addrs, nil
|
|
|
|
}
|
|
|
|
|
2021-09-28 11:26:16 +02:00
|
|
|
// LookupHTTPS implements Resolver.LookupHTTPS.
|
2021-09-27 23:09:41 +02:00
|
|
|
func (r *SerialResolver) LookupHTTPS(
|
2022-01-03 13:53:23 +01:00
|
|
|
ctx context.Context, hostname string) (*model.HTTPSSvc, error) {
|
2022-05-14 19:38:46 +02:00
|
|
|
querydata, queryID, err := r.Encoder.Encode(
|
2021-09-27 23:09:41 +02:00
|
|
|
hostname, dns.TypeHTTPS, r.Txp.RequiresPadding())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
replydata, err := r.Txp.RoundTrip(ctx, querydata)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-05-14 19:38:46 +02:00
|
|
|
return r.Decoder.DecodeHTTPS(replydata, queryID)
|
2021-09-27 23:09:41 +02:00
|
|
|
}
|
|
|
|
|
2021-09-27 16:48:46 +02:00
|
|
|
func (r *SerialResolver) lookupHostWithRetry(
|
2021-02-02 12:05:47 +01:00
|
|
|
ctx context.Context, hostname string, qtype uint16) ([]string, error) {
|
2022-05-15 19:25:27 +02:00
|
|
|
// QUIRK: retrying has been there since the beginning so we need to
|
|
|
|
// keep it as long as we're using tracing for measuring.
|
2021-02-02 12:05:47 +01:00
|
|
|
var errorslist []error
|
|
|
|
for i := 0; i < 3; i++ {
|
2021-09-27 16:48:46 +02:00
|
|
|
replies, err := r.lookupHostWithoutRetry(ctx, hostname, qtype)
|
2021-02-02 12:05:47 +01:00
|
|
|
if err == nil {
|
|
|
|
return replies, nil
|
|
|
|
}
|
|
|
|
errorslist = append(errorslist, err)
|
|
|
|
var operr *net.OpError
|
2021-09-09 20:49:12 +02:00
|
|
|
if !errors.As(err, &operr) || !operr.Timeout() {
|
2021-02-02 12:05:47 +01:00
|
|
|
// The first error is the one that is most likely to be caused
|
|
|
|
// by the network. Subsequent errors are more likely to be caused
|
|
|
|
// by context deadlines. So, the first error is attached to an
|
|
|
|
// operation, while subsequent errors may possibly not be. If
|
|
|
|
// so, the resulting failing operation is not correct.
|
|
|
|
break
|
|
|
|
}
|
|
|
|
r.NumTimeouts.Add(1)
|
|
|
|
}
|
2022-05-15 19:25:27 +02:00
|
|
|
// QUIRK: we MUST return one of the errors otherwise we confuse the
|
2021-02-02 12:05:47 +01:00
|
|
|
// mechanism in errwrap that classifies the root cause operation, since
|
2022-05-15 19:25:27 +02:00
|
|
|
// it would not be able to find a child with a major operation error.
|
2021-02-02 12:05:47 +01:00
|
|
|
return nil, errorslist[0]
|
|
|
|
}
|
|
|
|
|
2021-09-27 16:48:46 +02:00
|
|
|
// lookupHostWithoutRetry issues a lookup host query for the specified
|
|
|
|
// qtype (dns.A or dns.AAAA) without retrying on failure.
|
|
|
|
func (r *SerialResolver) lookupHostWithoutRetry(
|
2021-02-02 12:05:47 +01:00
|
|
|
ctx context.Context, hostname string, qtype uint16) ([]string, error) {
|
2022-05-14 19:38:46 +02:00
|
|
|
querydata, queryID, err := r.Encoder.Encode(hostname, qtype, r.Txp.RequiresPadding())
|
2021-02-02 12:05:47 +01:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
replydata, err := r.Txp.RoundTrip(ctx, querydata)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2022-05-14 19:38:46 +02:00
|
|
|
return r.Decoder.DecodeLookupHost(qtype, replydata, queryID)
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
2022-05-16 10:46:53 +02:00
|
|
|
|
|
|
|
// LookupNS implements Resolver.LookupNS.
|
|
|
|
func (r *SerialResolver) LookupNS(
|
|
|
|
ctx context.Context, hostname string) ([]*net.NS, error) {
|
|
|
|
querydata, queryID, err := r.Encoder.Encode(
|
|
|
|
hostname, dns.TypeNS, r.Txp.RequiresPadding())
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
replydata, err := r.Txp.RoundTrip(ctx, querydata)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return r.Decoder.DecodeNS(replydata, queryID)
|
|
|
|
}
|