Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(webconnectivitylte): add classic and tcptls_experiment tags #1502

Merged
merged 3 commits into from
Feb 13, 2024
Merged

fix(webconnectivitylte): add classic and tcptls_experiment tags #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52325fb
x
bassosimone Feb 13, 2024
45c961a
y
bassosimone Feb 13, 2024
263db39
regen
bassosimone Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions internal/experiment/webconnectivitylte/cleartextflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package webconnectivitylte

import (
"context"
"fmt"
"io"
"net"
"net/http"
Expand All @@ -32,6 +31,9 @@ type CleartextFlow struct {
// Address is the MANDATORY address to connect to.
Address string

// Classic is true if this address was discovered using getaddrinfo.
Classic bool

// DNSCache is the MANDATORY DNS cache.
DNSCache *DNSCache

Expand Down Expand Up @@ -106,8 +108,7 @@ func (t *CleartextFlow) Run(parentCtx context.Context, index int64) error {
}

// create trace
trace := measurexlite.NewTrace(index, t.ZeroTime, fmt.Sprintf("depth=%d", t.Depth),
fmt.Sprintf("fetch_body=%v", t.PrioSelector != nil))
trace := measurexlite.NewTrace(index, t.ZeroTime, generateTagsForEndpoints(t.Depth, t.PrioSelector, t.Classic)...)

// start measuring throttling
sampler := throttling.NewSampler(trace)
Expand Down
4 changes: 3 additions & 1 deletion internal/experiment/webconnectivitylte/dnsresolvers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func (t *DNSResolvers) lookupHostSystem(parentCtx context.Context, out chan<- []
index := t.IDGenerator.NewIDForGetaddrinfo()

// create trace
trace := measurexlite.NewTrace(index, t.ZeroTime, fmt.Sprintf("depth=%d", t.Depth))
trace := measurexlite.NewTrace(index, t.ZeroTime, "classic", fmt.Sprintf("depth=%d", t.Depth))

// start the operation logger
ol := logx.NewOperationLogger(
Expand Down Expand Up @@ -394,6 +394,7 @@ func (t *DNSResolvers) startCleartextFlows(
MaybeDelayCleartextFlows(index) // allow specific callers to space flows apart
task := &CleartextFlow{
Address: net.JoinHostPort(addr.Addr, port),
Classic: addr.Flags&DNSAddrFlagSystemResolver != 0,
Depth: t.Depth,
DNSCache: t.DNSCache,
DNSOverHTTPSURLProvider: t.DNSOverHTTPSURLProvider,
Expand Down Expand Up @@ -444,6 +445,7 @@ func (t *DNSResolvers) startSecureFlows(
MaybeDelaySecureFlows(index) // allow specific callers to space flows apart
task := &SecureFlow{
Address: net.JoinHostPort(addr.Addr, port),
Classic: addr.Flags&DNSAddrFlagSystemResolver != 0,
Depth: t.Depth,
DNSCache: t.DNSCache,
DNSOverHTTPSURLProvider: t.DNSOverHTTPSURLProvider,
Expand Down
7 changes: 4 additions & 3 deletions internal/experiment/webconnectivitylte/secureflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package webconnectivitylte
import (
"context"
"crypto/tls"
"fmt"
"io"
"net"
"net/http"
Expand All @@ -33,6 +32,9 @@ type SecureFlow struct {
// Address is the MANDATORY address to connect to.
Address string

// Classic is true if this address was discovered using getaddrinfo.
Classic bool

// DNSCache is the MANDATORY DNS cache.
DNSCache *DNSCache

Expand Down Expand Up @@ -113,8 +115,7 @@ func (t *SecureFlow) Run(parentCtx context.Context, index int64) error {
}

// create trace
trace := measurexlite.NewTrace(index, t.ZeroTime, fmt.Sprintf("depth=%d", t.Depth),
fmt.Sprintf("fetch_body=%v", t.PrioSelector != nil))
trace := measurexlite.NewTrace(index, t.ZeroTime, generateTagsForEndpoints(t.Depth, t.PrioSelector, t.Classic)...)

// start measuring throttling
sampler := throttling.NewSampler(trace)
Expand Down
31 changes: 31 additions & 0 deletions internal/experiment/webconnectivitylte/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package webconnectivitylte

import "fmt"

// generateTagsForEndpoints generates the tags for the endpoints.
func generateTagsForEndpoints(depth int64, ps *prioritySelector, classic bool) (output []string) {
// The classic flag marks all observations using IP addresses
// fetched using the system resolver. Strictly speaking classic
// means that these measurements derive from the resolver that
// we consider primary, and for us it it the system one.
if classic {
output = append(output, "classic")
}

// The depth=0|1|... tag indicates the current redirect depth.
//
// When the depth is zero, we also include the tcptls_experiment tag
// for backwards compatibility with Web Connectivity v0.4.
if depth < 1 {
output = append(output, "tcptls_experiment")
}
output = append(output, fmt.Sprintf("depth=%d", depth))

// The fetch_body=true|false tag allows to distinguish between observations
// with the objective of fetching the body and extra observations. For example,
// for http:// requests we perform TLS handshakes for the purpose of checking
// whether IP addresses are valid without fetching the body.
output = append(output, fmt.Sprintf("fetch_body=%v", ps != nil))

return output
}
2 changes: 2 additions & 0 deletions internal/minipipeline/classic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ package minipipeline
//
// The result should approximate what v0.4 would have measured.
func ClassicFilter(input *WebObservationsContainer) (output *WebObservationsContainer) {
// TODO(bassosimone): now that there's a "classic" tag it would probably
// be simpler to just always use the "classic" tag to extract.
output = &WebObservationsContainer{
DNSLookupFailures: []*WebObservation{},
DNSLookupSuccesses: []*WebObservation{},
Expand Down
5 changes: 5 additions & 0 deletions ...pipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
"resolver_address": "",
"t": 0,
"tags": [
"classic",
"depth=0"
],
"transaction_id": 10001
Expand Down Expand Up @@ -148,6 +149,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -166,6 +169,8 @@
"server_name": "expired.badssl.com",
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand Down
5 changes: 5 additions & 0 deletions ...ta/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
"resolver_address": "",
"t": 0,
"tags": [
"classic",
"depth=0"
],
"transaction_id": 10001
Expand Down Expand Up @@ -148,6 +149,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -166,6 +169,8 @@
"server_name": "untrusted-root.badssl.com",
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand Down
8 changes: 8 additions & 0 deletions .../webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
"resolver_address": "",
"t": 0,
"tags": [
"classic",
"depth=0"
],
"transaction_id": 10001
Expand Down Expand Up @@ -215,6 +216,7 @@
},
"t": 0,
"tags": [
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -231,6 +233,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -245,6 +249,7 @@
},
"t": 0,
"tags": [
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -263,6 +268,8 @@
"server_name": "www.example.com",
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -280,6 +287,7 @@
"server_name": "www.example.com",
"t": 0,
"tags": [
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand Down
5 changes: 5 additions & 0 deletions ...inipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
"resolver_address": "",
"t": 0,
"tags": [
"classic",
"depth=0"
],
"transaction_id": 10001
Expand Down Expand Up @@ -148,6 +149,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -166,6 +169,8 @@
"server_name": "wrong.host.badssl.com",
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand Down
9 changes: 9 additions & 0 deletions ...inipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
"resolver_address": "",
"t": 0,
"tags": [
"classic",
"depth=0"
],
"transaction_id": 10001
Expand Down Expand Up @@ -249,6 +250,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -265,6 +268,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -279,6 +284,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=false"
],
Expand All @@ -297,6 +304,8 @@
"server_name": "www.cloudflare-cache.com",
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=false"
],
Expand Down
7 changes: 7 additions & 0 deletions ...nipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
"resolver_address": "",
"t": 0,
"tags": [
"classic",
"depth=0"
],
"transaction_id": 10001
Expand Down Expand Up @@ -250,6 +251,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -266,6 +269,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -284,6 +289,8 @@
"server_name": "www.cloudflare-cache.com",
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand Down
7 changes: 7 additions & 0 deletions ...tdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
"resolver_address": "",
"t": 0,
"tags": [
"classic",
"depth=0"
],
"transaction_id": 10001
Expand Down Expand Up @@ -215,6 +216,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -231,6 +234,8 @@
},
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand All @@ -249,6 +254,8 @@
"server_name": "www.example.org",
"t": 0,
"tags": [
"classic",
"tcptls_experiment",
"depth=0",
"fetch_body=true"
],
Expand Down
Loading
Loading