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
50 lines
1.5 KiB
Go
50 lines
1.5 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"github.com/miekg/dns"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// DNSEncoderMiekg uses github.com/miekg/dns to implement the Encoder.
|
|
type DNSEncoderMiekg struct{}
|
|
|
|
const (
|
|
// dnsPaddingDesiredBlockSize is the size that the padded query should be multiple of
|
|
dnsPaddingDesiredBlockSize = 128
|
|
|
|
// dnsEDNS0MaxResponseSize is the maximum response size for EDNS0
|
|
dnsEDNS0MaxResponseSize = 4096
|
|
|
|
// dnsDNSSECEnabled turns on support for DNSSEC when using EDNS0
|
|
dnsDNSSECEnabled = true
|
|
)
|
|
|
|
func (e *DNSEncoderMiekg) Encode(domain string, qtype uint16, padding bool) ([]byte, error) {
|
|
question := dns.Question{
|
|
Name: dns.Fqdn(domain),
|
|
Qtype: qtype,
|
|
Qclass: dns.ClassINET,
|
|
}
|
|
query := new(dns.Msg)
|
|
query.Id = dns.Id()
|
|
query.RecursionDesired = true
|
|
query.Question = make([]dns.Question, 1)
|
|
query.Question[0] = question
|
|
if padding {
|
|
query.SetEdns0(dnsEDNS0MaxResponseSize, dnsDNSSECEnabled)
|
|
// Clients SHOULD pad queries to the closest multiple of
|
|
// 128 octets RFC8467#section-4.1. We inflate the query
|
|
// length by the size of the option (i.e. 4 octets). The
|
|
// cast to uint is necessary to make the modulus operation
|
|
// work as intended when the desiredBlockSize is smaller
|
|
// than (query.Len()+4) ¯\_(ツ)_/¯.
|
|
remainder := (dnsPaddingDesiredBlockSize - uint(query.Len()+4)) % dnsPaddingDesiredBlockSize
|
|
opt := new(dns.EDNS0_PADDING)
|
|
opt.Padding = make([]byte, remainder)
|
|
query.IsEdns0().Option = append(query.IsEdns0().Option, opt)
|
|
}
|
|
return query.Pack()
|
|
}
|
|
|
|
var _ model.DNSEncoder = &DNSEncoderMiekg{}
|