Bug 1666676 - Use fully-qualified names for all lookups performed by DoH heuristics. r=valentin

Differential Revision: https://phabricator.services.mozilla.com/D91091
This commit is contained in:
Nihanth Subramanya 2020-09-23 06:36:10 +00:00
Родитель 3dad2d6583
Коммит d75995e17b
2 изменённых файлов: 19 добавлений и 13 удалений

Просмотреть файл

@ -43,7 +43,7 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/Preferences.jsm" "resource://gre/modules/Preferences.jsm"
); );
const GLOBAL_CANARY = "use-application-dns.net"; const GLOBAL_CANARY = "use-application-dns.net.";
const NXDOMAIN_ERR = "NS_ERROR_UNKNOWN_HOST"; const NXDOMAIN_ERR = "NS_ERROR_UNKNOWN_HOST";
@ -261,19 +261,19 @@ async function safeSearch() {
const providerList = [ const providerList = [
{ {
name: "google", name: "google",
unfiltered: ["www.google.com", "google.com"], unfiltered: ["www.google.com.", "google.com."],
safeSearch: ["forcesafesearch.google.com"], safeSearch: ["forcesafesearch.google.com."],
}, },
{ {
name: "youtube", name: "youtube",
unfiltered: [ unfiltered: [
"www.youtube.com", "www.youtube.com.",
"m.youtube.com", "m.youtube.com.",
"youtubei.googleapis.com", "youtubei.googleapis.com.",
"youtube.googleapis.com", "youtube.googleapis.com.",
"www.youtube-nocookie.com", "www.youtube-nocookie.com.",
], ],
safeSearch: ["restrict.youtube.com", "restrictmoderate.youtube.com"], safeSearch: ["restrict.youtube.com.", "restrictmoderate.youtube.com."],
}, },
]; ];
@ -300,7 +300,7 @@ async function safeSearch() {
} }
async function zscalerCanary() { async function zscalerCanary() {
const ZSCALER_CANARY = "sitereview.zscaler.com"; const ZSCALER_CANARY = "sitereview.zscaler.com.";
let { addresses } = await dnsLookup(ZSCALER_CANARY); let { addresses } = await dnsLookup(ZSCALER_CANARY);
for (let address of addresses) { for (let address of addresses) {
@ -355,7 +355,7 @@ async function providerSteering() {
if (!Preferences.get(kProviderSteeringEnabledPref, false)) { if (!Preferences.get(kProviderSteeringEnabledPref, false)) {
return null; return null;
} }
const TEST_DOMAIN = "doh.test"; const TEST_DOMAIN = "doh.test.";
// Array of { name, canonicalName, uri } where name is an identifier for // Array of { name, canonicalName, uri } where name is an identifier for
// telemetry, canonicalName is the expected CNAME when looking up doh.test, // telemetry, canonicalName is the expected CNAME when looking up doh.test,

Просмотреть файл

@ -68,7 +68,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
this, this,
"kCanonicalDomain", "kCanonicalDomain",
"doh-rollout.trrRace.canonicalDomain", "doh-rollout.trrRace.canonicalDomain",
"firefox-dns-perf-test.net" "firefox-dns-perf-test.net."
); );
// The number of random subdomains to resolve per TRR. // The number of random subdomains to resolve per TRR.
@ -89,7 +89,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
val => val =>
val val
? val.split(",").map(t => t.trim()) ? val.split(",").map(t => t.trim())
: ["google.com", "youtube.com", "amazon.com", "facebook.com", "yahoo.com"] : [
"google.com.",
"youtube.com.",
"amazon.com.",
"facebook.com.",
"yahoo.com.",
]
); );
function getRandomSubdomain() { function getRandomSubdomain() {