Data consent updates and privacy improvements (Fixes #14213)

mozilla · May 15, 2024 · 8cd7d63 · 8cd7d63
1 parent 1b57775
commit 8cd7d63
Show file tree

Hide file tree

Showing 83 changed files with 3,310 additions and 1,019 deletions.
diff --git a/bedrock/base/templates/base-protocol.html b/bedrock/base/templates/base-protocol.html
@@ -6,7 +6,7 @@
 
 <!doctype html>
 {# Note the "windows" class, without javascript platform-specific assets default to windows #}
-<html class="windows no-js" lang="{{ LANG|replace('en-US', 'en') }}" dir="{{ DIR }}" data-country-code="{{ country_code }}" data-latest-firefox="{{ latest_firefox_version }}" data-esr-versions="{{ esr_firefox_versions|join(' ') }}" {% if settings.GTM_CONTAINER_ID %}data-gtm-container-id="{{ settings.GTM_CONTAINER_ID }}"{% endif %} {% block gtm_page_id %}{% endblock %} {% if settings.STUB_ATTRIBUTION_RATE %}data-stub-attribution-rate="{{ settings.STUB_ATTRIBUTION_RATE }}"{% endif %} {% if settings.SENTRY_FRONTEND_DSN %}data-sentry-dsn="{{ settings.SENTRY_FRONTEND_DSN }}"{% endif %} {% block html_attrs %}{% endblock %}>
+<html class="windows no-js" lang="{{ LANG|replace('en-US', 'en') }}" dir="{{ DIR }}" data-country-code="{{ country_code }}" data-needs-consent="{{ needs_data_consent(country_code) }}" data-latest-firefox="{{ latest_firefox_version }}" data-esr-versions="{{ esr_firefox_versions|join(' ') }}" {% if settings.GTM_CONTAINER_ID %}data-gtm-container-id="{{ settings.GTM_CONTAINER_ID }}"{% endif %} {% block gtm_page_id %}{% endblock %} {% if settings.STUB_ATTRIBUTION_RATE %}data-stub-attribution-rate="{{ settings.STUB_ATTRIBUTION_RATE }}"{% endif %} {% if settings.SENTRY_FRONTEND_DSN %}data-sentry-dsn="{{ settings.SENTRY_FRONTEND_DSN }}"{% endif %} {% block html_attrs %}{% endblock %}>
   <head>
     <meta charset="utf-8">{# Note: Must be within first 512 bytes of page #}
 
@@ -16,6 +16,10 @@
     {% block experiments %}{% endblock %}
     <!--<![endif]-->
 
+    <!--[if IE 9]>
+    {{ js_bundle('site-ie') }}
+    <![endif]-->
+
 <!--
 {% include "includes/careers-teaser.html" %}
 -->
@@ -92,6 +96,10 @@
       data-global-previous="{{ ftl('ui-previous') }}"
       {% block string_data %}{% endblock %}></div>
 
+    {% block consent_banner %}
+      {% include 'includes/banners/consent-banner.html' %}
+    {% endblock %}
+
     {% block site_header %}
       {% include 'includes/protocol/navigation/navigation.html' %}
     {% endblock %}
@@ -125,18 +133,18 @@
         {{ js_bundle('fxa') }}
         {{ js_bundle('data') }}
       <!--<![endif]-->
+
+      <!--[if IE 9]>
+        {{ js_bundle('lib-ie') }}
+      <![endif]-->
     {% endblock %}
 
     {# Bug 1279291 #}
     {% block stub_attribution %}
       {% if settings.STUB_ATTRIBUTION_RATE %}
-        <!--[if !IE]><!-->
+        <!--[if IE 9]><!-->
           {{ js_bundle('stub-attribution') }}
         <!--<![endif]-->
-
-        <!--[if gte IE 8]>
-          {{ js_bundle('stub-attribution-ie') }}
-        <![endif]-->
       {% endif %}
     {% endblock %}
 
@@ -151,5 +159,11 @@
 
     {% block third_party_js %}{% endblock %}
     <!--<![endif]-->
+
+    {% block consent_banner_js %}
+    <!--[if IE 9]><!-->
+      {{ js_bundle('consent-banner') }}
+    <!--<![endif]-->
+    {% endblock %}
   </body>
 </html>
diff --git a/bedrock/base/templates/includes/affiliate-banner.html b/bedrock/base/templates/includes/affiliate-banner.html
diff --git a/bedrock/base/templates/includes/banners/consent-banner.html b/bedrock/base/templates/includes/banners/consent-banner.html
@@ -0,0 +1,25 @@
+{#
+ 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 https://mozilla.org/MPL/2.0/.
+#}
+
+<aside class="moz-consent-banner" id="moz-consent-banner" role="region" aria-label="{{ ftl('consent-banner-aria-label') }}" data-nosnippet="true">
+  <div class="moz-consent-banner-content">
+    <h2 class="moz-consent-banner-heading">{{ ftl('consent-banner-heading') }}</h2>
+    <div class="moz-consent-banner-copy">
+      <p>{{ ftl('consent-banner-body') }}</p>
+      <div class="moz-consent-banner-controls">
+        <button type="button" id="moz-consent-banner-button-accept" class="moz-consent-banner-button moz-consent-banner-button-accept">
+          {{ ftl('consent-banner-button-accept') }}
+        </button>
+        <button type="button" id="moz-consent-banner-button-reject" class="moz-consent-banner-button moz-consent-banner-button-reject">
+          {{ ftl('consent-banner-button-reject') }}
+        </button>
+        <a href="{{ url('privacy.cookie-settings')}}">
+          {{ ftl('consent-banner-settings-link') }}
+        </a>
+      </div>
+    </div>
+  </div>
+</aside>
diff --git a/bedrock/base/templates/includes/google-analytics.html b/bedrock/base/templates/includes/google-analytics.html
@@ -20,8 +20,8 @@
     {{ js_bundle('gtm-snippet') }}
   <!--<![endif]-->
 
-  <!--[if IE]>
-    <script src="{{ static('js/ie/gtm-snippet.js') }}"></script>
+  <!--[if IE 9]>
+    {{ js_bundle('gtm-snippet-ie') }}
   <![endif]-->
 {% endif %}
 <!-- End Google Tag Manager -->
diff --git a/bedrock/base/templates/includes/protocol/footer/footer.html b/bedrock/base/templates/includes/protocol/footer/footer.html
@@ -96,7 +96,10 @@ <h5 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-firefox') }}</h5>
       <div class="mzp-c-footer-legal">
         <ul class="mzp-c-footer-terms">
           <li><a href="{{ url('privacy.notices.websites') }}" data-link-type="footer" data-link-text="Privacy">{{ ftl('footer-websites-privacy-notice') }}</a></li>
-          <li><a href="{{ url('privacy.notices.websites') }}#user-choices" data-link-type="footer" data-link-text="Cookies">{{ ftl('footer-websites-cookies') }}</a></li>
+          <li>
+            {# Link to /privacy/websites/cookie-settings/ is a legal requirement and should not be removed. It must be present on every page (Issue 14213). #}
+            <a href="{{ url('privacy.cookie-settings') }}" data-link-type="footer" data-link-text="Cookies">{{ ftl('footer-websites-cookies') }}</a>
+          </li>
           <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-text="Legal">{{ ftl('footer-websites-legal') }}</a></li>
           <li><a href="{{ url('mozorg.about.governance.policies.participation') }}" data-link-type="footer" data-link-text="Community Participation Guidelines">{{ ftl('footer-community-participation-guidelines') }}</a></li>
           {% if ftl_has_messages('footer-about-this-site') %}

diff --git a/bedrock/mozorg/nonlocale_urls.py b/bedrock/mozorg/nonlocale_urls.py
@@ -26,6 +26,7 @@
     page("credits/faq/", "mozorg/credits-faq.html"),
     path("robots.txt", views.Robots.as_view(), name="robots.txt"),
     path(".well-known/security.txt", views.SecurityDotTxt.as_view(), name="security.txt"),
+    path(".well-known/gpc.json", views.GpcDotJson.as_view(), name="gpc.json"),
     # namespaces
     path("2004/em-rdf", views.namespaces, {"namespace": "em-rdf"}),
     path("2005/app-update", views.namespaces, {"namespace": "update"}),

diff --git a/bedrock/mozorg/templates/mozorg/gpc.json b/bedrock/mozorg/templates/mozorg/gpc.json
@@ -0,0 +1,4 @@
+{
+  "gpc": true,
+  "lastUpdate": "2024-03-26"
+}
diff --git a/bedrock/mozorg/templates/mozorg/robots.txt b/bedrock/mozorg/templates/mozorg/robots.txt
@@ -6,5 +6,6 @@ disallow: /*/firstrun/
 disallow: /*/newsletter/existing/
 disallow: /*/whatsnew/
 disallow: /*/etc/
+disallow: /*/privacy/websites/cookie-settings/
 {% endif -%}
 Sitemap: {{ request.scheme }}://{{ request.get_host() }}/sitemap.xml
diff --git a/bedrock/mozorg/templatetags/misc.py b/bedrock/mozorg/templatetags/misc.py
@@ -27,6 +27,16 @@
 ALL_FX_PLATFORMS = ("windows", "linux", "mac", "android", "ios")
 
 
+@library.global_function
+def needs_data_consent(country_code):
+    """
+    Global helper that can be passed a country_code via a template
+    in order to determine if cookie consent banner should be shown.
+    """
+    country_list = settings.DATA_CONSENT_COUNTRIES
+    return country_code in country_list
+
+
 def _strip_img_prefix(url):
     return re.sub(r"^/?img/", "", url)
 

diff --git a/bedrock/mozorg/tests/test_helper_misc.py b/bedrock/mozorg/tests/test_helper_misc.py
@@ -1180,3 +1180,47 @@ def test_fxa_button_email(self):
             '&utm_source=mozilla.org-firefox-whatsnew73&utm_medium=referral&utm_campaign=whatsnew73"'
         )
         self.assertEqual(markup, expected)
+
+
+@pytest.mark.parametrize(
+    "country_code, expected",
+    [
+        ("AT", "True"),  # Austria
+        ("BE", "True"),  # Belgium
+        ("BG", "True"),  # Bulgaria
+        ("HR", "True"),  # Croatia
+        ("CY", "True"),  # Republic of Cyprus
+        ("CZ", "True"),  # Czech Republic
+        ("DK", "True"),  # Denmark
+        ("EE", "True"),  # Estonia
+        ("FI", "True"),  # Finland
+        ("FR", "True"),  # France
+        ("DE", "True"),  # Germany
+        ("GR", "True"),  # Greece
+        ("HU", "True"),  # Hungary
+        ("IE", "True"),  # Ireland
+        ("IS", "True"),  # Iceland
+        ("IT", "True"),  # Italy
+        ("LV", "True"),  # Latvia
+        ("LI", "True"),  # Liechtenstein
+        ("LT", "True"),  # Lithuania
+        ("LU", "True"),  # Luxembourg
+        ("MT", "True"),  # Malta
+        ("NL", "True"),  # Netherlands
+        ("NO", "True"),  # Norway
+        ("PL", "True"),  # Poland
+        ("PT", "True"),  # Portugal
+        ("RO", "True"),  # Romania
+        ("SK", "True"),  # Slovakia
+        ("SI", "True"),  # Slovenia
+        ("ES", "True"),  # Spain
+        ("SE", "True"),  # Sweden
+        ("CH", "True"),  # Switzerland
+        ("GB", "True"),  # United Kingdom
+        ("US", "False"),  # United States
+        ("CA", "False"),  # Canada
+    ],
+)
+def test_needs_data_consent(country_code, expected):
+    template = "{{ needs_data_consent('%s') }}" % country_code
+    assert render(template) == expected
diff --git a/bedrock/mozorg/views.py b/bedrock/mozorg/views.py
@@ -72,6 +72,13 @@ class SecurityDotTxt(RequireSafeMixin, TemplateView):
     content_type = "text/plain"
 
 
+class GpcDotJson(RequireSafeMixin, TemplateView):
+    # https://github.com/mozilla/bedrock/issues/14213
+    # served under .well-known/gpc.json
+    template_name = "mozorg/gpc.json"
+    content_type = "application/json"
+
+
 NAMESPACES = {
     "addons-bl": {
         "namespace": "http://www.mozilla.org/2006/addons-blocklist",