nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1883510 - Change Preferences to StaticPrefs in ContentAnalysis r=cmartin,gstoll,gcp

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D210095
This commit is contained in:
Brian Tsoi 2024-05-14 13:07:01 +00:00
parent aa1b6948c8
commit 0ece155217
2 changed files with 11 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
modules/libpref/init/StaticPrefList.yaml
View file

@ -1171,7 +1171,7 @@
- name: browser.contentanalysis.enabled
type: bool
value: false
mirror: never
mirror: always
# What content analysis should return if there is a problem communicating
# with the agent. (see DefaultResponse enum in ContentAnalysis.h)
@ -1189,7 +1189,7 @@
- name: browser.contentanalysis.is_per_user
type: bool
value: true
mirror: never
mirror: always
# Path name of pipe used to connect to a configured DLP agent.
- name: browser.contentanalysis.pipe_path_name

20
toolkit/components/contentanalysis/ContentAnalysis.cpp
View file

@ -62,8 +62,6 @@ LazyLogModule gContentAnalysisLog("contentanalysis");
namespace {
const char* kIsDLPEnabledPref = "browser.contentanalysis.enabled";
const char* kIsPerUserPref = "browser.contentanalysis.is_per_user";
const char* kPipePathNamePref = "browser.contentanalysis.pipe_path_name";
const char* kClientSignature = "browser.contentanalysis.client_signature";
const char* kAllowUrlPref = "browser.contentanalysis.allow_url_regex_list";
@ -990,14 +988,15 @@ ContentAnalysis::~ContentAnalysis() {
NS_IMETHODIMP
ContentAnalysis::GetIsActive(bool* aIsActive) {
*aIsActive = false;
// Need to be on the main thread to read prefs
MOZ_ASSERT(NS_IsMainThread());
// gAllowContentAnalysisArgPresent is only set in the parent process
MOZ_ASSERT(XRE_IsParentProcess());
if (!Preferences::GetBool(kIsDLPEnabledPref)) {
if (!StaticPrefs::browser_contentanalysis_enabled()) {
LOGD("Local DLP Content Analysis is not active");
return NS_OK;
}
// Accessing mClientCreationAttempted, mSetByEnterprise and non-static prefs
// so need to be on the main thread
MOZ_ASSERT(NS_IsMainThread());
// gAllowContentAnalysisArgPresent is only set in the parent process
MOZ_ASSERT(XRE_IsParentProcess());
if (!gAllowContentAnalysisArgPresent && !mSetByEnterprise) {
LOGE(
"The content analysis pref is enabled but not by an enterprise "
@ -1008,8 +1007,7 @@ ContentAnalysis::GetIsActive(bool* aIsActive) {
*aIsActive = true;
LOGD("Local DLP Content Analysis is active");
// mClientCreationAttempted is only accessed on the main thread,
// so no need for synchronization here.
// On the main thread so no need for synchronization here.
if (!mClientCreationAttempted) {
mClientCreationAttempted = true;
LOGD("Dispatching background task to create Content Analysis client");
@ -1020,7 +1018,7 @@ ContentAnalysis::GetIsActive(bool* aIsActive) {
mCaClientPromise->Reject(rv, __func__);
return rv;
}
bool isPerUser = Preferences::GetBool(kIsPerUserPref);
bool isPerUser = StaticPrefs::browser_contentanalysis_is_per_user();
nsString clientSignature;
// It's OK if this fails, we will default to the empty string
Preferences::GetString(kClientSignature, clientSignature);
@ -1043,7 +1041,7 @@ NS_IMETHODIMP
ContentAnalysis::GetMightBeActive(bool* aMightBeActive) {
// A DLP connection is not permitted to be added/removed while the
// browser is running, so we can cache this.
static bool sIsEnabled = Preferences::GetBool(kIsDLPEnabledPref);
static bool sIsEnabled = StaticPrefs::browser_contentanalysis_enabled();
// Note that we can't check gAllowContentAnalysis here because it
// only gets set in the parent process.
*aMightBeActive = sIsEnabled;