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

Change Oblivious DNS over HTTP to Oblivious DNS over HTTPS #3406

Closed
wants to merge 3 commits into from
Closed
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
6 changes: 3 additions & 3 deletions netwerk/dns/TRRService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ constexpr nsLiteralCString kTRRDomains[3][7] = {
"private.canadianshield.cira.ca"_ns,
"doh.xfinity.com"_ns, // Steered clients
"dns.shaw.ca"_ns, // Steered clients
"dooh.cloudflare-dns.com"_ns, // DNS over Oblivious HTTP
"dooh.cloudflare-dns.com"_ns, // DNS over Oblivious HTTPS
},
{
"(other)_2"_ns,
Expand All @@ -64,7 +64,7 @@ constexpr nsLiteralCString kTRRDomains[3][7] = {
"private.canadianshield.cira.ca_2"_ns,
"doh.xfinity.com_2"_ns, // Steered clients
"dns.shaw.ca_2"_ns, // Steered clients
"dooh.cloudflare-dns.com_2"_ns, // DNS over Oblivious HTTP
"dooh.cloudflare-dns.com_2"_ns, // DNS over Oblivious HTTPS
},
{
"(other)_3"_ns,
Expand All @@ -73,7 +73,7 @@ constexpr nsLiteralCString kTRRDomains[3][7] = {
"private.canadianshield.cira.ca_3"_ns,
"doh.xfinity.com_3"_ns, // Steered clients
"dns.shaw.ca_3"_ns, // Steered clients
"dooh.cloudflare-dns.com_3"_ns, // DNS over Oblivious HTTP
"dooh.cloudflare-dns.com_3"_ns, // DNS over Oblivious HTTPS
},
// clang-format on
};
Expand Down
10 changes: 5 additions & 5 deletions toolkit/components/nimbus/FeatureManifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1228,20 +1228,20 @@ dohPrefs:
setPref: "network.trr_ui.show_fallback_warning_option"

dooh:
description: "DNS over Oblivious HTTP"
description: "DNS over Oblivious HTTPS"
owner: [email protected]
hasExposure: false
variables:
ohttpEnabled:
description: Whether to use Oblivious HTTP for the resolution
description: Whether to use Oblivious HTTPS for the resolution
type: boolean
setPref: "network.trr.use_ohttp"
ohttpRelayUri:
description: The URL of the Oblivious HTTP relay
description: The URL of the Oblivious HTTPS relay
type: string
setPref: "network.trr.ohttp.relay_uri"
ohttpConfigUri:
description: The URL used to fetch the configuration of the Oblivious HTTP gateway
description: The URL used to fetch the configuration of the Oblivious HTTPS gateway
type: string
setPref: "network.trr.ohttp.config_uri"
ohttpUri:
Expand Down Expand Up @@ -1561,4 +1561,4 @@ opaqueResponseBlocking:
description: >-
If we partially or wholly allow audio and video MIME types in conflict with spec.
type: int
setPref: "browser.opaqueResponseBlocking.mediaExceptionsStrategy"
setPref: "browser.opaqueResponseBlocking.mediaExceptionsStrategy"
4 changes: 2 additions & 2 deletions waterfox/browser/locales/en-US/waterfox.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ load-images =
enable-javascript =
.label = Enable JavaScript
enable-dooh =
.label = Use DNS over Oblivious HTTP
.label = Use DNS over Oblivious HTTPS
webrtc-header = WebRTC peer connection
ref-header = HTTP Referrer Header
### Look & Feel
Expand Down Expand Up @@ -262,4 +262,4 @@ telemetry-privacy-policy = Privacy Policy
onboarding-grassroots-title = Supporting the grassroots
onboarding-grassroots-subtitle = Thank you for using Waterfox, an independent, grassroots browser. With your support, we’re building a sustainable alternative to the big players out there.

tabbrowser-confirm-session-restore-checkbox = Open previous windows and tabs
tabbrowser-confirm-session-restore-checkbox = Open previous windows and tabs
Loading