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
94 lines
2.6 KiB
Go
94 lines
2.6 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// DNSOverHTTPS is a DNS-over-HTTPS DNSTransport.
|
|
type DNSOverHTTPS struct {
|
|
// Client is the MANDATORY http client to use.
|
|
Client model.HTTPClient
|
|
|
|
// URL is the MANDATORY URL of the DNS-over-HTTPS server.
|
|
URL string
|
|
|
|
// HostOverride is OPTIONAL and allows to override the
|
|
// Host header sent in every request.
|
|
HostOverride string
|
|
}
|
|
|
|
// NewDNSOverHTTPS creates a new DNSOverHTTPS instance.
|
|
//
|
|
// Arguments:
|
|
//
|
|
// - client in http.Client-like type (e.g., http.DefaultClient);
|
|
//
|
|
// - URL is the DoH resolver URL (e.g., https://1.1.1.1/dns-query).
|
|
func NewDNSOverHTTPS(client model.HTTPClient, URL string) *DNSOverHTTPS {
|
|
return NewDNSOverHTTPSWithHostOverride(client, URL, "")
|
|
}
|
|
|
|
// NewDNSOverHTTPSWithHostOverride creates a new DNSOverHTTPS
|
|
// with the given Host header override.
|
|
func NewDNSOverHTTPSWithHostOverride(
|
|
client model.HTTPClient, URL, hostOverride string) *DNSOverHTTPS {
|
|
return &DNSOverHTTPS{Client: client, URL: URL, HostOverride: hostOverride}
|
|
}
|
|
|
|
// RoundTrip sends a query and receives a reply.
|
|
func (t *DNSOverHTTPS) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
|
|
ctx, cancel := context.WithTimeout(ctx, 45*time.Second)
|
|
defer cancel()
|
|
req, err := http.NewRequest("POST", t.URL, bytes.NewReader(query))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
req.Host = t.HostOverride
|
|
req.Header.Set("user-agent", httpheader.UserAgent())
|
|
req.Header.Set("content-type", "application/dns-message")
|
|
var resp *http.Response
|
|
resp, err = t.Client.Do(req.WithContext(ctx))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != 200 {
|
|
// TODO(bassosimone): we should map the status code to a
|
|
// proper Error in the DNS context.
|
|
return nil, errors.New("doh: server returned error")
|
|
}
|
|
if resp.Header.Get("content-type") != "application/dns-message" {
|
|
return nil, errors.New("doh: invalid content-type")
|
|
}
|
|
return ReadAllContext(ctx, resp.Body)
|
|
}
|
|
|
|
// RequiresPadding returns true for DoH according to RFC8467.
|
|
func (t *DNSOverHTTPS) RequiresPadding() bool {
|
|
return true
|
|
}
|
|
|
|
// Network returns the transport network, i.e., "doh".
|
|
func (t *DNSOverHTTPS) Network() string {
|
|
return "doh"
|
|
}
|
|
|
|
// Address returns the URL we're using for the DoH server.
|
|
func (t *DNSOverHTTPS) Address() string {
|
|
return t.URL
|
|
}
|
|
|
|
// CloseIdleConnections closes idle connections, if any.
|
|
func (t *DNSOverHTTPS) CloseIdleConnections() {
|
|
t.Client.CloseIdleConnections()
|
|
}
|
|
|
|
var _ model.DNSTransport = &DNSOverHTTPS{}
|