Skip to content

Commit

Permalink
feat(dns): expose raw response message
Browse files Browse the repository at this point in the history
This diff extends measurexlite's extractor to include into the
DNS response we submit the raw response we received.

The reference issue is ooni/probe#1516
  • Loading branch information
bassosimone committed Aug 22, 2022
1 parent 20bcc89 commit 1addcf8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions internal/measurexlite/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,21 @@ func NewArchivalDNSLookupResultFromRoundTrip(index int64, started time.Duration,
Failure: tracex.NewFailure(err),
Hostname: query.Domain(),
QueryType: dns.TypeToString[query.Type()],
RawResponse: maybeRawResponse(response),
ResolverHostname: nil,
ResolverAddress: reso.Address(),
T: finished.Seconds(),
}
}

// maybeRawResponse returns either the raw response (when available) or nil.
func maybeRawResponse(resp model.DNSResponse) (out []byte) {
if resp != nil {
out = resp.Bytes()
}
return
}

// archivalAnswersFromAddrs generates model.ArchivalDNSAnswer from an array of addresses
func archivalAnswersFromAddrs(addrs []string) (out []model.ArchivalDNSAnswer) {
for _, addr := range addrs {
Expand Down
1 change: 1 addition & 0 deletions internal/model/archival.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ type ArchivalDNSLookupResult struct {
Failure *string `json:"failure"`
Hostname string `json:"hostname"`
QueryType string `json:"query_type"`
RawResponse []byte `json:"raw_response"`
ResolverHostname *string `json:"resolver_hostname"`
ResolverPort *string `json:"resolver_port"`
ResolverAddress string `json:"resolver_address"`
Expand Down

0 comments on commit 1addcf8

Please sign in to comment.