Commit 121872f0 authored by morgan's avatar morgan 😸 Committed by Pier Angelo Vendrame
Browse files

BB 42716: Disable unwanted about: pages

parent 6bdd63fc

browser/components/about/AboutRedirector.cpp

+2 −0
Original line number Diff line number Diff line
@@ -90,9 +90,11 @@ static const RedirEntry kRedirMap[] = { 
    {"rights", "https://www.mozilla.org/about/legal/terms/firefox/",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD},

#ifndef BASE_BROWSER_VERSION

    {"robots", "chrome://browser/content/aboutRobots.xhtml",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::ALLOW_SCRIPT},

#endif

    {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |

         nsIAboutModule::IS_SECURE_CHROME_UI},

browser/components/about/components.conf

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ pages = [ 
    'reader',

    'restartrequired',

    'rights',

    'robots',

    # Removed 'robots'. tor-browser#42831.

    'sessionrestore',

    'settings',

    'tabcrashed',

docshell/base/nsAboutRedirector.cpp

+13 −8
Original line number Diff line number Diff line
@@ -136,10 +136,9 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::IS_SECURE_CHROME_UI},

    {"logging", "chrome://global/content/aboutLogging/aboutLogging.html",

     nsIAboutModule::ALLOW_SCRIPT},

    {"logo", "chrome://branding/content/about.png",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         // Linkable for testing reasons.

         nsIAboutModule::MAKE_LINKABLE},

    // Do not allow web pages to link to about:logo, which varies between

    // channels. See tor-browser#43308.

    // Moreover, it exposes firefox-specific branding.

    {"memory", "chrome://global/content/aboutMemory.xhtml",

     nsIAboutModule::ALLOW_SCRIPT},

    {"certificate", "chrome://global/content/certviewer/certviewer.html",
@@ -148,8 +147,10 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::URI_MUST_LOAD_IN_CHILD |

         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

         nsIAboutModule::IS_SECURE_CHROME_UI},

#ifndef BASE_BROWSER_VERSION

    {"mozilla", "chrome://global/content/mozilla.html",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},

#endif

#if !defined(ANDROID) && !defined(XP_WIN)

    {"webauthn", "chrome://global/content/aboutWebauthn.html",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
@@ -194,6 +195,7 @@ static const RedirEntry kRedirMap[] = { 
    {"windows-messages", "chrome://global/content/aboutWindowsMessages.html",

     nsIAboutModule::ALLOW_SCRIPT},

#endif

#ifdef MOZ_TELEMETRY_REPORTING

#  ifndef MOZ_GLEAN_ANDROID

    {"glean", "chrome://global/content/aboutGlean.html",

#    if !defined(NIGHTLY_BUILD) && defined(MOZILLA_OFFICIAL)
@@ -203,6 +205,7 @@ static const RedirEntry kRedirMap[] = { 
#  endif

    {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

#endif

    {"translations", "chrome://global/content/translations/translations.html",

     nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
@@ -211,8 +214,10 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::HIDE_FROM_ABOUTABOUT},

    {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",

     nsIAboutModule::ALLOW_SCRIPT},

#ifdef MOZ_WEBRTC

    {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html",

     nsIAboutModule::ALLOW_SCRIPT},

#endif

    {"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT},

    {"crashcontent", "about:blank",

     nsIAboutModule::HIDE_FROM_ABOUTABOUT |

docshell/build/components.conf

+7 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ about_pages = [ 
    'logging',

    'logo',

    'memory',

    'mozilla',

    # Removed 'mozilla'. tor-browser#42831.

    'neterror',

    'networking',

    'performance',
@@ -29,16 +29,18 @@ about_pages = [ 
    'serviceworkers',

    'srcdoc',

    'support',

    'telemetry',

    'translations',

    'url-classifier',

    'webrtc',

    # Removed 'url-classifier'. tor-browser#42831.

]



if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android':

    about_pages.append('addons')

if defined('MOZ_CRASHREPORTER'):

    about_pages.append('crashes')

if defined('MOZ_TELEMETRY_REPORTING'):

    about_pages.append('telemetry')

if defined('MOZ_WEBRTC'):

    about_pages.append('webrtc')

if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android':

    about_pages.append('profiles')

if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'android':
@@ -46,7 +48,7 @@ if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'android': 
if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'windows':

    about_pages.append('third-party')

    about_pages.append('windows-messages')

if not defined('MOZ_GLEAN_ANDROID'):

if defined('MOZ_TELEMETRY_REPORTING') and not defined('MOZ_GLEAN_ANDROID'):

    about_pages.append('glean')

if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android' and buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'windows':

    about_pages.append('webauthn')

toolkit/content/jar.mn

+6 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ toolkit.jar: 
#endif

   content/global/aboutServiceWorkers.js

   content/global/aboutServiceWorkers.xhtml

#ifdef MOZ_WEBRTC

   content/global/aboutwebrtc/aboutWebrtc.css   (aboutwebrtc/aboutWebrtc.css)

   content/global/aboutwebrtc/aboutWebrtc.mjs    (aboutwebrtc/aboutWebrtc.mjs)

   content/global/aboutwebrtc/graph.mjs    (aboutwebrtc/graph.mjs)
@@ -30,8 +31,10 @@ toolkit.jar: 
   content/global/aboutwebrtc/disclosure.mjs (aboutwebrtc/disclosure.mjs)

   content/global/aboutwebrtc/copyButton.mjs (aboutwebrtc/copyButton.mjs)

   content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html)

#endif

   content/global/aboutSupport.js

*  content/global/aboutSupport.xhtml

#ifdef MOZ_TELEMETRY_REPORTING

#  ifndef MOZ_GLEAN_ANDROID

   content/global/aboutGlean.js

   content/global/aboutGlean.html
@@ -40,6 +43,7 @@ toolkit.jar: 
   content/global/aboutTelemetry.js

   content/global/aboutTelemetry.xhtml

   content/global/aboutTelemetry.css

#endif

   content/global/aboutUrlClassifier.js

   content/global/aboutUrlClassifier.xhtml

   content/global/aboutUrlClassifier.css