From d078e1a9056c593985b56030e481706e38c49a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Thu, 21 Nov 2024 09:45:42 +0100
Subject: [PATCH] Simplify the dnscheck list (#1656)

Trim down the dnscheck list.

Keep only 2 addresses per providers (http3 enabled and not), since
measuring the ads or malware blocking endpoints is less important (we
only query example.com). The main difference for the malware blocking
endpoints would be that the SNI is different, but we can probably
generate similar telemetry without doing a full DoH measurement.

---------

Co-authored-by: decfox <mehul@openobservatory.org>
---
 internal/experiment/dnscheck/richerinput.go | 105 ++++++++++++++++++++
 1 file changed, 105 insertions(+)

diff --git a/internal/experiment/dnscheck/richerinput.go b/internal/experiment/dnscheck/richerinput.go
index 51d848844..56d17e3cc 100644
--- a/internal/experiment/dnscheck/richerinput.go
+++ b/internal/experiment/dnscheck/richerinput.go
@@ -97,6 +97,111 @@ func (tl *targetLoader) Load(ctx context.Context) ([]model.ExperimentTarget, err
 }
 
 var defaultInput = []model.ExperimentTarget{
+	//
+	// https://dns.google/dns-query
+	//
+	// Measure HTTP/3 first and then HTTP/2 (see https://github.com/ooni/probe/issues/2675).
+	//
+	// Make sure we include the typical IP addresses for the domain.
+	//
+	&Target{
+		URL: "https://dns.google/dns-query",
+		Config: &Config{
+			HTTP3Enabled: true,
+			DefaultAddrs: "8.8.8.8 8.8.4.4",
+		},
+	},
+	&Target{
+		URL: "https://dns.google/dns-query",
+		Config: &Config{
+			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{},
+	},
+}
+
+// extendedInput is an extended input target list for dnscheck.
+// TODO(decfox): we should have a flag to return the extended list in special cases
+// while using the default list for normal runs.
+//
+//lint:ignore U1000 ignore unused var
+var extendedInput = []model.ExperimentTarget{
 	//
 	// https://dns.google/dns-query
 	//