Bug 1433500 - detectportal.firefox.com should return something informative for users r=nhnt11
☠☠ backed out by b532729e3b07 ☠ ☠
authorValentin Gosu <valentin.gosu@gmail.com>
Fri, 26 Mar 2021 10:41:10 +0000
changeset 573253 153bb20062aa8b943cd37988723942ecd9ae35f2
parent 573252 cd8358587fa49ecacbfabc6341b62b907deae419
child 573254 20a40c928ef343104e7a3ccd59aff0e4422c2724
push id139556
push uservalentin.gosu@gmail.com
push dateFri, 26 Mar 2021 10:43:35 +0000
treeherderautoland@153bb20062aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnhnt11
bugs1433500
milestone89.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1433500 - detectportal.firefox.com should return something informative for users r=nhnt11 This change constitutes a way we can redirect users to an actual page that explains what captive portals are and why we are making these requests. Normally users should not see this page, as we only compare the contents of a small html file. The meta redirect only happens when loaded in a page. The SUMO URL https://support.mozilla.org/kb/captive-portal will automatically redirect to the appropriate locale. Differential Revision: https://phabricator.services.mozilla.com/D99773
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4005,18 +4005,18 @@ pref("network.trr.confirmationNS", "exam
 pref("network.trr.bootstrapAddress", "");
 // TRR blacklist entry expire time (in seconds). Default is one minute.
 // Meant to survive basically a page load.
 pref("network.trr.blacklist-duration", 60);
 // Comma separated list of domains that we should not use TRR for
 pref("network.trr.excluded-domains", "");
 pref("network.trr.builtin-excluded-domains", "localhost,local");
 
-pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/success.txt");
-pref("captivedetect.canonicalContent", "success\n");
+pref("captivedetect.canonicalURL", "http://detectportal.firefox.com/canonical.html");
+pref("captivedetect.canonicalContent", "<meta http-equiv=\"refresh\" content=\"0;url=https://support.mozilla.org/kb/captive-portal\"/>");
 pref("captivedetect.maxWaitingTime", 5000);
 pref("captivedetect.pollingTime", 3000);
 pref("captivedetect.maxRetryCount", 5);
 
 // The tables used for Safebrowsing phishing and malware checks
 pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,moztest-harmful-simple,moztest-malware-simple,moztest-unwanted-simple");
 #ifdef MOZILLA_OFFICIAL
   // In official builds, we are allowed to use Google's private phishing