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
88 lines
2.0 KiB
Go
88 lines
2.0 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"github.com/miekg/dns"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// DNSDecoderMiekg uses github.com/miekg/dns to implement the Decoder.
|
|
type DNSDecoderMiekg struct{}
|
|
|
|
func (d *DNSDecoderMiekg) parseReply(data []byte) (*dns.Msg, error) {
|
|
reply := new(dns.Msg)
|
|
if err := reply.Unpack(data); err != nil {
|
|
return nil, err
|
|
}
|
|
// TODO(bassosimone): map more errors to net.DNSError names
|
|
// TODO(bassosimone): add support for lame referral.
|
|
switch reply.Rcode {
|
|
case dns.RcodeSuccess:
|
|
return reply, nil
|
|
case dns.RcodeNameError:
|
|
return nil, ErrOODNSNoSuchHost
|
|
case dns.RcodeRefused:
|
|
return nil, ErrOODNSRefused
|
|
default:
|
|
return nil, ErrOODNSMisbehaving
|
|
}
|
|
}
|
|
|
|
func (d *DNSDecoderMiekg) DecodeHTTPS(data []byte) (*model.HTTPSSvc, error) {
|
|
reply, err := d.parseReply(data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out := &model.HTTPSSvc{}
|
|
for _, answer := range reply.Answer {
|
|
switch avalue := answer.(type) {
|
|
case *dns.HTTPS:
|
|
for _, v := range avalue.Value {
|
|
switch extv := v.(type) {
|
|
case *dns.SVCBAlpn:
|
|
out.ALPN = extv.Alpn
|
|
case *dns.SVCBIPv4Hint:
|
|
for _, ip := range extv.Hint {
|
|
out.IPv4 = append(out.IPv4, ip.String())
|
|
}
|
|
case *dns.SVCBIPv6Hint:
|
|
for _, ip := range extv.Hint {
|
|
out.IPv6 = append(out.IPv6, ip.String())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if len(out.ALPN) <= 0 {
|
|
return nil, ErrOODNSNoAnswer
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (d *DNSDecoderMiekg) DecodeLookupHost(qtype uint16, data []byte) ([]string, error) {
|
|
reply, err := d.parseReply(data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var addrs []string
|
|
for _, answer := range reply.Answer {
|
|
switch qtype {
|
|
case dns.TypeA:
|
|
if rra, ok := answer.(*dns.A); ok {
|
|
ip := rra.A
|
|
addrs = append(addrs, ip.String())
|
|
}
|
|
case dns.TypeAAAA:
|
|
if rra, ok := answer.(*dns.AAAA); ok {
|
|
ip := rra.AAAA
|
|
addrs = append(addrs, ip.String())
|
|
}
|
|
}
|
|
}
|
|
if len(addrs) <= 0 {
|
|
return nil, ErrOODNSNoAnswer
|
|
}
|
|
return addrs, nil
|
|
}
|
|
|
|
var _ model.DNSDecoder = &DNSDecoderMiekg{}
|