Bug 1555425 - Enable Web Authentication in all Fennec Android channels r=cpeterson,KevinJacobs
authorJ.C. Jones <jjones@mozilla.com>
Mon, 03 Jun 2019 17:51:57 +0000
changeset 536709 8bcbe8270b3163eb14166999380ab8bc78a4a0dc
parent 536708 d30ab202769480befac1a1f9113dec90a009ed51
child 536710 04b522a4349d40ef2213043301e83f309c7cfe07
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpeterson, KevinJacobs
bugs1555425
milestone68.0
Bug 1555425 - Enable Web Authentication in all Fennec Android channels r=cpeterson,KevinJacobs Disable for Geckoview, but enable for Fennec. Differential Revision: https://phabricator.services.mozilla.com/D33050
mobile/android/app/geckoview-prefs.js
mobile/android/app/mobile.js
security/manager/ssl/security-prefs.js
--- a/mobile/android/app/geckoview-prefs.js
+++ b/mobile/android/app/geckoview-prefs.js
@@ -51,8 +51,11 @@ pref("browser.safebrowsing.features.trac
 
 // Enable cryptomining protection blocklist updates
 pref("browser.safebrowsing.features.cryptomining.update", true);
 // Enable fingerprinting protection blocklist updates
 pref("browser.safebrowsing.features.fingerprinting.update", true);
 
 // Treat mouse as touch only on TV-ish devices
 pref("ui.android.mouse_as_touch", 2);
+
+// Fenix is currently not whitelisted for Web Authentication
+pref("security.webauth.webauthn_enable_android_fido2", false);
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -856,8 +856,12 @@ pref("media.navigator.permission.device"
 
 // Allow system add-on updates
 pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
 
 // E10s stuff. We don't support 'file' or 'priveleged' process types.
 pref("browser.tabs.remote.separateFileUriProcess", false);
 pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", true);
 pref("browser.tabs.remote.separatePrivilegedContentProcess", false);
+
+// Allow Web Authentication
+pref("security.webauth.webauthn_enable_android_fido2", true);
+
--- a/security/manager/ssl/security-prefs.js
+++ b/security/manager/ssl/security-prefs.js
@@ -124,25 +124,20 @@ pref("security.webauth.webauthn", true);
 // No way to enable on Android, Bug 1552602
 pref("security.webauth.u2f", false);
 #else
 pref("security.webauth.u2f", true);
 #endif
 
 // Only one of ["enable_softtoken", "enable_usbtoken",
 // "webauthn_enable_android_fido2"] should be true at a time, as the
-// softtoken will override the other two.
+// softtoken will override the other two. Note android's pref is set in
+// mobile.js / geckoview-prefs.js
 pref("security.webauth.webauthn_enable_softtoken", false);
 
-#ifdef FENNEC_NIGHTLY
-pref("security.webauth.webauthn_enable_android_fido2", true);
-#else
-pref("security.webauth.webauthn_enable_android_fido2", false);
-#endif
-
 #ifdef MOZ_WIDGET_ANDROID
 // the Rust usbtoken support does not function on Android
 pref("security.webauth.webauthn_enable_usbtoken", false);
 #else
 pref("security.webauth.webauthn_enable_usbtoken", true);
 #endif
 
 pref("security.ssl.errorReporting.enabled", true);