Commit 359ecdf6 authored by William Wen's avatar William Wen Committed by wwwenwilliam@gmail.com
Browse files

Bug 1962092 - Add flags and prefs for antifraud list feature. r=timhuang,extension-reviewers,robwu 

Differential Revision: https://phabricator.services.mozilla.com/D247534
parent 3dddab66

dom/chrome-webidl/ChannelWrapper.webidl

+3 −2
Changes for dom/chrome-webidl/ChannelWrapper.webidl: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ enum MozUrlClassificationFlags { 
  "cryptomining_content",

  "emailtracking",

  "emailtracking_content",

  "consentmanager",

  "tracking",

  "tracking_ad",

  "tracking_analytics",
@@ -58,7 +57,9 @@ enum MozUrlClassificationFlags { 
  "socialtracking_twitter",

  "any_basic_tracking",

  "any_strict_tracking",

  "any_social_tracking"

  "any_social_tracking",

  "consentmanager",

  "antifraud"

};



/**

modules/libpref/init/all.js

+4 −2
Changes for modules/libpref/init/all.js: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3327,9 +3327,11 @@ pref("urlclassifier.features.emailtracking.datacollection.blocklistTables", "bas 
pref("urlclassifier.features.emailtracking.datacollection.allowlistTables", "mozstd-trackwhite-digest256");

pref("urlclassifier.features.consentmanager.annotate.blocklistTables", "consent-manager-track-digest256");

pref("urlclassifier.features.consentmanager.annotate.allowlistTables", "mozstd-trackwhite-digest256");

pref("urlclassifier.features.antifraud.annotate.blocklistTables", "anti-fraud-track-digest256");

pref("urlclassifier.features.antifraud.annotate.allowlistTables", "mozstd-trackwhite-digest256");



// These tables will never trigger a gethash call.

pref("urlclassifier.disallow_completions", "goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,ads-track-digest256,social-track-digest256,analytics-track-digest256,base-fingerprinting-track-digest256,content-fingerprinting-track-digest256,base-cryptomining-track-digest256,content-cryptomining-track-digest256,fanboyannoyance-ads-digest256,fanboysocial-ads-digest256,easylist-ads-digest256,easyprivacy-ads-digest256,adguard-ads-digest256,social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256,base-email-track-digest256,content-email-track-digest256,consent-manager-track-digest256");

pref("urlclassifier.disallow_completions", "goog-downloadwhite-digest256,base-track-digest256,mozstd-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,ads-track-digest256,social-track-digest256,analytics-track-digest256,base-fingerprinting-track-digest256,content-fingerprinting-track-digest256,base-cryptomining-track-digest256,content-cryptomining-track-digest256,fanboyannoyance-ads-digest256,fanboysocial-ads-digest256,easylist-ads-digest256,easyprivacy-ads-digest256,adguard-ads-digest256,social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256,base-email-track-digest256,content-email-track-digest256,consent-manager-track-digest256,anti-fraud-track-digest256");



// Workaround for Google Recaptcha

pref("urlclassifier.trackingAnnotationSkipURLs", "");
@@ -3404,7 +3406,7 @@ pref("browser.safebrowsing.reportPhishURL", "https://%LOCALE%.phish-report.mozil 


// Mozilla Safe Browsing provider (for tracking protection and plugin blocking)

pref("browser.safebrowsing.provider.mozilla.pver", "2.2");

pref("browser.safebrowsing.provider.mozilla.lists", "base-track-digest256,mozstd-trackwhite-digest256,google-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,ads-track-digest256,social-track-digest256,analytics-track-digest256,base-fingerprinting-track-digest256,content-fingerprinting-track-digest256,base-cryptomining-track-digest256,content-cryptomining-track-digest256,fanboyannoyance-ads-digest256,fanboysocial-ads-digest256,easylist-ads-digest256,easyprivacy-ads-digest256,adguard-ads-digest256,social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256,base-email-track-digest256,content-email-track-digest256,consent-manager-track-digest256");

pref("browser.safebrowsing.provider.mozilla.lists", "base-track-digest256,mozstd-trackwhite-digest256,google-trackwhite-digest256,content-track-digest256,mozplugin-block-digest256,mozplugin2-block-digest256,ads-track-digest256,social-track-digest256,analytics-track-digest256,base-fingerprinting-track-digest256,content-fingerprinting-track-digest256,base-cryptomining-track-digest256,content-cryptomining-track-digest256,fanboyannoyance-ads-digest256,fanboysocial-ads-digest256,easylist-ads-digest256,easyprivacy-ads-digest256,adguard-ads-digest256,social-tracking-protection-digest256,social-tracking-protection-facebook-digest256,social-tracking-protection-linkedin-digest256,social-tracking-protection-twitter-digest256,base-email-track-digest256,content-email-track-digest256,consent-manager-track-digest256,anti-fraud-track-digest256");

pref("browser.safebrowsing.provider.mozilla.updateURL", "moz-sbrs:://antitracking");

pref("browser.safebrowsing.provider.mozilla.gethashURL", "https://shavar.services.mozilla.com/gethash?client=SAFEBROWSING_ID&appver=%MAJOR_VERSION%&pver=2.2");

// Set to a date in the past to force immediate download in new profiles.

netwerk/base/nsIClassifiedChannel.idl

+22 −16
Changes for netwerk/base/nsIClassifiedChannel.idl: 22 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -93,14 +93,14 @@ interface nsIClassifiedChannel : nsISupports 
    /**

     * The resource is on the fingerprinting list.

     */

    CLASSIFIED_FINGERPRINTING = 0x0001,

    CLASSIFIED_FINGERPRINTING_CONTENT = 0x0080,

    CLASSIFIED_FINGERPRINTING = 0x00000001,

    CLASSIFIED_FINGERPRINTING_CONTENT = 0x00000002,



    /**

     * The resource is on the cryptomining list.

     */

    CLASSIFIED_CRYPTOMINING = 0x0002,

    CLASSIFIED_CRYPTOMINING_CONTENT = 0x0100,

    CLASSIFIED_CRYPTOMINING = 0x00000004,

    CLASSIFIED_CRYPTOMINING_CONTENT = 0x00000008,



    /**

     * The following are about tracking annotation and are available only
@@ -108,30 +108,36 @@ interface nsIClassifiedChannel : nsISupports 
     * CLASSIFIED_TRACKING is set if we are not able to identify the

     * type of classification.

     */

    CLASSIFIED_TRACKING = 0x0004,

    CLASSIFIED_TRACKING_AD = 0x0008,

    CLASSIFIED_TRACKING_ANALYTICS = 0x0010,

    CLASSIFIED_TRACKING_SOCIAL = 0x0020,

    CLASSIFIED_TRACKING_CONTENT = 0x0040,

    CLASSIFIED_TRACKING = 0x00000010,

    CLASSIFIED_TRACKING_AD = 0x00000020,

    CLASSIFIED_TRACKING_ANALYTICS = 0x00000040,

    CLASSIFIED_TRACKING_SOCIAL = 0x00000080,

    CLASSIFIED_TRACKING_CONTENT = 0x00000100,



    /**

     * The following are about social tracking.

     */

    CLASSIFIED_SOCIALTRACKING = 0x0200,

    CLASSIFIED_SOCIALTRACKING_FACEBOOK = 0x0400,

    CLASSIFIED_SOCIALTRACKING_LINKEDIN = 0x0800,

    CLASSIFIED_SOCIALTRACKING_TWITTER = 0x1000,

    CLASSIFIED_SOCIALTRACKING = 0x00000200,

    CLASSIFIED_SOCIALTRACKING_FACEBOOK = 0x00000400,

    CLASSIFIED_SOCIALTRACKING_LINKEDIN = 0x00000800,

    CLASSIFIED_SOCIALTRACKING_TWITTER = 0x00001000,



    /**

     * The following are about email tracking.

     */

    CLASSIFIED_EMAILTRACKING = 0x2000,

    CLASSIFIED_EMAILTRACKING_CONTENT = 0x4000,

    CLASSIFIED_EMAILTRACKING = 0x00002000,

    CLASSIFIED_EMAILTRACKING_CONTENT = 0x00004000,



    /**

     * The following are about consent managers.

     */

    CLASSIFIED_CONSENTMANAGER = 0x8000,

    CLASSIFIED_CONSENTMANAGER = 0x00008000,



    /**

     * The following are about anti fraud.

     */

    CLASSIFIED_ANTIFRAUD = 0x00010000,



    /**

     * This is exposed to help to identify tracking classification using the

     * basic lists.

toolkit/components/extensions/schemas/web_request.json

+3 −2
Changes for toolkit/components/extensions/schemas/web_request.json: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ 
          "cryptomining_content",

          "emailtracking",

          "emailtracking_content",

          "consentmanager",

          "tracking",

          "tracking_ad",

          "tracking_analytics",
@@ -410,7 +409,9 @@ 
          "tracking_content",

          "any_basic_tracking",

          "any_strict_tracking",

          "any_social_tracking"

          "any_social_tracking",

          "consentmanager",

          "antifraud"

        ],

        "description": "Tracking flags that match our internal tracking classification"

      },

toolkit/components/extensions/webrequest/ChannelWrapper.cpp

+3 −2
Changes for toolkit/components/extensions/webrequest/ChannelWrapper.cpp: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static const ClassificationStruct classificationArray[] = { 
    {CF::CLASSIFIED_CRYPTOMINING_CONTENT, MUC::Cryptomining_content},

    {CF::CLASSIFIED_EMAILTRACKING, MUC::Emailtracking},

    {CF::CLASSIFIED_EMAILTRACKING_CONTENT, MUC::Emailtracking_content},

    {CF::CLASSIFIED_CONSENTMANAGER, MUC::Consentmanager},

    {CF::CLASSIFIED_TRACKING, MUC::Tracking},

    {CF::CLASSIFIED_TRACKING_AD, MUC::Tracking_ad},

    {CF::CLASSIFIED_TRACKING_ANALYTICS, MUC::Tracking_analytics},
@@ -78,7 +77,9 @@ static const ClassificationStruct classificationArray[] = { 
    {CF::CLASSIFIED_SOCIALTRACKING_TWITTER, MUC::Socialtracking_twitter},

    {CF::CLASSIFIED_ANY_BASIC_TRACKING, MUC::Any_basic_tracking},

    {CF::CLASSIFIED_ANY_STRICT_TRACKING, MUC::Any_strict_tracking},

    {CF::CLASSIFIED_ANY_SOCIAL_TRACKING, MUC::Any_social_tracking}};

    {CF::CLASSIFIED_ANY_SOCIAL_TRACKING, MUC::Any_social_tracking},

    {CF::CLASSIFIED_CONSENTMANAGER, MUC::Consentmanager},

    {CF::CLASSIFIED_ANTIFRAUD, MUC::Antifraud}};



/*****************************************************************************

 * Lifetimes