Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1443489 - TRR: require a pref set to allow early AAAA responses r=valentin

Browse Source 
Early AAAA responses might cause issues on hosts without working native
IPv6 connectivity, of course especially notable in TRR-only mode.

MozReview-Commit-ID: 6ZqE6AKnucH

--HG--
extra : rebase_source : ff42cb8daf941a3fa1f7e783c76d823e879024c3
This commit is contained in:
Daniel Stenberg 2018-03-06 16:07:29 +01:00
parent f28a1ed092
commit 80c6547919
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/libpref/init/all.js
View File

@ -5491,6 +5491,8 @@ pref("network.trr.bootstrapAddress", "");
pref("network.trr.blacklist-duration", 259200); pref("network.trr.blacklist-duration", 259200);
// Single TRR request timeout, in milliseconds // Single TRR request timeout, in milliseconds
pref("network.trr.request-timeout", 3000); pref("network.trr.request-timeout", 3000);
// Allow AAAA entries to be used "early", before the A results are in
pref("network.trr.early-AAAA", false);
pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt"); pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt");
pref("captivedetect.canonicalContent", "success\n"); pref("captivedetect.canonicalContent", "success\n");

6
netwerk/dns/TRRService.cpp
View File

@ -188,6 +188,12 @@ TRRService::ReadPrefs(const char *name)
mTRRTimeout = ms; mTRRTimeout = ms;
} }
} }
if (!name || !strcmp(name, TRR_PREF("early-AAAA"))) {
bool tmp;
if (NS_SUCCEEDED(Preferences::GetBool(TRR_PREF("early-AAAA"), &tmp))) {
mEarlyAAAA = tmp;
}
}
return NS_OK; return NS_OK;
} }

2
netwerk/dns/TRRService.h
View File

@ -34,6 +34,7 @@ public:
uint32_t Mode() { return mMode; } uint32_t Mode() { return mMode; }
bool AllowRFC1918() { return mRfc1918; } bool AllowRFC1918() { return mRfc1918; }
bool UseGET() { return mUseGET; } bool UseGET() { return mUseGET; }
bool EarlyAAAA() { return mEarlyAAAA; }
nsresult GetURI(nsCString &result); nsresult GetURI(nsCString &result);
nsresult GetCredentials(nsCString &result); nsresult GetCredentials(nsCString &result);
uint32_t GetRequestTimeout() { return mTRRTimeout; } uint32_t GetRequestTimeout() { return mTRRTimeout; }
@ -65,6 +66,7 @@ private:
Atomic<bool, Relaxed> mRfc1918; // okay with local IP addresses in DOH responses? Atomic<bool, Relaxed> mRfc1918; // okay with local IP addresses in DOH responses?
Atomic<bool, Relaxed> mCaptiveIsPassed; // set when captive portal check is passed Atomic<bool, Relaxed> mCaptiveIsPassed; // set when captive portal check is passed
Atomic<bool, Relaxed> mUseGET; // do DOH using GET requests (instead of POST) Atomic<bool, Relaxed> mUseGET; // do DOH using GET requests (instead of POST)
Atomic<bool, Relaxed> mEarlyAAAA; // allow use of AAAA results before A is in
// TRR Blacklist storage // TRR Blacklist storage
RefPtr<DataStorage> mTRRBLStorage; RefPtr<DataStorage> mTRRBLStorage;

7
netwerk/dns/nsHostResolver.cpp
View File

@ -1527,6 +1527,13 @@ nsHostResolver::CompleteLookup(nsHostRecord* rec, nsresult status, AddrInfo* aNe
return LOOKUP_OK; return LOOKUP_OK;
} }
if (rec->mTrrA && (!gTRRService || !gTRRService->EarlyAAAA())) {
// This is an early AAAA with a pending A response. Allowed
// only by pref.
LOG(("CompleteLookup: avoiding early use of TRR AAAA!\n"));
return LOOKUP_OK;
}
// we can do some callbacks with this partial result which requires // we can do some callbacks with this partial result which requires
// a deep copy // a deep copy
newRRSet = new AddrInfo(rec->mFirstTRR); newRRSet = new AddrInfo(rec->mFirstTRR);