From c6de919e58abf56d857da000308321fa51ee5958 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Fri, 21 Jun 2019 13:31:44 +0200
Subject: [PATCH 6/6] =?UTF-8?q?derni=C3=A8res=20remarques=20(to=20rebase)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../authentic2/manager/user_import.html       |  18 ++--
 .../manager/user_import_report.html           |   2 +-
 .../templates/authentic2/manager/users.html   |   6 +-
 src/authentic2/manager/user_import.py         |   1 +
 src/authentic2/manager/user_views.py          |  18 +++-
 src/authentic2/manager/views.py               |   9 +-
 tests/test_user_manager.py                    | 100 ++++++++++++++++++
 7 files changed, 136 insertions(+), 18 deletions(-)

diff --git a/src/authentic2/manager/templates/authentic2/manager/user_import.html b/src/authentic2/manager/templates/authentic2/manager/user_import.html
index 8a64f507..f8213ca6 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_import.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_import.html
@@ -11,7 +11,7 @@
 {% block breadcrumb %}
   {{ block.super }}
   <a href="{% url 'a2-manager-users' %}">{% trans 'Users' %}</a>
-  <a href="{% url 'a2-manager-users-imports' %}">{% trans 'Import' %}</a>
+  <a href="{% url 'a2-manager-users-imports' %}">{% trans 'Imports' %}</a>
   <a href="{% url 'a2-manager-users-import' uuid=user_import.uuid %}">{% trans "User Import" %} {{ user_import.created }}</a>
 {% endblock %}
 
@@ -19,11 +19,11 @@
   <aside id="sidebar">
     <div>
       <h3>{% trans "Modify import" %}</h3>
-      <form method="post">
+      <form method="post" id="action-form">
         {% csrf_token %}
         {{ form|with_template }}
         <div class="buttons">
-          <button name="create">{% trans "Modify" %}</button>
+          <button name="modify">{% trans "Modify" %}</button>
           <button name="simulate">{% trans "Simulate" %}</button>
           <button name="execute">{% trans "Execute" %}</button>
         </div>
@@ -31,7 +31,7 @@
     </div>
     <div>
       <h3>{% trans "Download" %}</h3>
-      <form action="download/{{ user_import.filename }}">
+      <form action="download/{{ user_import.filename }}" id="download-form">
         <div class="buttons">
           <button>{% trans "Download" %}</button>
         </div>
@@ -55,11 +55,11 @@
     </thead>
     <tbody>
       {% for report in reports %}
-        <tr>
-          <td>{% if report.state != 'running' %}<a href="{% url "a2-manager-users-import-report" import_uuid=user_import.uuid report_uuid=report.uuid %}">{{ report.created }}</a>{% else %}{{ report.created }}{% endif %}</td>
-          <td>{{ report.state }} {% if report.state == 'error' %}"{{ report.exception }}"{% endif %}</td>
-          <td>{% if not report.simulate %}<span class="icon-check"></span>{% endif %}</td>
-          <td>{% if report.simulate %}<form method="post">{% csrf_token %}<button name="delete" value="{{ report.uuid }}">{% trans "Delete" %}</button></form>{% endif %}</td>
+        <tr data-uuid="{{ report.uuid }}">
+          <td class="created">{% if report.state != 'running' %}<a href="{% url "a2-manager-users-import-report" import_uuid=user_import.uuid report_uuid=report.uuid %}">{{ report.created }}</a>{% else %}{{ report.created }}{% endif %}</td>
+          <td class="state"><span>{{ report.state }}</span> {% if report.state == 'error' %}"{{ report.exception }}"{% endif %}</td>
+          <td class="applied">{% if not report.simulate %}<span class="icon-check"></span>{% endif %}</td>
+          <td class="delete-action">{% if report.simulate %}<form method="post" id="delete-form-{{ report.uuid }}">{% csrf_token %}<button name="delete" value="{{ report.uuid }}">{% trans "Delete" %}</button></form>{% endif %}</td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_import_report.html b/src/authentic2/manager/templates/authentic2/manager/user_import_report.html
index 04694652..f6abdb8f 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_import_report.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_import_report.html
@@ -11,7 +11,7 @@
 {% block breadcrumb %}
   {{ block.super }}
   <a href="{% url 'a2-manager-users' %}">{% trans 'Users' %}</a>
-  <a href="{% url 'a2-manager-users-imports' %}">{% trans 'Import' %}</a>
+  <a href="{% url 'a2-manager-users-imports' %}">{% trans 'Imports' %}</a>
   <a href="{% url 'a2-manager-users-import' uuid=user_import.uuid %}">{% trans "User Import" %} {{ user_import.created }}</a>
   <a href="{% url 'a2-manager-users-import-report' import_uuid=user_import.uuid report_uuid=report.uuid%}">{{ report_title }} {{ report.created }}</a>
 {% endblock %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/users.html b/src/authentic2/manager/templates/authentic2/manager/users.html
index f07c975e..7d4ff5be 100644
--- a/src/authentic2/manager/templates/authentic2/manager/users.html
+++ b/src/authentic2/manager/templates/authentic2/manager/users.html
@@ -21,9 +21,13 @@
          {% trans "Add user" %}
      </a>
    {% endif %}
+   {% if extra_actions %}
      <ul class="extra-actions-menu">
-       <li><a href="{% url "a2-manager-users-imports" %}">{% trans 'Import Users' %}</a></li>
+       {% for extra_action in extra_actions %}
+         <li><a href="{{ extra_action.url }}">{{ extra_action.label }}</a></li>
+       {% endfor %}
      </ul>
+   {% endif %}
   </span>
 
 {% endblock %}
diff --git a/src/authentic2/manager/user_import.py b/src/authentic2/manager/user_import.py
index 0f94ea45..ce595693 100644
--- a/src/authentic2/manager/user_import.py
+++ b/src/authentic2/manager/user_import.py
@@ -186,6 +186,7 @@ class Report(object):
                     data['exception'] = exception
                     data['importer'] = importer
         t = threading.Thread(target=target)
+        t.daemon = True
         with self.data_update as data:
             data['state'] = 'running'
         if start:
diff --git a/src/authentic2/manager/user_views.py b/src/authentic2/manager/user_views.py
index 002fc553..915f8323 100644
--- a/src/authentic2/manager/user_views.py
+++ b/src/authentic2/manager/user_views.py
@@ -42,7 +42,7 @@ from django_rbac.utils import get_role_model, get_role_parenting_model, get_ou_m
 from .views import (BaseTableView, BaseAddView, BaseEditView, ActionMixin,
                     OtherActionsMixin, Action, ExportMixin, BaseSubTableView,
                     HideOUColumnMixin, BaseDeleteView, BaseDetailView,
-                    PermissionMixin)
+                    PermissionMixin, MediaMixin)
 from .tables import UserTable, UserRolesTable, OuUserRolesTable
 from .forms import (UserSearchForm, UserAddForm, UserEditForm,
                     UserChangePasswordForm, ChooseUserRoleForm,
@@ -110,6 +110,12 @@ class UsersView(HideOUColumnMixin, BaseTableView):
             ou = self.search_form.cleaned_data.get('ou')
         if ou and self.request.user.has_ou_perm('custom_user.add_user', ou):
             ctx['add_ou'] = ou
+        extra_actions = ctx['extra_actions'] = []
+        if self.request.user.has_perm('custom_user.admin_user'):
+            extra_actions.append({
+                'url': reverse('a2-manager-users-imports'),
+                'label': _('Import users'),
+            })
         return ctx
 
 
@@ -626,8 +632,10 @@ class UserDeleteView(BaseDeleteView):
 user_delete = UserDeleteView.as_view()
 
 
-class UserImportsView(PermissionMixin, FormView):
+class UserImportsView(MediaMixin, PermissionMixin, FormView):
     form_class = UserNewImportForm
+    permissions = ['custom_user.admin_user']
+    permissions_global = True
     template_name = 'authentic2/manager/user_imports.html'
 
     def post(self, request, *args, **kwargs):
@@ -656,9 +664,10 @@ class UserImportsView(PermissionMixin, FormView):
 user_imports = UserImportsView.as_view()
 
 
-class UserImportView(PermissionMixin, FormView):
+class UserImportView(MediaMixin, PermissionMixin, FormView):
     form_class = UserEditImportForm
     permissions = ['custom_user.admin_user']
+    permissions_global = True
     template_name = 'authentic2/manager/user_import.html'
 
     def dispatch(self, request, uuid, **kwargs):
@@ -715,9 +724,10 @@ class UserImportView(PermissionMixin, FormView):
 user_import = UserImportView.as_view()
 
 
-class UserImportReportView(PermissionMixin, TemplateView):
+class UserImportReportView(MediaMixin, PermissionMixin, TemplateView):
     form_class = UserEditImportForm
     permissions = ['custom_user.admin_user']
+    permissions_global = True
     template_name = 'authentic2/manager/user_import_report.html'
 
     def dispatch(self, request, import_uuid, report_uuid):
diff --git a/src/authentic2/manager/views.py b/src/authentic2/manager/views.py
index bc9674e1..6c7a4a30 100644
--- a/src/authentic2/manager/views.py
+++ b/src/authentic2/manager/views.py
@@ -101,6 +101,7 @@ class MediaMixin(object):
 class PermissionMixin(object):
     '''Control access to views based on permissions'''
     permissions = None
+    permissions_global = False
 
     def authorize(self, request, *args, **kwargs):
         if hasattr(self, 'model'):
@@ -130,9 +131,11 @@ class PermissionMixin(object):
                     and not request.user.has_perm_any(self.permissions):
                 raise PermissionDenied
         else:
-            if self.permissions \
-                    and not request.user.has_perm_any(self.permissions):
-                raise PermissionDenied
+            if self.permissions:
+                if self.permissions_global and not request.user.has_perms(self.permissions):
+                    raise PermissionDenied
+                if not self.permissions_global and not request.user.has_perm_any(self.permissions):
+                    raise PermissionDenied
 
     def dispatch(self, request, *args, **kwargs):
         response = self.authorize(request, *args, **kwargs)
diff --git a/tests/test_user_manager.py b/tests/test_user_manager.py
index 12621670..f7febcc9 100644
--- a/tests/test_user_manager.py
+++ b/tests/test_user_manager.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # authentic2 - versatile identity manager
 # Copyright (C) 2010-2019 Entr'ouvert
 #
@@ -14,6 +15,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import csv
+import time
+
+from webtest import Upload
 
 from django.core.urlresolvers import reverse
 
@@ -25,6 +29,7 @@ from django_rbac.utils import get_ou_model
 from authentic2.custom_user.models import User
 from authentic2.models import Attribute, AttributeValue
 from authentic2.a2_rbac.utils import get_default_ou
+from authentic2.manager import user_import
 
 
 from utils import login, get_link_from_mail, skipif_sqlite
@@ -210,3 +215,98 @@ def test_user_table(app, admin, user_ou1, ou1):
 
     response = app.get('/manage/users/?search-ou=%s' % ou1.id)
     assert response.pyquery('td.username')
+
+
+def test_user_import(transactional_db, app, admin, ou1, admin_ou1, media):
+    Attribute.objects.create(name='phone', kind='phone_number', label='Numéro de téléphone')
+
+    user_count = User.objects.count()
+
+    assert Attribute.objects.count() == 3
+
+    response = login(app, admin, '/manage/users/')
+
+    response = response.click('Import users')
+    response.form.set('import_file',
+                      Upload(
+                          'users.csv',
+                          u'''email key verified,first_name,last_name,phone
+tnoel@entrouvert.com,Thomas,Noël,1234
+fpeters@entrouvert.com,Frédéric,Péters,5678
+x,x,x,x'''.encode('utf-8'),
+                          'application/octet-stream'))
+    response.form.set('encoding', 'utf-8')
+    response.form.set('ou', str(get_default_ou().pk))
+    response = response.form.submit()
+
+    imports = list(user_import.UserImport.all())
+    assert len(imports) == 1
+    _import_uuid = response.location.split('/')[-2]
+    _import = user_import.UserImport(uuid=_import_uuid)
+    assert _import.exists()
+
+    response = response.follow()
+    response = response.forms['action-form'].submit(name='simulate')
+
+    reports = list(_import.reports)
+    assert len(reports) == 1
+    uuid = reports[0].uuid
+
+    response = response.follow()
+
+    def assert_timeout(duration, wait_function):
+        start = time.time()
+        while True:
+            result = wait_function()
+            if result is not None:
+                return result
+            assert time.time() - start < duration, '%s timed out after %s seconds' % (wait_function, duration)
+            time.sleep(0.001)
+
+    def wait_finished():
+        new_resp = response.click('User Import')
+        if new_resp.pyquery('tr[data-uuid="%s"] td.state span' % uuid).text() == 'finished':
+            return new_resp
+
+    simulate = reports[0]
+    assert simulate.simulate
+
+    response = assert_timeout(20, wait_finished)
+
+    response = response.click(href=simulate.uuid)
+
+    assert len(response.pyquery('table.main tbody tr')) == 3
+    assert len(response.pyquery('table.main tbody tr.row-valid')) == 2
+    assert len(response.pyquery('table.main tbody tr.row-invalid')) == 1
+
+    assert User.objects.count() == user_count
+
+    response = response.click('User Import')
+    response = response.forms['action-form'].submit(name='execute')
+
+    execute = list(report for report in _import.reports if not report.simulate)[0]
+    uuid = execute.uuid
+
+    response = response.follow()
+    response = assert_timeout(20, wait_finished)
+
+    assert User.objects.count() == user_count + 2
+    assert User.objects.filter(
+        email='tnoel@entrouvert.com',
+        first_name=u'Thomas',
+        last_name=u'Noël',
+        attribute_values__content='1234').count() == 1
+    assert User.objects.filter(
+        email='fpeters@entrouvert.com',
+        first_name=u'Frédéric',
+        last_name=u'Péters',
+        attribute_values__content='5678').count() == 1
+
+    # logout
+    app.session.flush()
+    response = login(app, admin_ou1, '/manage/users/')
+
+    app.get('/manage/users/import/', status=403)
+    app.get('/manage/users/import/%s/' % _import.uuid, status=403)
+    app.get('/manage/users/import/%s/%s/' % (_import.uuid, simulate.uuid), status=403)
+    app.get('/manage/users/import/%s/%s/' % (_import.uuid, execute.uuid), status=403)
-- 
2.20.1