Merge lp:~cjwatson/canonical-identity-provider/central-terms into lp:canonical-identity-provider/release

[Colin Watson]

Refer to terms of service and data privacy policy on www.ubuntu.com rather than locally.

I couldn't entirely get rid of the local terms of service text because of /terms/embedded/, but that shouldn't be a major problem for now.

[Daniel Manrique (roadmr)]

+1, thanks!

Not sure about terms/embedded but we could tackle that later.

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/canonical-identity-provider/152/

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2018-05-10 20:08:13 +0000
+++ django_project/settings_base.py	2018-05-23 17:32:45 +0000
@@ -462,6 +462,7 @@
 PREFLIGHT_TABLE_CLASS = 'listing'
 PREPEND_WWW = False
 PRE_AUTHORIZATION_VALIDITY = 2
+PRIVACY_POLICY_URL = 'https://www.ubuntu.com/legal/dataprivacy'
 PROFANITIES_LIST = []
 PROFILE_FILENAME = 'sso.profile'
 PROFILE_PATTERN = '(api|identityprovider|ubuntu_sso_saml|webui)\\..*'
@@ -578,7 +579,8 @@
         },
     }
 ]
-TERMS_OF_SERVICE_URL = 'https://login.ubuntu.com/terms/'
+TERMS_OF_SERVICE_URL = (
+    'https://www.ubuntu.com/legal/terms-and-policies/terms-of-service')
 TESTING = False
 THOUSAND_SEPARATOR = ','
 THROTTLE_MAX_REQUESTS = 3600

=== modified file 'src/webui/templates/_footer.html'
--- src/webui/templates/_footer.html	2018-05-10 20:08:13 +0000
+++ src/webui/templates/_footer.html	2018-05-23 17:32:45 +0000
@@ -10,8 +10,8 @@
 <p class="title">{% trans "Ubuntu One. One place to log in to everything on Ubuntu." %}</p>
 <p class="links">
 {% spaceless %}
-<a href="{% url 'terms_and_conditions' %}">{% trans "Terms" %}</a>&nbsp;&middot;&nbsp;
-<a href="{% url 'privacy_policy' %}">{% trans "Privacy" %}</a>&nbsp;&middot;&nbsp;
+<a href="{{ 'terms_of_service'|static_url }}">{% trans "Terms" %}</a>&nbsp;&middot;&nbsp;
+<a href="{{ 'privacy_policy'|static_url }}">{% trans "Privacy" %}</a>&nbsp;&middot;&nbsp;
 <a href="{{ 'support_form'|static_url }}">{% trans "Support" %}</a>&nbsp;&middot;&nbsp;
 <a href="{{ 'dp_bugs'|static_url }}">{% trans "Report a bug on this site" %}</a>
 {% block language_footer %}

=== modified file 'src/webui/templates/registration/_create_account_form.html'
--- src/webui/templates/registration/_create_account_form.html	2017-02-26 01:29:52 +0000
+++ src/webui/templates/registration/_create_account_form.html	2018-05-23 17:32:45 +0000
@@ -71,7 +71,7 @@
 
         {{ create_form.accept_tos }}
 
-        <label for="id_accept_tos">{% blocktrans with "terms_of_service"|static_url as tos_url %}I have read and accept the <a href='{{ tos_url }}' class='external' target="_blank">Ubuntu One terms of service</a>{% endblocktrans %}</label>
+	<label for="id_accept_tos">{% blocktrans with tos_url="terms_of_service"|static_url privacy_url="privacy_policy"|static_url %}I have read and accept the <a href="{{ tos_url }}" class="external" target="_blank">Ubuntu One terms of service</a> and <a href="{{ privacy_url }}" class="external" target="_blank">data privacy policy</a>{% endblocktrans %}</label>
 
     </div>
 

=== removed file 'src/webui/templates/static/privacy.html'
--- src/webui/templates/static/privacy.html	2014-07-30 18:05:14 +0000
+++ src/webui/templates/static/privacy.html	1970-01-01 00:00:00 +0000
@@ -1,348 +0,0 @@
-{% extends "base.html" %}
-{% load i18n static_url %}
-{% block title %}{% blocktrans %}Privacy Policy{% endblocktrans %}{% endblock %}
-{% block text_title %}<h1 class="u1-h-main">{% trans "Canonical Privacy Policy" %}</h1>{% endblock %}
-{% block content %}
-<div class="legal">
-  <div class="account-faq">
-    <div class="box">
-      <div class="title">
-        <h3>{% trans 'Table of Contents' %}</h3>
-      </div>
-      <div class="body">
-        <ul class="questions">
-          <li><a href="{% url 'privacy_policy' %}#what-we-collect">{% trans "What we collect" %}</a></li>
-          <li><a href="{% url 'privacy_policy' %}#what-we-do-with-what-we-collect">{% trans "What we do with data" %}</a></li>
-          <li><a href="{% url 'privacy_policy' %}#access">{% trans "Access" %}</a></li>
-          <li><a href="{% url 'privacy_policy' %}#cookies">{% trans "Cookies" %}</a></li>
-          <li><a href="{% url 'privacy_policy' %}#how-do-we-protect-what-we-collect">{% trans "How do we protect what we collect" %}</a></li>
-          <li><a href="{% url 'privacy_policy' %}#what-happens-if-the-terms-change">{% trans "What happens if these terms change" %}</a></li>
-          <li><a href="{% url 'privacy_policy' %}#legal-notice">{% trans "Legal Notice" %}</a></li>
-          <li><a href="{% url 'privacy_policy' %}#how-to-contact-us">{% trans "How to contact us" %}</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-  <div class="content-updates">
-    <p>
-    {% blocktrans %}
-    <strong>What’s changed?</strong> On Thursday 18th October 2012 we updated our privacy policies by consolidating them into one document.
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    <strong>Why?</strong> We care about your privacy and want to ensure that it is clear what personal information we are collecting from you, when we collect it and what we do with that personal information. By consolidating all of our policies into one place we hope that it will be easier for you to see what we're doing.
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    <strong>What's changed?</strong> Nothing. We're not doing anything different with your personal information. We're just making things clearer.
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    Please read the updated Privacy Policy to find out more.
-    {% endblocktrans %}
-    </p>
-  </div>
-
-  <div class="section" id="general">
-
-    <p>
-    {% blocktrans with canonical="http://www.canonical.com/" ubuntu="http://www.ubuntu.com/" %}
-    Canonical collects personal information from you in a number of different ways. For example, when you download one of our products, receive services from us or use one of our websites (including <a href="{{ canonical }}">www.canonical.com</a> and <a href="{{ ubuntu }}">www.ubuntu.com</a>).</p>
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    At Canonical, we consider your privacy to be extremely important to us. These are the fundamental principles that we follow in relation to your personal information:
-    {% endblocktrans %}
-    </p>
-
-    <ul class="items">
-      <li>
-      {% blocktrans %}
-      We don’t ask you for personal information unless we truly need it.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      We don't share your personal information with anyone except to provide you with services, products, to comply with the law, or to protect our rights
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      We don't store personal information unless required for the on-going operation of services to you, to provide you with products, to comply with law or to protect our rights.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      We will use personal information that you provide to us in accordance with this Privacy Policy.
-      {% endblocktrans %}
-      </li>
-    </ul>
-  </div>
-
-  <div class="section">
-    <h2 id="what-we-collect">{% trans "What we collect" %}</h2>
-
-    <p>
-    {% blocktrans %}
-    We may collect the following types of personal information from you:
-    {% endblocktrans %}
-    </p>
-
-    <ul class="items">
-      <li>
-      {% blocktrans %}
-      <strong>Websites</strong> - When you register to use certain parts of our websites, such as wikis or message boards, or register for free accounts, we may ask for personal information such as your full name, email address and a password.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      <strong>Chat rooms, forums and newsgroups</strong> - These are available to our community. Any information that you disclose in these areas becomes public information and may be recorded, archived and republished by anyone. Please exercise caution when deciding to disclose any personal information in such areas.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      <strong>Canonical products</strong> - When you register for services or purchase any product from Canonical, we may ask for information such as your email address, billing address, and credit card information. Credit card information is only used in processing your transaction. Please note that we may use a third party payment processing merchant to process your payments.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      <strong>Non-personally identifying information</strong> - Canonical may collect non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, referring site, and the date and time of each visitor's request. Our purpose in collecting non-personally identifying information is to better understand how visitors use our websites and services. For further information about ow we use cookies, see the “cookie” section below.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      <strong>Error reports</strong> - When you chose to send an error report, it includes a unique identifier for your computer. This identifier does not identify you, unless you (or someone acting on your behalf) discloses it separately. An error report may include personal information such as the state of programs that were running at the time. You can block future error reports from the privacy panel of System Settings.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans with url="http://www.ubuntu.com/aboutus/online-accounts-legal-notice" %}
-      <strong>Ubuntu Online Accounts</strong> - When you use Ubuntu Online Accounts, your personal information is stored on your PC and it can be accessed by some applications. <a href="{{ url }}">To see the legal notice explaining how we use this personal information, please click here.</a>
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      <strong>General</strong> - If you contact us and provide us with information, we may keep a record of that correspondence and information.
-      {% endblocktrans %}
-      </li>
-    </ul>
-
-  </div>
-
-  <div class="section">
-    <h2 id="what-we-do-with-what-we-collect">{% trans "What do we do with the information we collect" %}</h2>
-
-    <p>
-    {% blocktrans %}
-    We may use your information in the following ways:
-    {% endblocktrans %}
-    </p>
-
-    <ul class="items">
-      <li>
-      {% blocktrans %}
-      To authenticate access to certain features of our websites.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To contact you to respond to enquiries or to provide notices to you regarding your use of our websites or the provision of our services.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To provide services, products, process payment, and authenticate access (where required).
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To analyse the performance or the appropriateness of products or services.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To comply with legal and regulatory requirements (including responding to court orders, subpoenas and to prevent crime). These special circumstances may require us to disclose personal information.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To contact you if your actions violate your agreement with us (if any).
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To fix errors and analyse trends.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To study how anonymous users interact with our websites and services.
-      {% endblocktrans %}
-      </li>
-      <li>
-      {% blocktrans %}
-      To market our products or services to you.
-      {% endblocktrans %}
-      </li>
-    </ul>
-
-    <p>
-    {% blocktrans %}
-    Unless you have notified us otherwise, Canonical may occasionally send you email to tell you about new features, solicit feedback, or just to keep you up to date with what's going on. We may use various community websites (Launchpad Answers, Ubuntu Forums, blogs etc.) to communicate this type of information, so we expect to keep this type of information to a minimum. If you no longer wish to receive such communications from us, please follow the unsubscribe instructions provided in any of the communications, modify the communications preferences in your account or contact us using the contact details provided below.
-    {% endblocktrans %}
-    </p>
-  </div>
-
-  <div class="section">
-    <h2 id="access">{% trans "Access" %}</h2>
-
-    <p>
-    {% blocktrans %}
-    The information you provide to us will be held on computers and may be accessed by or given to our staff working inside and outside of the UK and to third parties, including contractors and companies within Canonical’s group, for the purposes set out in this Privacy Policy, i.e. to provide you with products or services, or as otherwise agreed with you.
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    You acknowledge that it may be necessary for your information to be processed by such parties and that it may be transferred to someone who provides a service to us in another country, including some outside of the European Economic Area, and you consent to such processing and transfer. If it is necessary to transfer your personal information outside of the European Economic Area we will make every effort to ensure that the person to whom we pass the personal information agrees to treat it with the same level of protection as we do.
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    If we are sold or merge with another business entity your personal information may be disclosed to our new business partners or owners.
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    Unless required by law, we will not otherwise share, sell or distribute any personal information you provide to us without your consent.
-    {% endblocktrans %}
-    </p>
-
-  </div>
-
-  <div class="section">
-    <h2 id="cookies">{% trans "Cookies" %}</h2>
-
-    <p>
-    {% blocktrans with url="#cookie-info" %}
-    We use persistent cookies to support a smooth user experience. This cookie remains on your computer after you close your browser and may be used by your browser on subsequent visits to our websites. We also use cookies to better understand how you interact with our websites and services and to improve our websites and services overall. <a href="{{ url }}">For a list of the cookies we use, please see the following table</a>
-    {% endblocktrans %}
-    </p>
-
-    <p>
-    {% blocktrans %}
-    If you do not wish to have cookies placed on your computers, please set your browsers to refuse cookies before visiting our websites and using our services.
-    {% endblocktrans %}
-    </p>
-
-  </div>
-
-  <div class="section">
-    <h3 id="cookie-info">{% trans "Cookie Information" %}</h3>
-
-    <table class="cookie-info">
-      <thead>
-        <tr>
-          <th class="cookie">{% trans "Cookie" %}</th>
-          <th class="cookie-name">{% trans "Name" %}</th>
-          <th class="purpose">{% trans "Purpose" %}</th>
-          <th>{% trans "More information" %}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td><span class="trc" title="site cookie acceptance">site cookie acceptance</span></td>
-          <td><span class="trc" title="_cookies_accepted">_cookies_accepted</span></td>
-          <td>{% blocktrans %}This cookie is used to record if a user has accepted the use of cookies on our website.{% endblocktrans %}</td>
-          <td>{% blocktrans %}To withdraw your consent after accepting this cookie, delete the _cookies_accepted cookie. Find out how at <a href="http://www.aboutcookies.org">Aboutcookies.org</a>{% endblocktrans %}</td>
-        </tr>
-        <tr>
-          <td><span class="trc" title="Google Analytics">Google Analytics</span></td>
-          <td><span class="trc" title="_utma _utmb _utmc _utmz">_utma _utmb _utmc _utmz</span></td>
-          <td>{% blocktrans %}These cookies are used to collect information about how visitors use our website, which we use to help improve it. The cookies collect information in an anonymous form, including the number of visitors to the site, where visitors have come to the site from and the pages they visited.{% endblocktrans %}</td>
-          <td>{% blocktrans %}Find out more about Google Analytics privacy please visit <a href="http://www.google.com/intl/en_uk/analytics/privacyoverview.htm">Google Analytics privacy overview</a>{% endblocktrans %}</td>
-        </tr>
-        <tr>
-          <td><span class="trc" title="Crazy egg">Crazyegg</span></td>
-          <td><span class="trc" title="_is_returning">_is_returning</span></td>
-          <td>{% blocktrans %}Crazyegg tracks javascript on some pages of our site to understand what links our visitors are clicking on. This helps us optimize our content for the best user experience. The Crazyegg script may store a cookie on your computer. This cookie may contain a session ID, a visitor ID and a few other dynamically created parameters that allow Crazyegg to track our site's traffic accurately. No personal information is stored within the cookie.{% endblocktrans %}</td>
-          <td>{% blocktrans %}For Crazy Egg's complete Privacy Policy please visit <span class="trc"><a href="http://www.crazyegg.com/privacy">Crazy Egg privacy policy</a></span>{% endblocktrans %}</td>
-        </tr>
-        <tr>
-          <td><span class="trc" title="Marketo Munchkin">Marketo Munchkin</span></td>
-          <td><span class="trc" title="_mkto_trk">_mkto_trk</span></td>
-          <td>{% blocktrans %}Marketo’s cookie allows us to track repeated visits to the website, and link each visit to the information voluntarily provided by the visitor. For example, if the visitor is asked to provide us with their    name, company name and email address, we will know the identity of the visitor when they visit the site at a later date, or when we send them email.{% endblocktrans %}</td>
-          <td>{% blocktrans %}For Marketo’s complete Privacy Policy please visit <a href="http://uk.marketo.com/trust/privacy.php">Marketo privacy statement</a>{% endblocktrans %}</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-
-  <div class="section">
-    <h2 id="how-do-we-protect-what-we-collect">{% trans "How do we protect the information we collect" %}</h2>
-    <p>
-    {% blocktrans %}
-    Canonical is very concerned about protecting the confidentiality of your personal information. We have security measures, including administrative, physical and electronic measures, to protect against the loss, exposure, misuse or alteration of information that we have collected from you in the use of the services. These measures include SSL data encryption to transmit your personal information as well as technical architectures and systems to prevent unauthorised third parties from accessing your personal information.
-    {% endblocktrans %}
-    </p>
-  </div>
-
-  <div class="section">
-    <h2 id="what-happens-if-the-terms-change">{% trans "What happens if these terms change" %}</h2>
-    <p>
-    {% blocktrans %}
-    Although most changes are likely to be minor, Canonical may change this Privacy Policy from time to time, and at Canonical's sole discretion. If the alterations constitute a material change to the Privacy Policy, we will notify you by email if you have provided your email address to us. What makes up a "material change" will be determined by Canonical, in good faith and using common sense and reasonable judgment. You may also check this page for any changes to this Privacy Policy.
-    {% endblocktrans %}
-    </p>
-
-  </div>
-
-  <div class="section">
-    <h2 id="legal-notice">{% trans "Legal notice" %}</h2>
-    {% url 'terms_and_conditions' as terms_url %}
-    <p>
-    {% blocktrans with url=terms_url%}
-    For further information on Canonical's terms and conditions please see the legal notice for our websites and our <a href="{{ url }}">terms of service</a> for Ubuntu One.
-    {% endblocktrans %}
-    </p>
-    <p>
-    {% blocktrans %}
-    For certain products and services we may also provide you with specific terms and conditions. Please refer to those specific legal notices for further information. This Privacy Policy is incorporated by reference into those legal notices.
-    {% endblocktrans %}
-    </p>
-  </div>
-
-  <div class="section">
-    <h2 id="how-to-contact-us">{% trans "How to contact us" %}</h2>
-
-    <p>
-    {% blocktrans with email="[e-mail]"%}
-    You have a right to access the personal information we hold about you or to obtain a copy of it. If you would like to do so please contact us by postal mail to the address below or, if your query is in relation to Ubuntu One, email <a href="mailto:{{ email }}">{{ email }}</a>.
-    {% endblocktrans %}
-    </p>
-    <p>
-    {% blocktrans with email="[e-mail]"%}
-    Please submit any questions or comments about this Privacy Policy, or about our use of your personal information by contacting us by postal mail at the following address: Canonical Group Ltd, 5th Floor, Blue Fin Building, 110 Southwark Street, London, England, SE1 0SU or by emailing us at <a href="mailto:{{ email }}">{{ email }}</a>.
-    {% endblocktrans %}
-    </p>
-  </div>
-
-  <div class="section">
-    <p>
-    {% blocktrans %}
-    Last updated - 18th October 2012</p>
-    {% endblocktrans %}
-    </p>
-  </div>
-
-</div>
-{% endblock %}

=== modified file 'src/webui/urls.py'
--- src/webui/urls.py	2018-02-15 11:27:21 +0000
+++ src/webui/urls.py	2018-05-23 17:32:45 +0000
@@ -2,7 +2,9 @@
 # the GNU Affero General Public License version 3 (see the file
 # LICENSE).
 
+from django.conf import settings
 from django.conf.urls import url
+from django.views.generic.base import RedirectView
 
 from identityprovider.models import AUTHTOKEN_PATTERN
 
@@ -122,11 +124,14 @@
     # the urls formerly know as Ubuntu One
     url(r'^one-redirect$', static_page, {'page_name': 'one-redirect'},
         name='one-redirect'),
-    url(r'^terms/$', static_page, {'page_name': 'terms'},
+    url(r'^terms/$', RedirectView.as_view(url=settings.TERMS_OF_SERVICE_URL),
         name='terms_and_conditions'),
+    # XXX cjwatson 2018-05-23: Is this still used?  If so, we need an
+    # embedded-themed version of this page on the legal site that we can
+    # redirect to.
     url(r'^terms/embedded/$', static_page, {'page_name': 'terms_embedded'},
         name='terms_and_conditions_embedded'),
-    url(r'^privacy/$', static_page, {'page_name': 'privacy'},
+    url(r'^privacy/$', RedirectView.as_view(url=settings.PRIVACY_POLICY_URL),
         name='privacy_policy'),
 ]