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.

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

feat(dnscheck): add resolver urls for trust anchor change testing #1667

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion internal/experiment/dnscheck/dnscheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (m *Measurer) Run(ctx context.Context, args *model.ExperimentArgs) error {
return fmt.Errorf("%w: %s", ErrInvalidURL, err.Error())
}
switch URL.Scheme {
case "https", "dot", "udp", "tcp":
case "https", "dot", "udp", "tcp", "system":
// all good
default:
return ErrUnsupportedURLScheme
Expand Down
21 changes: 21 additions & 0 deletions internal/experiment/dnscheck/richerinput.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,27 @@ var defaultInput = []model.ExperimentTarget{
URL: "https://dns.switch.ch/dns-query",
Config: &Config{},
},
&Target{
URL: "https://root-key-sentinel-is-ta-38696.d2a8n3.rootcanary.net",
Config: &Config{},
},
&Target{
URL: "https://root-key-sentinel-not-ta-38696.d2a8n3.rootcanary.net",
Config: &Config{},
},
&Target{
URL: "https://root-key-sentinel-not-ta-20326.d2a8n3.rootcanary.net",
Config: &Config{},
},

&Target{
URL: "https://root-key-sentinel-is-ta-20326.d2a8n3.rootcanary.net",
Config: &Config{},
},
&Target{
URL: "https://bogus.d2a8n1.rootcanary.net",
Config: &Config{},
},
}

// extendedInput is an extended input target list for dnscheck.
Expand Down
78 changes: 77 additions & 1 deletion internal/experiment/dnscheck/richerinput_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,83 @@ var testDefaultInput = []model.ExperimentTarget{
DefaultAddrs: "8.8.8.8 8.8.4.4",
},
},
&Target{
URL: "https://cloudflare-dns.com/dns-query",
Config: &Config{
HTTP3Enabled: true,
DefaultAddrs: "1.1.1.1 1.0.0.1",
},
},
&Target{
URL: "https://cloudflare-dns.com/dns-query",
Config: &Config{
DefaultAddrs: "1.1.1.1 1.0.0.1",
},
},
&Target{
URL: "https://dns.quad9.net/dns-query",
Config: &Config{
HTTP3Enabled: true,
DefaultAddrs: "9.9.9.9",
},
},
&Target{
URL: "https://dns.quad9.net/dns-query",
Config: &Config{
DefaultAddrs: "9.9.9.9",
},
},
&Target{
URL: "https://dns.adguard.com/dns-query",
Config: &Config{
HTTP3Enabled: true,
},
},
&Target{
URL: "https://dns.adguard.com/dns-query",
Config: &Config{},
},
&Target{
URL: "https://dns.alidns.com/dns-query",
Config: &Config{
HTTP3Enabled: true,
},
},
&Target{
URL: "https://dns.alidns.com/dns-query",
Config: &Config{},
},
&Target{
URL: "https://doh.opendns.com/dns-query",
Config: &Config{
HTTP3Enabled: true,
},
},
&Target{
URL: "https://doh.opendns.com/dns-query",
Config: &Config{},
},
&Target{
URL: "https://dns.nextdns.io/dns-query",
Config: &Config{
HTTP3Enabled: true,
},
},
&Target{
URL: "https://dns.nextdns.io/dns-query",
Config: &Config{},
},

&Target{
URL: "https://dns.switch.ch/dns-query",
Config: &Config{
HTTP3Enabled: true,
},
},
&Target{
URL: "https://dns.switch.ch/dns-query",
Config: &Config{},
},
}

func TestTargetLoaderLoad(t *testing.T) {
Expand Down Expand Up @@ -269,7 +346,6 @@ func TestTargetLoaderLoad(t *testing.T) {
expectErr: nil,
expectTargets: nil,
},

{
name: "with no options, not inputs, no files",
options: &Config{},
Expand Down
Loading