6212daa54a
Tracex contained some fragile code that assembled HTTP measurements from scattered events, which worked because we were sure we were performing a single measurement at any given time. This diff restructures the code to emit a transaction-start and a transaction-done events only. We have basically removed all the other events (which we were not using). We kept the transaction-start though, because it may be useful to see it when reading events. In any case, what matters here is that we're now using the transaction-done event aline to generate the archival HTTP measurement. Hence, the original issue has been addressed. We will possibly do more refactoring in the future, but for now this seems sufficient. Part of https://github.com/ooni/probe/issues/2121
326 lines
9.2 KiB
Go
326 lines
9.2 KiB
Go
package tracex
|
|
|
|
import (
|
|
"crypto/x509"
|
|
"errors"
|
|
"net"
|
|
"net/http"
|
|
"sort"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/geolocate"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
// Compatibility types. Most experiments still use these names.
|
|
type (
|
|
ExtSpec = model.ArchivalExtSpec
|
|
TCPConnectEntry = model.ArchivalTCPConnectResult
|
|
TCPConnectStatus = model.ArchivalTCPConnectStatus
|
|
MaybeBinaryValue = model.ArchivalMaybeBinaryData
|
|
DNSQueryEntry = model.ArchivalDNSLookupResult
|
|
DNSAnswerEntry = model.ArchivalDNSAnswer
|
|
TLSHandshake = model.ArchivalTLSOrQUICHandshakeResult
|
|
HTTPBody = model.ArchivalHTTPBody
|
|
HTTPHeader = model.ArchivalHTTPHeader
|
|
RequestEntry = model.ArchivalHTTPRequestResult
|
|
HTTPRequest = model.ArchivalHTTPRequest
|
|
HTTPResponse = model.ArchivalHTTPResponse
|
|
NetworkEvent = model.ArchivalNetworkEvent
|
|
)
|
|
|
|
// Compatibility variables. Most experiments still use these names.
|
|
var (
|
|
ExtDNS = model.ArchivalExtDNS
|
|
ExtNetevents = model.ArchivalExtNetevents
|
|
ExtHTTP = model.ArchivalExtHTTP
|
|
ExtTCPConnect = model.ArchivalExtTCPConnect
|
|
ExtTLSHandshake = model.ArchivalExtTLSHandshake
|
|
ExtTunnel = model.ArchivalExtTunnel
|
|
)
|
|
|
|
// NewTCPConnectList creates a new TCPConnectList
|
|
func NewTCPConnectList(begin time.Time, events []Event) []TCPConnectEntry {
|
|
var out []TCPConnectEntry
|
|
for _, wrapper := range events {
|
|
if _, ok := wrapper.(*EventConnectOperation); !ok {
|
|
continue
|
|
}
|
|
event := wrapper.Value()
|
|
if event.Proto != "tcp" {
|
|
continue
|
|
}
|
|
// We assume Go is passing us legit data structures
|
|
ip, sport, _ := net.SplitHostPort(event.Address)
|
|
iport, _ := strconv.Atoi(sport)
|
|
out = append(out, TCPConnectEntry{
|
|
IP: ip,
|
|
Port: iport,
|
|
Status: TCPConnectStatus{
|
|
Failure: NewFailure(event.Err),
|
|
Success: event.Err == nil,
|
|
},
|
|
T: event.Time.Sub(begin).Seconds(),
|
|
})
|
|
}
|
|
return out
|
|
}
|
|
|
|
// NewFailure creates a failure nullable string from the given error
|
|
func NewFailure(err error) *string {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
// The following code guarantees that the error is always wrapped even
|
|
// when we could not actually hit our code that does the wrapping. A case
|
|
// in which this happen is with context deadline for HTTP.
|
|
err = netxlite.NewTopLevelGenericErrWrapper(err)
|
|
errWrapper := err.(*netxlite.ErrWrapper)
|
|
s := errWrapper.Failure
|
|
if s == "" {
|
|
s = "unknown_failure: errWrapper.Failure is empty"
|
|
}
|
|
return &s
|
|
}
|
|
|
|
// NewFailedOperation creates a failed operation string from the given error.
|
|
func NewFailedOperation(err error) *string {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
var (
|
|
errWrapper *netxlite.ErrWrapper
|
|
s = netxlite.UnknownOperation
|
|
)
|
|
if errors.As(err, &errWrapper) && errWrapper.Operation != "" {
|
|
s = errWrapper.Operation
|
|
}
|
|
return &s
|
|
}
|
|
|
|
func httpAddHeaders(
|
|
source http.Header,
|
|
destList *[]HTTPHeader,
|
|
destMap *map[string]MaybeBinaryValue,
|
|
) {
|
|
*destList = []HTTPHeader{}
|
|
*destMap = make(map[string]model.ArchivalMaybeBinaryData)
|
|
for key, values := range source {
|
|
for index, value := range values {
|
|
value := MaybeBinaryValue{Value: value}
|
|
// With the map representation we can only represent a single
|
|
// value for every key. Hence the list representation.
|
|
if index == 0 {
|
|
(*destMap)[key] = value
|
|
}
|
|
*destList = append(*destList, HTTPHeader{
|
|
Key: key,
|
|
Value: value,
|
|
})
|
|
}
|
|
}
|
|
sort.Slice(*destList, func(i, j int) bool {
|
|
return (*destList)[i].Key < (*destList)[j].Key
|
|
})
|
|
}
|
|
|
|
// NewRequestList returns the list for "requests"
|
|
func NewRequestList(begin time.Time, events []Event) []RequestEntry {
|
|
// OONI wants the last request to appear first
|
|
var out []RequestEntry
|
|
tmp := newRequestList(begin, events)
|
|
for i := len(tmp) - 1; i >= 0; i-- {
|
|
out = append(out, tmp[i])
|
|
}
|
|
return out
|
|
}
|
|
|
|
func newRequestList(begin time.Time, events []Event) []RequestEntry {
|
|
var (
|
|
out []RequestEntry
|
|
entry RequestEntry
|
|
)
|
|
for _, wrapper := range events {
|
|
ev := wrapper.Value()
|
|
switch wrapper.(type) {
|
|
case *EventHTTPTransactionDone:
|
|
entry = RequestEntry{}
|
|
entry.T = ev.Time.Sub(begin).Seconds()
|
|
httpAddHeaders(
|
|
ev.HTTPRequestHeaders, &entry.Request.HeadersList, &entry.Request.Headers)
|
|
entry.Request.Method = ev.HTTPMethod
|
|
entry.Request.URL = ev.HTTPURL
|
|
entry.Request.Transport = ev.Transport
|
|
httpAddHeaders(
|
|
ev.HTTPResponseHeaders, &entry.Response.HeadersList, &entry.Response.Headers)
|
|
entry.Response.Code = int64(ev.HTTPStatusCode)
|
|
entry.Response.Locations = ev.HTTPResponseHeaders.Values("Location")
|
|
entry.Response.Body.Value = string(ev.HTTPResponseBody)
|
|
entry.Response.BodyIsTruncated = ev.HTTPResponseBodyIsTruncated
|
|
entry.Failure = NewFailure(ev.Err)
|
|
out = append(out, entry)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
type dnsQueryType string
|
|
|
|
// NewDNSQueriesList returns a list of DNS queries.
|
|
func NewDNSQueriesList(begin time.Time, events []Event) []DNSQueryEntry {
|
|
// TODO(bassosimone): add support for CNAME lookups.
|
|
var out []DNSQueryEntry
|
|
for _, wrapper := range events {
|
|
if _, ok := wrapper.(*EventResolveDone); !ok {
|
|
continue
|
|
}
|
|
ev := wrapper.Value()
|
|
for _, qtype := range []dnsQueryType{"A", "AAAA"} {
|
|
entry := qtype.makeQueryEntry(begin, ev)
|
|
for _, addr := range ev.Addresses {
|
|
if qtype.ipOfType(addr) {
|
|
entry.Answers = append(
|
|
entry.Answers, qtype.makeAnswerEntry(addr))
|
|
}
|
|
}
|
|
if len(entry.Answers) <= 0 && ev.Err == nil {
|
|
// This allows us to skip cases where the server does not have
|
|
// an IPv6 address but has an IPv4 address. Instead, when we
|
|
// receive an error, we want to track its existence. The main
|
|
// issue here is that we are cheating, because we are creating
|
|
// entries representing queries, but we don't know what the
|
|
// resolver actually did, especially the system resolver. So,
|
|
// this output is just our best guess.
|
|
continue
|
|
}
|
|
out = append(out, entry)
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func (qtype dnsQueryType) ipOfType(addr string) bool {
|
|
switch qtype {
|
|
case "A":
|
|
return !strings.Contains(addr, ":")
|
|
case "AAAA":
|
|
return strings.Contains(addr, ":")
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (qtype dnsQueryType) makeAnswerEntry(addr string) DNSAnswerEntry {
|
|
answer := DNSAnswerEntry{AnswerType: string(qtype)}
|
|
asn, org, _ := geolocate.LookupASN(addr)
|
|
answer.ASN = int64(asn)
|
|
answer.ASOrgName = org
|
|
switch qtype {
|
|
case "A":
|
|
answer.IPv4 = addr
|
|
case "AAAA":
|
|
answer.IPv6 = addr
|
|
}
|
|
return answer
|
|
}
|
|
|
|
func (qtype dnsQueryType) makeQueryEntry(begin time.Time, ev *EventValue) DNSQueryEntry {
|
|
return DNSQueryEntry{
|
|
Engine: ev.Proto,
|
|
Failure: NewFailure(ev.Err),
|
|
Hostname: ev.Hostname,
|
|
QueryType: string(qtype),
|
|
ResolverAddress: ev.Address,
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
}
|
|
}
|
|
|
|
// NewNetworkEventsList returns a list of DNS queries.
|
|
func NewNetworkEventsList(begin time.Time, events []Event) []NetworkEvent {
|
|
var out []NetworkEvent
|
|
for _, wrapper := range events {
|
|
ev := wrapper.Value()
|
|
switch wrapper.(type) {
|
|
case *EventConnectOperation:
|
|
out = append(out, NetworkEvent{
|
|
Address: ev.Address,
|
|
Failure: NewFailure(ev.Err),
|
|
Operation: wrapper.Name(),
|
|
Proto: ev.Proto,
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
})
|
|
case *EventReadOperation:
|
|
out = append(out, NetworkEvent{
|
|
Failure: NewFailure(ev.Err),
|
|
Operation: wrapper.Name(),
|
|
NumBytes: int64(ev.NumBytes),
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
})
|
|
case *EventWriteOperation:
|
|
out = append(out, NetworkEvent{
|
|
Failure: NewFailure(ev.Err),
|
|
Operation: wrapper.Name(),
|
|
NumBytes: int64(ev.NumBytes),
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
})
|
|
case *EventReadFromOperation:
|
|
out = append(out, NetworkEvent{
|
|
Address: ev.Address,
|
|
Failure: NewFailure(ev.Err),
|
|
Operation: wrapper.Name(),
|
|
NumBytes: int64(ev.NumBytes),
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
})
|
|
case *EventWriteToOperation:
|
|
out = append(out, NetworkEvent{
|
|
Address: ev.Address,
|
|
Failure: NewFailure(ev.Err),
|
|
Operation: wrapper.Name(),
|
|
NumBytes: int64(ev.NumBytes),
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
})
|
|
default:
|
|
out = append(out, NetworkEvent{
|
|
Failure: NewFailure(ev.Err),
|
|
Operation: wrapper.Name(),
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
})
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
// NewTLSHandshakesList creates a new TLSHandshakesList
|
|
func NewTLSHandshakesList(begin time.Time, events []Event) []TLSHandshake {
|
|
var out []TLSHandshake
|
|
for _, wrapper := range events {
|
|
switch wrapper.(type) {
|
|
case *EventQUICHandshakeDone, *EventTLSHandshakeDone: // ok
|
|
default:
|
|
continue // not interested
|
|
}
|
|
ev := wrapper.Value()
|
|
out = append(out, TLSHandshake{
|
|
Address: ev.Address,
|
|
CipherSuite: ev.TLSCipherSuite,
|
|
Failure: NewFailure(ev.Err),
|
|
NegotiatedProtocol: ev.TLSNegotiatedProto,
|
|
NoTLSVerify: ev.NoTLSVerify,
|
|
PeerCertificates: tlsMakePeerCerts(ev.TLSPeerCerts),
|
|
ServerName: ev.TLSServerName,
|
|
T: ev.Time.Sub(begin).Seconds(),
|
|
TLSVersion: ev.TLSVersion,
|
|
})
|
|
}
|
|
return out
|
|
}
|
|
|
|
func tlsMakePeerCerts(in []*x509.Certificate) (out []MaybeBinaryValue) {
|
|
for _, e := range in {
|
|
out = append(out, MaybeBinaryValue{Value: string(e.Raw)})
|
|
}
|
|
return
|
|
}
|