From d236ea2cfbabd9c21689c8bccc91e5c55be4d5b8 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 24 May 2022 23:20:23 -0700
Subject: [PATCH] Fiddle with firefox welcome screen disabling again

The new way isn't working, so put the old way back but change it
to use user_pref instead of pref to see if that helps, and upload
the files for checking.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 lib/utils.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/utils.pm b/lib/utils.pm
index 68ea0ca5..1831803c 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -419,6 +419,17 @@ sub disable_firefox_studies {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=1703903
     assert_script_run 'mkdir -p $(rpm --eval %_libdir)/firefox/distribution';
     assert_script_run 'printf \'{"policies": {"DisableFirefoxStudies": true, "OfferToSaveLogins": false, "OverrideFirstRunPage": "", "OverridePostUpdatePage": ""}}\' > $(rpm --eval %_libdir)/firefox/distribution/policies.json';
+    assert_script_run 'mkdir -p $(rpm --eval %_libdir)/firefox/browser/defaults/preferences';
+    # it's not at all clear from the code which of these actually gets
+    # used, so we set them all just in case
+    assert_script_run 'printf "user_pref(\'browser.urlbar.quicksuggest.shouldShowOnboardingDialog\', false);\nuser_pref(\'quickSuggestShouldShowOnboardingDialog\', false);\nuser_pref(\'browser.urlbar.quickSuggestShouldShowOnboardingDialog\', false);\n" > $(rpm --eval %_libdir)/firefox/browser/defaults/preferences/openqa-overrides.js';
+    # and disable the "Automated Cookie Protection" thing that showed
+    # up in Firefox 100 (thanks Ed Lee):
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1703903#c9
+    assert_script_run 'echo "pref(\'privacy.restrict3rdpartystorage.rollout.enabledByDefault\', false);" >> $(rpm --eval %_libdir)/firefox/browser/defaults/preferences/openqa-overrides.js';
+    # for debugging
+    upload_logs "/usr/lib64/firefox/browser/defaults/preferences/openqa-overrides.js", failok=>1;
+    upload_logs "/usr/lib64/firefox/distribution/policies.json", failok=>1;
 }
 
 sub repos_mirrorlist {