Skip to content

Bug 2012667 - Null out prefs that reference Mozilla servers #467

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.

Sign up for GitHub

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

Merged
gcp merged 6 commits into from
Mar 11, 2026
Merged

Bug 2012667 - Null out prefs that reference Mozilla servers #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a1ae3a
Bug 2012081 - Null out prefs that reference Mozilla servers
gcp Feb 21, 2026
3a6a0e0
Bug 2012081 - Fix LoginBreaches for empty breachAlertUrl pref
gcp Feb 21, 2026
8756dde
Bug 2012081 - Fix IPProtection test for empty guardian endpoint pref
gcp Mar 5, 2026
9438d29
Bug 2012081 - Fix ContextId test for empty unifiedAds endpoint pref
gcp Mar 5, 2026
b4cafff
Bug 2012081 - Restore info/support URL prefs that are just help links
gcp Mar 5, 2026
7d8d11a
Address review comments.
gcp Mar 10, 2026
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
108 changes: 108 additions & 0 deletions browser/app/profile/firefox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,11 @@ pref("lightweightThemes.getMoreURL", "https://addons.mozilla.org/%LOCALE%/firefo
// UI tour experience.
pref("browser.uitour.enabled", true);
pref("browser.uitour.loglevel", "Error");
#ifdef MOZ_ENTERPRISE
pref("browser.uitour.url", "");
#else
pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
#endif
// How long to show a Hearbeat survey (two hours, in seconds)
pref("browser.uitour.surveyDuration", 7200);

Expand Down Expand Up @@ -667,7 +671,11 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false);
pref("browser.urlbar.groupLabels.enabled", true);

// The Merino endpoint URL, not including parameters.
#ifdef MOZ_ENTERPRISE
pref("browser.urlbar.merino.endpointURL", "");
#else
pref("browser.urlbar.merino.endpointURL", "https://merino.services.mozilla.com/api/v1/suggest");
#endif

// OHTTP config URL for Merino requests
pref("browser.urlbar.merino.ohttpConfigURL", "https://ohttp-gateway-merino.services.mozilla.com/ohttp-configs");
Expand Down Expand Up @@ -1561,17 +1569,29 @@ pref("browser.zoom.full", true);
pref("browser.zoom.updateBackgroundTabs", true);

// The breakpad report server to link to in about:crashes
#ifdef MOZ_ENTERPRISE
pref("breakpad.reportURL", "");
#else
pref("breakpad.reportURL", "https://crash-stats.mozilla.org/report/index/");
#endif

// URL for "Learn More" for DataCollection
#ifdef MOZ_ENTERPRISE
pref("toolkit.datacollection.infoURL", "");
#else
pref("toolkit.datacollection.infoURL",
Comment on lines +1579 to 1582
Copy link
Copy Markdown
Contributor

@fiji-flo fiji-flo Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know it this creates a dead link for "Learn More" for DataCollection

Copy link
Copy Markdown
Contributor Author

@gcp gcp Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presumably our old page there isn't relevant anyway?

Copy link
Copy Markdown
Contributor Author

@gcp gcp Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bsmth We'd need some kind of replacement for https://www.mozilla.org/en-US/privacy/firefox/ I guess?

Copy link
Copy Markdown

@bsmth bsmth Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we'll need to replace this indeed, thanks for flagging.

"https://www.mozilla.org/legal/privacy/firefox.html");
#endif

// base URL for web-based support pages
pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");

// base url for web-based feedback pages
#ifdef MOZ_ENTERPRISE
pref("app.feedback.baseURL", "");
#else
pref("app.feedback.baseURL", "https://ideas.mozilla.org/");
#endif

pref("security.certerrors.permanentOverride", true);
pref("security.certerrors.mitm.priming.enabled", true);
Expand Down Expand Up @@ -1842,11 +1862,19 @@ pref("browser.topsites.component.enabled", false);
pref("browser.topsites.useRemoteSetting", true);
// Fetch sponsored Top Sites from Mozilla Tiles Service (Contile)
pref("browser.topsites.contile.enabled", true);
#ifdef MOZ_ENTERPRISE
pref("browser.topsites.contile.endpoint", "");
#else
pref("browser.topsites.contile.endpoint", "https://contile.services.mozilla.com/v1/tiles");
#endif

// The base URL for the Quick Suggest anonymizing proxy. To make a request to
// the proxy, include a campaign ID in the path.
#ifdef MOZ_ENTERPRISE
pref("browser.partnerlink.attributionURL", "");
#else
pref("browser.partnerlink.attributionURL", "https://topsites.services.mozilla.com/cid/");
#endif
pref("browser.partnerlink.campaign.topsites", "amzn_2020_a1");

// Activates preloading of the new tab url.
Expand Down Expand Up @@ -1888,9 +1916,15 @@ pref("browser.newtabpage.activity-stream.mobileDownloadModal.variant-b", false);
pref("browser.newtabpage.activity-stream.mobileDownloadModal.variant-c", false);

// Mozilla Ad Routing Service (MARS) unified ads service
#ifdef MOZ_ENTERPRISE
pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", false);
pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", false);
pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "");
#else
pref("browser.newtabpage.activity-stream.unifiedAds.tiles.enabled", true);
pref("browser.newtabpage.activity-stream.unifiedAds.spocs.enabled", true);
pref("browser.newtabpage.activity-stream.unifiedAds.endpoint", "https://ads.mozilla.org/");
#endif
pref("browser.newtabpage.activity-stream.unifiedAds.adsFeed.enabled", false);
#ifdef NIGHTLY_BUILD
pref("browser.newtabpage.activity-stream.unifiedAds.ohttp.enabled", true);
Expand Down Expand Up @@ -1947,7 +1981,11 @@ pref("browser.newtabpage.activity-stream.newNewtabExperience.colors", "#004CA4,#
#endif

// The remote FxA root content URL for the Activity Stream firstrun page.
#ifdef MOZ_ENTERPRISE
pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "");
#else
pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", "https://accounts.firefox.com/");
#endif

// The pref that controls if the search shortcuts experiment is on
pref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts", true);
Expand Down Expand Up @@ -2057,7 +2095,11 @@ pref("browser.newtabpage.activity-stream.discoverystream.sections.contextualAds.
// List of locales for contextual ads.
pref("browser.newtabpage.activity-stream.discoverystream.sections.contextualAds.locale-config", "en-US,en-GB,en-CA");

#ifdef MOZ_ENTERPRISE
pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.endpoint", "");
#else
pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.endpoint", "merino.services.mozilla.com");
#endif
pref("browser.newtabpage.activity-stream.discoverystream.merino-provider.ohttp.enabled", false);
pref("browser.newtabpage.activity-stream.discoverystream.ohttp.relayURL", "https://mozilla-ohttp.fastly-edge.com/");
pref("browser.newtabpage.activity-stream.discoverystream.ohttp.configURL", "https://prod.ohttp-gateway.prod.webservices.mozgcp.net/ohttp-configs");
Expand Down Expand Up @@ -2303,25 +2345,49 @@ pref("browser.uiCustomization.state", "");
pref("identity.fxaccounts.enabled", true);

// The remote FxA root content URL. Must use HTTPS.
#ifdef MOZ_ENTERPRISE
pref("identity.fxaccounts.remote.root", "");
#else
pref("identity.fxaccounts.remote.root", "https://accounts.firefox.com/");
#endif

// The value of the context query parameter passed in fxa requests.
pref("identity.fxaccounts.contextParam", "oauth_webchannel_v1");

// The remote URL of the FxA Profile Server
#ifdef MOZ_ENTERPRISE
pref("identity.fxaccounts.remote.profile.uri", "");
#else
pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox.com/v1");
#endif

// The remote URL of the FxA OAuth Server
#ifdef MOZ_ENTERPRISE
pref("identity.fxaccounts.remote.oauth.uri", "");
#else
pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com/v1");
#endif

// Whether FxA pairing using QR codes is enabled.
#ifdef MOZ_ENTERPRISE
pref("identity.fxaccounts.pairing.enabled", false);
#else
pref("identity.fxaccounts.pairing.enabled", true);
Comment thread
gcp marked this conversation as resolved.
#endif

// The remote URI of the FxA pairing server
#ifdef MOZ_ENTERPRISE
pref("identity.fxaccounts.remote.pairing.uri", "");
#else
pref("identity.fxaccounts.remote.pairing.uri", "wss://channelserver.services.mozilla.com");
#endif

// Token server used by the FxA Sync identity.
#ifdef MOZ_ENTERPRISE
pref("identity.sync.tokenserver.uri", "");
#else
pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sync/1.5");
#endif

// Auto-config URL for FxA self-hosters, makes an HTTP request to
// [identity.fxaccounts.autoconfig.uri]/.well-known/fxa-client-configuration
Expand All @@ -2334,8 +2400,13 @@ pref("identity.sendtabpromo.url", "https://support.mozilla.org/1/firefox/%VERSIO

// URLs for promo links to mobile browsers. Note that consumers are expected to
// append a value for utm_campaign.
#ifdef MOZ_ENTERPRISE
pref("identity.mobilepromo.android", "");
pref("identity.mobilepromo.ios", "");
Comment thread
gcp marked this conversation as resolved.
#else
pref("identity.mobilepromo.android", "https://www.mozilla.org/firefox/android/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
pref("identity.mobilepromo.ios", "https://www.mozilla.org/firefox/ios/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=");
#endif

// How often should we try to fetch missed FxA commands on sync (in seconds).
// Default is 24 hours.
Expand Down Expand Up @@ -2577,6 +2648,22 @@ pref("browser.promo.cookiebanners.enabled", false);
pref("browser.contentblocking.report.hide_vpn_banner", false);
pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA");

#ifdef MOZ_ENTERPRISE
pref("browser.contentblocking.report.monitor.url", "");
pref("browser.contentblocking.report.monitor.how_it_works.url", "");
pref("browser.contentblocking.report.monitor.sign_in_url", "");
pref("browser.contentblocking.report.monitor.preferences_url", "");
pref("browser.contentblocking.report.monitor.home_page_url", "");
pref("browser.contentblocking.report.manage_devices.url", "");
pref("browser.contentblocking.report.endpoint_url", "");
pref("browser.contentblocking.report.proxy_extension.url", "");
pref("browser.contentblocking.report.mobile-ios.url", "");
pref("browser.contentblocking.report.mobile-android.url", "");
pref("browser.contentblocking.report.vpn.url", "");
pref("browser.contentblocking.report.vpn-promo.url", "");
pref("browser.contentblocking.report.vpn-android.url", "");
pref("browser.contentblocking.report.vpn-ios.url", "");
#else
pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections");
pref("browser.contentblocking.report.monitor.how_it_works.url", "https://monitor.firefox.com/about");
pref("browser.contentblocking.report.monitor.sign_in_url", "https://monitor.firefox.com/oauth/init?entrypoint=protection_report_monitor&utm_source=about-protections&email=");
Expand All @@ -2591,6 +2678,7 @@ pref("browser.contentblocking.report.vpn.url", "https://vpn.mozilla.org/?utm_sou
pref("browser.contentblocking.report.vpn-promo.url", "https://vpn.mozilla.org/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=about-protections-top-promo");
pref("browser.contentblocking.report.vpn-android.url", "https://play.google.com/store/apps/details?id=org.mozilla.firefox.vpn&referrer=utm_source%3Dfirefox-browser%26utm_medium%3Dfirefox-browser%26utm_campaign%3Dabout-protections-mobile-vpn%26anid%3D--");
pref("browser.contentblocking.report.vpn-ios.url", "https://apps.apple.com/us/app/firefox-private-network-vpn/id1489407738");
#endif

// Protection Report's SUMO urls
pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report");
Expand Down Expand Up @@ -2790,8 +2878,12 @@ pref("extensions.formautofill.creditCards.os-auth.locked.enabled", false);
// The utm_creative value is appended within the code (specific to the location on
// where it is clicked). Be sure that if these two prefs are updated, that
// the utm_creative param be last.
#ifdef MOZ_ENTERPRISE
pref("signon.management.page.breachAlertUrl", "");
#else
pref("signon.management.page.breachAlertUrl",
"https://monitor.firefox.com/breach-details/");
#endif
pref("signon.passwordEditCapture.enabled", true);
pref("signon.relatedRealms.enabled", false);
pref("signon.showAutoCompleteFooter", true);
Expand Down Expand Up @@ -2850,13 +2942,21 @@ pref("doh-rollout.clearModeOnShutdown", false);
pref("network.trr_ui.fallback_was_checked", true);

// Normandy client preferences
#ifdef MOZ_ENTERPRISE
pref("app.normandy.api_url", "");
#else
pref("app.normandy.api_url", "https://normandy.cdn.mozilla.net/api/v1");
#endif
pref("app.normandy.dev_mode", false);
pref("app.normandy.enabled", true);
pref("app.normandy.first_run", true);
pref("app.normandy.logging.level", 50); // Warn
pref("app.normandy.run_interval_seconds", 21600); // 6 hours
#ifdef MOZ_ENTERPRISE
pref("app.normandy.shieldLearnMoreUrl", "");
#else
pref("app.normandy.shieldLearnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/shield");
#endif
pref("app.normandy.last_seen_buildid", "");
pref("app.normandy.onsync_skew_sec", 600);
#ifdef MOZ_DATA_REPORTING
Expand Down Expand Up @@ -2893,7 +2993,11 @@ pref("app.normandy.onsync_skew_sec", 600);

// Coverage ping is disabled by default.
pref("toolkit.coverage.enabled", false);
#ifdef MOZ_ENTERPRISE
pref("toolkit.coverage.endpoint.base", "");
#else
pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
#endif

// Discovery prefs
pref("browser.discovery.enabled", true);
Expand Down Expand Up @@ -3571,7 +3675,11 @@ pref("browser.ipProtection.features.siteExceptions", true);
// Pref to show confirmation hints for site exceptions
pref("browser.ipProtection.siteExceptionsHintsEnabled", true);
pref("browser.ipProtection.log", false);
#ifdef MOZ_ENTERPRISE
pref("browser.ipProtection.guardian.endpoint", "");
#else
pref("browser.ipProtection.guardian.endpoint", "https://vpn.mozilla.org/");
#endif
pref("browser.ipProtection.added", false);
// Pref to track whether the user has upgraded to Mozilla VPN
pref("browser.ipProtection.hasUpgraded", false);
Expand Down
2 changes: 2 additions & 0 deletions browser/branding/enterprise/pref/firefox-enterprise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ pref("browser.profiles.enabled", false);
pref("extensions.activeThemeID", "firefox-enterprise-light@mozilla.org");

pref("enterprise.loglevel", "Error");

pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
18 changes: 11 additions & 7 deletions browser/components/aboutlogins/LoginBreaches.sys.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ export const LoginBreaches = {
const BREACH_ALERT_URL = Services.prefs.getStringPref(
"signon.management.page.breachAlertUrl"
);
const baseBreachAlertURL = new URL(BREACH_ALERT_URL);
const baseBreachAlertURL = BREACH_ALERT_URL
? new URL(BREACH_ALERT_URL)
: null;

await Services.logins.initializationPromise;
const storageJSON = Services.logins.wrappedJSObject._storage;
Expand Down Expand Up @@ -111,12 +113,14 @@ export const LoginBreaches = {
continue;
}

let breachAlertURL = new URL(breach.Name, baseBreachAlertURL);
breachAlertURL.searchParams.set("utm_source", "firefox-desktop");
breachAlertURL.searchParams.set("utm_medium", "referral");
breachAlertURL.searchParams.set("utm_campaign", "about-logins");
breachAlertURL.searchParams.set("utm_content", "about-logins");
breach.breachAlertURL = breachAlertURL.href;
if (baseBreachAlertURL) {
let breachAlertURL = new URL(breach.Name, baseBreachAlertURL);
breachAlertURL.searchParams.set("utm_source", "firefox-desktop");
breachAlertURL.searchParams.set("utm_medium", "referral");
breachAlertURL.searchParams.set("utm_campaign", "about-logins");
breachAlertURL.searchParams.set("utm_content", "about-logins");
breach.breachAlertURL = breachAlertURL.href;
}
breachesByLoginGUID.set(login.guid, breach);
}
}
Expand Down
25 changes: 15 additions & 10 deletions browser/components/aboutlogins/tests/unit/test_getPotentialBreachesByLoginGUID.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const gBrowserGlue = Cc["@mozilla.org/browser/browserglue;1"].getService(
);

ChromeUtils.defineESModuleGetters(this, {
AppConstants: "resource://gre/modules/AppConstants.sys.mjs",
LoginBreaches: "resource:///modules/LoginBreaches.sys.mjs",
});

Expand Down Expand Up @@ -134,11 +135,13 @@ add_task(async function test_breachedLogin() {
1,
"Should be 1 breached login: " + BREACHED_LOGIN.origin
);
Assert.strictEqual(
breachesByLoginGUID.get(BREACHED_LOGIN.guid).breachAlertURL,
"https://monitor.firefox.com/breach-details/Breached?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-logins&utm_content=about-logins",
"Breach alert link should be equal to the breachAlertURL"
);
if (!AppConstants.MOZ_ENTERPRISE) {
Assert.strictEqual(
breachesByLoginGUID.get(BREACHED_LOGIN.guid).breachAlertURL,
"https://monitor.firefox.com/breach-details/Breached?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-logins&utm_content=about-logins",
"Breach alert link should be equal to the breachAlertURL"
);
}
});

add_task(async function test_breachedLoginAfterCrashingUriLogin() {
Expand All @@ -154,11 +157,13 @@ add_task(async function test_breachedLoginAfterCrashingUriLogin() {
1,
"Should be 1 breached login: " + BREACHED_LOGIN.origin
);
Assert.strictEqual(
breachesByLoginGUID.get(BREACHED_LOGIN.guid).breachAlertURL,
"https://monitor.firefox.com/breach-details/Breached?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-logins&utm_content=about-logins",
"Breach alert link should be equal to the breachAlertURL"
);
if (!AppConstants.MOZ_ENTERPRISE) {
Assert.strictEqual(
breachesByLoginGUID.get(BREACHED_LOGIN.guid).breachAlertURL,
"https://monitor.firefox.com/breach-details/Breached?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-logins&utm_content=about-logins",
"Breach alert link should be equal to the breachAlertURL"
);
}
});

add_task(async function test_notBreachedSubdomain() {
Expand Down
8 changes: 7 additions & 1 deletion browser/components/ipprotection/tests/xpcshell/test_IPProtectionService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ https://creativecommons.org/publicdomain/zero/1.0/ */

"use strict";

const { AppConstants } = ChromeUtils.importESModule(
"resource://gre/modules/AppConstants.sys.mjs"
);
const { AddonTestUtils } = ChromeUtils.importESModule(
"resource://testing-common/AddonTestUtils.sys.mjs"
);
Expand Down Expand Up @@ -219,9 +222,12 @@ add_task(async function test_guardian_endpoint_updates_on_reinit() {
await IPProtectionService.init();

let guardian1 = IPProtectionService.guardian;
let expectedEndpoint = AppConstants.MOZ_ENTERPRISE
? ""
: "https://vpn.mozilla.org/";
Assert.equal(
guardian1.guardianEndpoint,
"https://vpn.mozilla.org/",
expectedEndpoint,
"Initial guardian should have default endpoint"
);

Expand Down
Loading