Merged in ^/personal/henrik/6.79.1-gdpr@15180 containing GDPR-adaptations.

 - Legacy-Id: 15181

Author: levkowetz

changelog

@@ -1,3 +1,67 @@
+ietfdb (6.81.0) ietf; urgency=medium
+
+  This release contains code and schema changes necessary for compliance
+  with the European GDPR (General Data Protection Regulation).  It provides
+  necessary GUI and internal changes, but lacks some admin utilities, and
+  also data migration routines which takes some time to run, and therefore
+  will be packaged in a separate release and applied separately.
+
+  From the commit log:
+
+  * Updated the personal information page with reviewed text from legal 
+    counsel.  Fixes issue #2503.
+
+  * Removed the Person.address field, which is not being used.  This was a 
+    legacy from the 2001 perl-based datatracker tables.  Fixes issue #2504.
+
+  * Added django-simple-history and replaced the old (and unused) 
+    PersonHistory class with a history=HistoricalRecords() field on Person.  
+    Added the needed migrations and changes to admin, resources, and settings.  
+    Related to issues #2505 and #2507.
+
+  * Added a new field name_from_draft to Person, to hold the name field 
+    equivalent as captured from drafts, in case name has been modified by the 
+    user and we're asked to remove that info under GDPR.  Added history for 
+    Email, and also an origin field to capture from where we got an email 
+    address (draft name, username, meeting registration, etc.)  Added a 
+    log.assertion() to Email.save() in order to ensure we don't create any 
+    email without setting origin.
+
+  * Added origin information to all places where we create email address 
+    entries.
+
+  * Removed all references to the removed Person.affiliation field.
+
+  * Added email origin information to some function calls that needed it.
+
+  * Overwrite earlier email origin when we've picked up the address from a 
+    submission.
+
+  * Added a consent field to the Person model.
+
+  * Disallow profile changes without consent given.  Together with previous 
+    commits this fixes issues #2505 and #2507.
+
+  * Added another category of personal information to the 
+    personal-information page, after review of personal information in the 
+    code.  Completes issue #2501.
+
+  * Added a dagger at the end of some fields in the account data forms to 
+    signify consent-based fields, and made the consent field required.
+
+  * Simplified the email.origin assignment code for outgoing liaisons.
+
+  * Fixed a long-standing bug in the liaison.name() code.
+
+  * Added assingment of the person.name_from_draft field on draft 
+    submission.
+
+
+  * Updated the edit_profile template with information about consent-based 
+    fields.  Fixes issue #2502.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  28 May 2018 11:15:34 +0000
+
 ietfdb (6.80.1) ietf; urgency=medium
 
   This is a bugfix release which also clears the slate for the upcoming

ietf/doc/tests_draft.py

@@ -1001,7 +1001,7 @@ def test_doc_change_shepherd_email(self):
         doc.shepherd = Email.objects.get(person__user__username="plain")
         doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_shepherd", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
-        new_email = Email.objects.create(address="anotheremail@example.com", person=doc.shepherd.person)
+        new_email = Email.objects.create(address="anotheremail@example.com", person=doc.shepherd.person, origin=doc.shepherd.person.user.username)
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
@@ -1435,8 +1435,8 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
-        p = Person.objects.create(address="basea_author")
-        e = Email.objects.create(address="basea_author@example.com", person=p)
+        p = PersonFactory(name=u"basea_author")
+        e = Email.objects.create(address="basea_author@example.com", person=p, origin=p.user.username)
         self.basea.documentauthor_set.create(person=p, email=e, order=1)
 
         self.baseb = Document.objects.create(
@@ -1448,8 +1448,8 @@ def setUp(self):
             expires=datetime.datetime.now() - datetime.timedelta(days = 365 - settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
-        p = Person.objects.create(name="baseb_author")
-        e = Email.objects.create(address="baseb_author@example.com", person=p)
+        p = PersonFactory(name=u"baseb_author")
+        e = Email.objects.create(address="baseb_author@example.com", person=p, origin=p.user.username)
         self.baseb.documentauthor_set.create(person=p, email=e, order=1)
 
         self.replacea = Document.objects.create(
@@ -1461,8 +1461,8 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
-        p = Person.objects.create(name="replacea_author")
-        e = Email.objects.create(address="replacea_author@example.com", person=p)
+        p = PersonFactory(name=u"replacea_author")
+        e = Email.objects.create(address="replacea_author@example.com", person=p, origin=p.user.username)
         self.replacea.documentauthor_set.create(person=p, email=e, order=1)
 
         self.replaceboth = Document.objects.create(
@@ -1474,8 +1474,8 @@ def setUp(self):
             expires=datetime.datetime.now() + datetime.timedelta(days = settings.INTERNET_DRAFT_DAYS_TO_EXPIRE),
             group=mars_wg,
         )
-        p = Person.objects.create(name="replaceboth_author")
-        e = Email.objects.create(address="replaceboth_author@example.com", person=p)
+        p = PersonFactory(name=u"replaceboth_author")
+        e = Email.objects.create(address="replaceboth_author@example.com", person=p, origin=p.user.username)
         self.replaceboth.documentauthor_set.create(person=p, email=e, order=1)
 
         self.basea.set_state(State.objects.get(used=True, type="draft", slug="active"))

ietf/doc/views_draft.py

@@ -954,6 +954,9 @@ def edit_shepherd(request, name):
                 events = []
 
                 doc.shepherd = form.cleaned_data['shepherd']
+                if doc.shepherd and not doc.shepherd.origin:
+                    doc.shepherd.origin = 'shepherd: %s' % doc.name
+                    doc.shepherd.save()
 
                 c = DocEvent(type="added_comment", doc=doc, rev=doc.rev, by=request.user.person)
                 c.desc = "Document shepherd changed to "+ (doc.shepherd.person.name if doc.shepherd else "(None)")

ietf/doc/views_search.py

@@ -175,7 +175,6 @@ def retrieve_search_results(form, all_types=False):
     if by == "author":
         docs = docs.filter(
             Q(documentauthor__person__alias__name__icontains=query["author"]) |
-            Q(documentauthor__person__affiliation__icontains=query["author"]) |
             Q(documentauthor__person__email__address__icontains=query["author"])
         )
     elif by == "group":

ietf/group/views.py

@@ -958,6 +958,10 @@ def diff(attr, name):
                     group.role_set.filter(name=slug).delete()
                     for e in new:
                         Role.objects.get_or_create(name_id=slug, email=e, group=group, person=e.person)
+                        if not e.origin or e.origin == e.person.user.username:
+                            e.origin = "role: %s %s" % (group.acronym, slug)
+                            e.save()
+
                     added = set(new) - set(old)
                     deleted = set(old) - set(new)
                     if added:
@@ -1206,6 +1210,9 @@ def stream_edit(request, acronym):
                 group.role_set.filter(name=slug).delete()
                 for e in new:
                     Role.objects.get_or_create(name_id=slug, email=e, group=group, person=e.person)
+                    if not e.origin or e.origin == e.person.user.username:
+                        e.origin = "role: %s %s" % (group.acronym, slug)
+                        e.save()
 
             return redirect("ietf.group.views.streams")
     else:

ietf/help/tests_views.py

@@ -7,7 +7,7 @@
 from ietf.utils.test_utils import TestCase
 from ietf.doc.models import StateType
 
-class StateHelpTest(TestCase):
+class HelpPageTests(TestCase):
 
     def test_state_index(self):
         url = reverse('ietf.help.views.state_index')
@@ -21,3 +21,7 @@ def test_state_index(self):
                 self.assertIn(name, content)
 
 
+    def test_personal_information_help(self):
+        r = self.client.get('/help/personal-information')
+        self.assertContains(r, 'personal information')
+        self.assertContains(r, 'GDPR')

ietf/help/urls.py

@@ -1,3 +1,6 @@
+# Copyright The IETF Trust 2013-2018, All Rights Reserved
+
+from django.views.generic import TemplateView
 
 from ietf.help import views
 from ietf.utils.urls import url
@@ -6,5 +9,6 @@
     url(r'^state/(?P<doc>[-\w]+)/(?P<type>[-\w]+)/?$', views.state),
     url(r'^state/(?P<doc>[-\w]+)/?$', views.state),
     url(r'^state/?$', views.state_index),
+    url(r'^personal-information/?$', TemplateView.as_view(template_name='help/personal-information.html'), name='personal-information'),
 ]
 

ietf/ietfauth/forms.py

@@ -1,3 +1,7 @@
+# Copyright The IETF Trust 2016, All Rights Reserved
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function
+
 import re
 from unidecode import unidecode
 
@@ -94,6 +98,9 @@ class PersonForm(forms.ModelForm):
         class Meta:
             model = Person
             exclude = exclude_list
+            widgets = {
+                'consent': forms.widgets.CheckboxInput,
+            }            
 
         def __init__(self, *args, **kwargs):
             super(PersonForm, self).__init__(*args, **kwargs)
@@ -105,6 +112,12 @@ def __init__(self, *args, **kwargs):
             if self.initial.get("ascii") == self.initial.get("name"):
                 self.initial["ascii"] = ""
 
+            for f in ['name', 'ascii', 'ascii_short', 'biography', 'photo', 'photo_thumb', ]:
+                if f in self.fields:
+                    self.fields[f].label += ' \u2020'
+
+            self.fields["consent"].required = True
+
             self.unidecoded_ascii = False
 
             if self.data and not self.data.get("ascii", "").strip():
@@ -135,6 +148,11 @@ def clean_ascii_short(self):
             prevent_system_name(name)
             return ascii_cleaner(name)
 
+        def clean_consent(self):
+            consent = self.cleaned_data.get('consent')
+            if consent == False:
+                raise forms.ValidationError("In order to modify your profile data, you must permit the IETF to use the uploaded data.")
+
     return PersonForm(*args, **kwargs)
 
 

ietf/ietfauth/tests.py

@@ -207,9 +207,9 @@ def test_profile(self):
             "name": u"Test Nãme",
             "ascii": u"Test Name",
             "ascii_short": u"T. Name",
-            "address": "Test address",
             "affiliation": "Test Org",
             "active_emails": email_address,
+            "consent": True,
         }
 
         # edit details - faulty ASCII
@@ -309,7 +309,7 @@ def test_reset_password(self):
         user.set_password("forgotten")
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
-        Email.objects.create(address=user.username, person=p)
+        Email.objects.create(address=user.username, person=p, origin=user.username)
 
         # get
         r = self.client.get(url)
@@ -419,7 +419,7 @@ def test_change_password(self):
         user.set_password("password")
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
-        Email.objects.create(address=user.username, person=p)
+        Email.objects.create(address=user.username, person=p, origin=user.username)
 
         # log in
         r = self.client.post(redir_url, {"username":user.username, "password":"password"})
@@ -466,8 +466,8 @@ def test_change_username(self):
         user.set_password("password")
         user.save()
         p = Person.objects.create(name="Some One", ascii="Some One", user=user)
-        Email.objects.create(address=user.username, person=p)
-        Email.objects.create(address="othername@example.org", person=p)        
+        Email.objects.create(address=user.username, person=p, origin=user.username)
+        Email.objects.create(address="othername@example.org", person=p, origin=user.username)
 
         # log in
         r = self.client.post(redir_url, {"username":user.username, "password":"password"})

ietf/ietfauth/views.py

@@ -172,7 +172,7 @@ def confirm_account(request, auth):
                     Alias.objects.create(person=person, name=name)
 
             if not email_obj:
-                email_obj = Email.objects.create(address=email, person=person)
+                email_obj = Email.objects.create(address=email, person=person, origin=user.username)
             else:
                 if not email_obj.person:
                     email_obj.person = person
@@ -251,6 +251,8 @@ def profile(request):
                 email.primary = email.address == primary_email
                 if email.primary and not email.active:
                     email.active = True
+                if not email.origin:
+                    email.origin = person.user.username
                 email.save()
 
             # Make sure the alias table contains any new and/or old names.
@@ -293,7 +295,7 @@ def confirm_new_email(request, auth):
     can_confirm = form.is_valid() and email
     new_email_obj = None
     if request.method == 'POST' and can_confirm and request.POST.get("action") == "confirm":
-        new_email_obj = Email.objects.create(address=email, person=person)
+        new_email_obj = Email.objects.create(address=email, person=person, origin=username)
 
     return render(request, 'registration/confirm_new_email.html', {
         'username': username,