зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1773695 - Part 3: Implement email tracking url classifier feature. r=dimi
Differential Revision: https://phabricator.services.mozilla.com/D151050
This commit is contained in:
Родитель
1ab8b37cce
Коммит
73b719cca4
|
@ -176,6 +176,10 @@ nsresult UrlClassifierCommon::SetBlockedContent(nsIChannel* channel,
|
|||
NS_SetRequestBlockingReason(
|
||||
channel, nsILoadInfo::BLOCKING_REASON_CLASSIFY_SOCIALTRACKING_URI);
|
||||
break;
|
||||
case NS_ERROR_EMAILTRACKING_URI:
|
||||
NS_SetRequestBlockingReason(
|
||||
channel, nsILoadInfo::BLOCKING_REASON_CLASSIFY_EMAILTRACKING_URI);
|
||||
break;
|
||||
default:
|
||||
MOZ_CRASH(
|
||||
"Missing nsILoadInfo::BLOCKING_REASON* for the classification error");
|
||||
|
|
|
@ -0,0 +1,210 @@
|
|||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "UrlClassifierFeatureEmailTrackingProtection.h"
|
||||
|
||||
#include "ChannelClassifierService.h"
|
||||
#include "mozilla/AntiTrackingUtils.h"
|
||||
#include "mozilla/net/UrlClassifierCommon.h"
|
||||
#include "mozilla/StaticPrefs_privacy.h"
|
||||
#include "mozilla/StaticPtr.h"
|
||||
#include "nsIChannel.h"
|
||||
#include "nsILoadContext.h"
|
||||
#include "nsIHttpChannelInternal.h"
|
||||
|
||||
namespace mozilla::net {
|
||||
|
||||
namespace {
|
||||
|
||||
#define EMAIL_TRACKING_PROTECTION_FEATURE_NAME "emailtracking-protection"
|
||||
|
||||
#define URLCLASSIFIER_EMAIL_TRACKING_BLOCKLIST \
|
||||
"urlclassifier.features.emailtracking.blocklistTables"
|
||||
#define URLCLASSIFIER_EMAIL_TRACKING_BLOCKLIST_TEST_ENTRIES \
|
||||
"urlclassifier.features.emailtracking.blocklistHosts"
|
||||
#define URLCLASSIFIER_EMAIL_TRACKING_ENTITYLIST \
|
||||
"urlclassifier.features.emailtracking.allowlistTables"
|
||||
#define URLCLASSIFIER_EMAIL_TRACKING_ENTITYLIST_TEST_ENTRIES \
|
||||
"urlclassifier.features.emailtracking.allowlistHosts"
|
||||
#define URLCLASSIFIER_EMAIL_TRACKING_PROTECTION_EXCEPTION_URLS \
|
||||
"urlclassifier.features.emailtracking.skipURLs"
|
||||
#define TABLE_EMAIL_TRACKING_BLOCKLIST_PREF "emailtracking-blocklist-pref"
|
||||
#define TABLE_EMAIL_TRACKING_ENTITYLIST_PREF "emailtracking-allowlist-pref"
|
||||
|
||||
StaticRefPtr<UrlClassifierFeatureEmailTrackingProtection>
|
||||
gFeatureEmailTrackingProtection;
|
||||
|
||||
std::vector<UrlClassifierCommon::ClassificationData> sClassificationData = {
|
||||
{"base-email-track-"_ns,
|
||||
nsIClassifiedChannel::ClassificationFlags::CLASSIFIED_EMAILTRACKING},
|
||||
{"content-email-track-"_ns, nsIClassifiedChannel::ClassificationFlags::
|
||||
CLASSIFIED_EMAILTRACKING_CONTENT},
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
UrlClassifierFeatureEmailTrackingProtection::
|
||||
UrlClassifierFeatureEmailTrackingProtection()
|
||||
: UrlClassifierFeatureAntiTrackingBase(
|
||||
nsLiteralCString(EMAIL_TRACKING_PROTECTION_FEATURE_NAME),
|
||||
nsLiteralCString(URLCLASSIFIER_EMAIL_TRACKING_BLOCKLIST),
|
||||
nsLiteralCString(URLCLASSIFIER_EMAIL_TRACKING_ENTITYLIST),
|
||||
nsLiteralCString(URLCLASSIFIER_EMAIL_TRACKING_BLOCKLIST_TEST_ENTRIES),
|
||||
nsLiteralCString(
|
||||
URLCLASSIFIER_EMAIL_TRACKING_ENTITYLIST_TEST_ENTRIES),
|
||||
nsLiteralCString(TABLE_EMAIL_TRACKING_BLOCKLIST_PREF),
|
||||
nsLiteralCString(TABLE_EMAIL_TRACKING_ENTITYLIST_PREF),
|
||||
nsLiteralCString(
|
||||
URLCLASSIFIER_EMAIL_TRACKING_PROTECTION_EXCEPTION_URLS)) {}
|
||||
|
||||
/* static */
|
||||
const char* UrlClassifierFeatureEmailTrackingProtection::Name() {
|
||||
return EMAIL_TRACKING_PROTECTION_FEATURE_NAME;
|
||||
}
|
||||
|
||||
/* static */
|
||||
void UrlClassifierFeatureEmailTrackingProtection::MaybeInitialize() {
|
||||
MOZ_ASSERT(XRE_IsParentProcess());
|
||||
UC_LOG_LEAK(("UrlClassifierFeatureEmailTrackingProtection::MaybeInitialize"));
|
||||
|
||||
if (!gFeatureEmailTrackingProtection) {
|
||||
gFeatureEmailTrackingProtection =
|
||||
new UrlClassifierFeatureEmailTrackingProtection();
|
||||
gFeatureEmailTrackingProtection->InitializePreferences();
|
||||
}
|
||||
}
|
||||
|
||||
/* static */
|
||||
void UrlClassifierFeatureEmailTrackingProtection::MaybeShutdown() {
|
||||
UC_LOG_LEAK(("UrlClassifierFeatureEmailTrackingProtection::MaybeShutdown"));
|
||||
|
||||
if (gFeatureEmailTrackingProtection) {
|
||||
gFeatureEmailTrackingProtection->ShutdownPreferences();
|
||||
gFeatureEmailTrackingProtection = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
/* static */
|
||||
already_AddRefed<UrlClassifierFeatureEmailTrackingProtection>
|
||||
UrlClassifierFeatureEmailTrackingProtection::MaybeCreate(nsIChannel* aChannel) {
|
||||
MOZ_ASSERT(aChannel);
|
||||
|
||||
UC_LOG_LEAK(
|
||||
("UrlClassifierFeatureEmailTrackingProtection::MaybeCreate - channel %p",
|
||||
aChannel));
|
||||
|
||||
// Check if the email tracking protection is enabled.
|
||||
if (!StaticPrefs::privacy_trackingprotection_emailtracking_enabled()) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool isThirdParty = AntiTrackingUtils::IsThirdPartyChannel(aChannel);
|
||||
if (!isThirdParty) {
|
||||
UC_LOG(
|
||||
("UrlClassifierFeatureEmailTrackingProtection::MaybeCreate - "
|
||||
"skipping first party or top-level load for channel %p",
|
||||
aChannel));
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (!UrlClassifierCommon::ShouldEnableProtectionForChannel(aChannel)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
MaybeInitialize();
|
||||
MOZ_ASSERT(gFeatureEmailTrackingProtection);
|
||||
|
||||
RefPtr<UrlClassifierFeatureEmailTrackingProtection> self =
|
||||
gFeatureEmailTrackingProtection;
|
||||
return self.forget();
|
||||
}
|
||||
|
||||
/* static */
|
||||
already_AddRefed<nsIUrlClassifierFeature>
|
||||
UrlClassifierFeatureEmailTrackingProtection::GetIfNameMatches(
|
||||
const nsACString& aName) {
|
||||
if (!aName.EqualsLiteral(EMAIL_TRACKING_PROTECTION_FEATURE_NAME)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
MaybeInitialize();
|
||||
MOZ_ASSERT(gFeatureEmailTrackingProtection);
|
||||
|
||||
RefPtr<UrlClassifierFeatureEmailTrackingProtection> self =
|
||||
gFeatureEmailTrackingProtection;
|
||||
return self.forget();
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
UrlClassifierFeatureEmailTrackingProtection::ProcessChannel(
|
||||
nsIChannel* aChannel, const nsTArray<nsCString>& aList,
|
||||
const nsTArray<nsCString>& aHashes, bool* aShouldContinue) {
|
||||
NS_ENSURE_ARG_POINTER(aChannel);
|
||||
NS_ENSURE_ARG_POINTER(aShouldContinue);
|
||||
|
||||
bool isAllowListed = UrlClassifierCommon::IsAllowListed(aChannel);
|
||||
|
||||
// This is a blocking feature.
|
||||
*aShouldContinue = isAllowListed;
|
||||
|
||||
if (isAllowListed) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsAutoCString list;
|
||||
UrlClassifierCommon::TablesToString(aList, list);
|
||||
|
||||
ChannelBlockDecision decision =
|
||||
ChannelClassifierService::OnBeforeBlockChannel(aChannel, mName, list);
|
||||
if (decision != ChannelBlockDecision::Blocked) {
|
||||
uint32_t event =
|
||||
decision == ChannelBlockDecision::Replaced
|
||||
? nsIWebProgressListener::STATE_REPLACED_TRACKING_CONTENT
|
||||
: nsIWebProgressListener::STATE_ALLOWED_TRACKING_CONTENT;
|
||||
ContentBlockingNotifier::OnEvent(aChannel, event, false);
|
||||
|
||||
*aShouldContinue = true;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
UrlClassifierCommon::SetBlockedContent(aChannel, NS_ERROR_EMAILTRACKING_URI,
|
||||
list, ""_ns, ""_ns);
|
||||
|
||||
UC_LOG(
|
||||
("UrlClassifierFeatureEmailTrackingProtection::ProcessChannel - "
|
||||
"cancelling channel %p",
|
||||
aChannel));
|
||||
|
||||
nsCOMPtr<nsIHttpChannelInternal> httpChannel = do_QueryInterface(aChannel);
|
||||
if (httpChannel) {
|
||||
Unused << httpChannel->CancelByURLClassifier(NS_ERROR_EMAILTRACKING_URI);
|
||||
} else {
|
||||
Unused << aChannel->Cancel(NS_ERROR_EMAILTRACKING_URI);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
UrlClassifierFeatureEmailTrackingProtection::GetURIByListType(
|
||||
nsIChannel* aChannel, nsIUrlClassifierFeature::listType aListType,
|
||||
nsIUrlClassifierFeature::URIType* aURIType, nsIURI** aURI) {
|
||||
NS_ENSURE_ARG_POINTER(aChannel);
|
||||
NS_ENSURE_ARG_POINTER(aURIType);
|
||||
NS_ENSURE_ARG_POINTER(aURI);
|
||||
|
||||
if (aListType == nsIUrlClassifierFeature::blocklist) {
|
||||
*aURIType = nsIUrlClassifierFeature::blocklistURI;
|
||||
return aChannel->GetURI(aURI);
|
||||
}
|
||||
|
||||
MOZ_ASSERT(aListType == nsIUrlClassifierFeature::entitylist);
|
||||
|
||||
*aURIType = nsIUrlClassifierFeature::pairwiseEntitylistURI;
|
||||
return UrlClassifierCommon::CreatePairwiseEntityListURI(aChannel, aURI);
|
||||
}
|
||||
|
||||
} // namespace mozilla::net
|
|
@ -0,0 +1,47 @@
|
|||
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_net_UrlClassifierFeatureEmailTrackingProtection_h
|
||||
#define mozilla_net_UrlClassifierFeatureEmailTrackingProtection_h
|
||||
|
||||
#include "UrlClassifierFeatureBase.h"
|
||||
|
||||
class nsIChannel;
|
||||
|
||||
namespace mozilla::net {
|
||||
|
||||
class UrlClassifierFeatureEmailTrackingProtection final
|
||||
: public UrlClassifierFeatureAntiTrackingBase {
|
||||
public:
|
||||
static const char* Name();
|
||||
|
||||
static void MaybeShutdown();
|
||||
|
||||
static already_AddRefed<UrlClassifierFeatureEmailTrackingProtection>
|
||||
MaybeCreate(nsIChannel* aChannel);
|
||||
|
||||
static already_AddRefed<nsIUrlClassifierFeature> GetIfNameMatches(
|
||||
const nsACString& aName);
|
||||
|
||||
NS_IMETHOD ProcessChannel(nsIChannel* aChannel,
|
||||
const nsTArray<nsCString>& aList,
|
||||
const nsTArray<nsCString>& aHashes,
|
||||
bool* aShouldContinue) override;
|
||||
|
||||
NS_IMETHOD GetURIByListType(nsIChannel* aChannel,
|
||||
nsIUrlClassifierFeature::listType aListType,
|
||||
nsIUrlClassifierFeature::URIType* aURIType,
|
||||
nsIURI** aURI) override;
|
||||
|
||||
private:
|
||||
UrlClassifierFeatureEmailTrackingProtection();
|
||||
|
||||
static void MaybeInitialize();
|
||||
};
|
||||
|
||||
} // namespace mozilla::net
|
||||
|
||||
#endif // mozilla_net_UrlClassifierFeatureEmailTrackingProtection_h
|
|
@ -9,6 +9,7 @@
|
|||
// List of Features
|
||||
#include "UrlClassifierFeatureCryptominingAnnotation.h"
|
||||
#include "UrlClassifierFeatureCryptominingProtection.h"
|
||||
#include "UrlClassifierFeatureEmailTrackingProtection.h"
|
||||
#include "UrlClassifierFeatureFingerprintingAnnotation.h"
|
||||
#include "UrlClassifierFeatureFingerprintingProtection.h"
|
||||
#include "UrlClassifierFeatureLoginReputation.h"
|
||||
|
@ -34,6 +35,7 @@ void UrlClassifierFeatureFactory::Shutdown() {
|
|||
|
||||
UrlClassifierFeatureCryptominingAnnotation::MaybeShutdown();
|
||||
UrlClassifierFeatureCryptominingProtection::MaybeShutdown();
|
||||
UrlClassifierFeatureEmailTrackingProtection::MaybeShutdown();
|
||||
UrlClassifierFeatureFingerprintingAnnotation::MaybeShutdown();
|
||||
UrlClassifierFeatureFingerprintingProtection::MaybeShutdown();
|
||||
UrlClassifierFeatureLoginReputation::MaybeShutdown();
|
||||
|
@ -58,6 +60,12 @@ void UrlClassifierFeatureFactory::GetFeaturesFromChannel(
|
|||
// feature order, and this could produce different results with a different
|
||||
// feature ordering.
|
||||
|
||||
// Email Tracking Protection
|
||||
feature = UrlClassifierFeatureEmailTrackingProtection::MaybeCreate(aChannel);
|
||||
if (feature) {
|
||||
aFeatures.AppendElement(feature);
|
||||
}
|
||||
|
||||
// Cryptomining Protection
|
||||
feature = UrlClassifierFeatureCryptominingProtection::MaybeCreate(aChannel);
|
||||
if (feature) {
|
||||
|
@ -140,6 +148,13 @@ UrlClassifierFeatureFactory::GetFeatureByName(const nsACString& aName) {
|
|||
return feature.forget();
|
||||
}
|
||||
|
||||
// Email Tracking Protection
|
||||
feature =
|
||||
UrlClassifierFeatureEmailTrackingProtection::GetIfNameMatches(aName);
|
||||
if (feature) {
|
||||
return feature.forget();
|
||||
}
|
||||
|
||||
// Fingerprinting Annotation
|
||||
feature =
|
||||
UrlClassifierFeatureFingerprintingAnnotation::GetIfNameMatches(aName);
|
||||
|
@ -215,6 +230,12 @@ void UrlClassifierFeatureFactory::GetFeatureNames(nsTArray<nsCString>& aArray) {
|
|||
aArray.AppendElement(name);
|
||||
}
|
||||
|
||||
// Email Tracking Protection
|
||||
name.Assign(UrlClassifierFeatureEmailTrackingProtection::Name());
|
||||
if (!name.IsEmpty()) {
|
||||
aArray.AppendElement(name);
|
||||
}
|
||||
|
||||
// Fingerprinting Annotation
|
||||
name.Assign(UrlClassifierFeatureFingerprintingAnnotation::Name());
|
||||
if (!name.IsEmpty()) {
|
||||
|
|
|
@ -36,6 +36,7 @@ UNIFIED_SOURCES += [
|
|||
"UrlClassifierFeatureCryptominingAnnotation.cpp",
|
||||
"UrlClassifierFeatureCryptominingProtection.cpp",
|
||||
"UrlClassifierFeatureCustomTables.cpp",
|
||||
"UrlClassifierFeatureEmailTrackingProtection.cpp",
|
||||
"UrlClassifierFeatureFactory.cpp",
|
||||
"UrlClassifierFeatureFingerprintingAnnotation.cpp",
|
||||
"UrlClassifierFeatureFingerprintingProtection.cpp",
|
||||
|
|
Загрузка…
Ссылка в новой задаче