Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1479857 - Use pref for Autoconfig on release, off by default r=kmag

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D2801

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Michael Kaply 2018-08-09 14:57:42 +00:00
parent 0c0e01d5f9
commit 63b4018555
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp
View File

@ -42,7 +42,7 @@ nsresult CentralizedAdminPrefManagerInit(bool aSandboxEnabled)
if (autoconfigSb.initialized())
return NS_OK;
sandboxEnabled = aSandboxEnabled || !strcmp(NS_STRINGIFY(MOZ_UPDATE_CHANNEL), "release");
sandboxEnabled = aSandboxEnabled;
// Grab XPConnect.
nsCOMPtr<nsIXPConnect> xpc = do_GetService(nsIXPConnect::GetCID(), &rv);

42
extensions/pref/autoconfig/src/nsReadConfig.cpp
View File

@ -8,6 +8,7 @@
#include "nsAppDirectoryServiceDefs.h"
#include "nsIAppStartup.h"
#include "nsContentUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "nsIAutoConfig.h"
#include "nsIComponentManager.h"
@ -24,7 +25,8 @@
#include "nsCRT.h"
#include "nspr.h"
#include "nsXULAppAPI.h"
#include "nsContentUtils.h"
extern bool sandboxEnabled;
extern mozilla::LazyLogModule MCD;
@ -95,14 +97,23 @@ NS_IMETHODIMP nsReadConfig::Observe(nsISupports *aSubject, const char *aTopic, c
if (!nsCRT::strcmp(aTopic, NS_PREFSERVICE_READ_TOPIC_ID)) {
rv = readConfigFile();
// Don't show error alerts if the sandbox is enabled
if (NS_FAILED(rv) && !sandboxEnabled) {
rv = DisplayError();
if (NS_FAILED(rv)) {
nsCOMPtr<nsIAppStartup> appStartup =
do_GetService(NS_APPSTARTUP_CONTRACTID);
if (appStartup)
appStartup->Quit(nsIAppStartup::eAttemptQuit);
// Don't show error alerts if the sandbox is enabled, just show
// sandbox warning.
if (NS_FAILED(rv)) {
if (sandboxEnabled) {
nsContentUtils::ReportToConsoleNonLocalized(
NS_LITERAL_STRING("Autoconfig is sandboxed by default. See https://www.mozilla.org/firefox/enterprise/releasenotes/ for more information."),
nsIScriptError::warningFlag,
NS_LITERAL_CSTRING("autoconfig"),
nullptr);
} else {
rv = DisplayError();
if (NS_FAILED(rv)) {
nsCOMPtr<nsIAppStartup> appStartup =
do_GetService(NS_APPSTARTUP_CONTRACTID);
if (appStartup)
appStartup->Quit(nsIAppStartup::eAttemptQuit);
}
}
}
}
@ -133,20 +144,21 @@ nsresult nsReadConfig::readConfigFile()
if (NS_FAILED(rv))
return rv;
// This preference is set in the all.js or all-ns.js (depending whether
// running mozilla or netscp6)
NS_NAMED_LITERAL_CSTRING(channel, NS_STRINGIFY(MOZ_UPDATE_CHANNEL));
bool sandboxEnabled = false;
rv = defaultPrefBranch->GetBoolPref("general.config.sandbox_enabled",
&sandboxEnabled);
bool sandboxEnabled = channel.EqualsLiteral("beta") || channel.EqualsLiteral("release");
mozilla::Unused << defaultPrefBranch->GetBoolPref("general.config.sandbox_enabled",
&sandboxEnabled);
rv = defaultPrefBranch->GetCharPref("general.config.filename",
lockFileName);
MOZ_LOG(MCD, LogLevel::Debug, ("general.config.filename = %s\n", lockFileName.get()));
if (NS_FAILED(rv))
return rv;
MOZ_LOG(MCD, LogLevel::Debug, ("general.config.filename = %s\n", lockFileName.get()));
for (size_t index = 0, len = mozilla::ArrayLength(gBlockedConfigs); index < len;
++index) {
if (lockFileName == gBlockedConfigs[index]) {