0001-association-failure-handled-9415.patch

Josué Kouka, 23 décembre 2015 17:44

Voir les différences: en ligne côte à côte

Subject: [PATCH] association failure handled (#9415)

 mandayejs/do_login.js                              |  10 ++-
 mandayejs/locale/fr/LC_MESSAGES/django.mo          | Bin 746 -> 0 bytes
 mandayejs/locale/fr/LC_MESSAGES/django.po          |  20 +++--
 .../migrations/0006_usercredentials_linked.py      |  20 +++++
 mandayejs/mandaye/models.py                        |   6 +-
 mandayejs/mandaye/templates/mandaye/associate.html |   7 ++
 .../mandaye/templates/mandaye/post-login.html      |   4 -
 mandayejs/mandaye/utils.py                         |  18 ++++-
 mandayejs/mandaye/views.py                         |  86 ++++++++++++---------
 .../vincennes/static/css/vincennes_associate.css   |  10 +++
 10 files changed, 132 insertions(+), 49 deletions(-)
 delete mode 100644 mandayejs/locale/fr/LC_MESSAGES/django.mo
 create mode 100644 mandayejs/mandaye/migrations/0006_usercredentials_linked.py

     page.open(input.address, function() {
       page.onLoadFinished = function() {
         page.render('login.png');
         console.log(JSON.stringify({'result': 'ok', 'cookies': page.cookies, 'headers': headers_list, 'url': page.frameUrl}));
         uri = page.evaluate(function(){
             return window.location.pathname;
         });
         if (uri !== input.homepath){
             console.log(JSON.stringify({'result': 'failure', 'reason': 'authentication failed'}));
             phantom.exit();
+        }
         console.log(JSON.stringify({'result': 'ok', 'cookies': page.cookies, 'headers': headers_list, 'url': page.frameUrl, 'uri': uri}));
         phantom.exit();
+      }
       page.injectJs('static/js/jquery.min.js');
       page.evaluate(function(input) {
           var locators = input.locators;
           for ( var i=0; i < locators.length; i++ ) {

     msgstr ""
     "Project-Id-Version: PACKAGE VERSION\n"
     "Report-Msgid-Bugs-To: \n"
     "POT-Creation-Date: 2015-12-17 17:16+0000\n"
     "POT-Creation-Date: 2015-12-23 14:02+0000\n"
     "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
     "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
     "Language-Team: LANGUAGE <LL@li.org>\n"
-...
     msgid "locators"
     msgstr "selecteurs"
     #: mandayejs/mandaye/models.py:25
     #, fuzzy
     #| msgid "associate"
     msgid "associated"
     msgstr "associer mon compte"
     #: mandayejs/mandaye/templates/mandaye/panel.html:10
     msgid "dissociate"
     msgstr "dissocier mon compte"
-...
     msgid "associate"
     msgstr "associer mon compte"
     #: mandayejs/mandaye/views.py:56
     #: mandayejs/mandaye/views.py:60
     msgid "login"
     msgstr "se connecter"
     #: mandayejs/mandaye/views.py:57
     #: mandayejs/mandaye/views.py:61
     msgid "logout"
     msgstr "se déconnecter"
     #: mandayejs/mandaye/views.py:100
     #: mandayejs/mandaye/views.py:108
     msgid "wrong user credentials"
     msgstr "codes d'accès invalides"
     #: mandayejs/mandaye/views.py:111
     msgid "submit"
     msgstr "valider"
     #: mandayejs/mandaye/views.py:101
     #: mandayejs/mandaye/views.py:112
     msgid "associate your account"
     msgstr "associer mon compte"

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import models, migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('mandaye', '0005_auto_20151126_1413'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='usercredentials',
                 name='linked',
                 field=models.BooleanField(default=True, verbose_name='associated'),
                 preserve_default=True,
             ),
+        ]

     class UserCredentials(models.Model):
         user = models.ForeignKey('auth.User')
         locators = JSONField(_('locators'), default={}, blank=True)
         linked = models.BooleanField(_('associated'), default=True, blank=True)
         class Meta:
             unique_together = ('user',)
         def __str__(self):
             return self.user.email
             return self.user.get_full_name() or self.user.email or self.user.username
         def to_login_info(self):
             return {'#'+k : v for k,v in self.locators.items() if k != 'csrfmiddlewaretoken' }
         def is_linked(self,):
             return self.linked

         <body>
             <div id="main-div">
                 <h1>{{ associate|capfirst }}</h1>
                 {%if messages %}
                 <ul class="messages">
                     {%for message in messages%}
                         <li>{{message}}</li>
                     {%endfor%}
                 </ul>
                 {%endif%}
                 <form id='associate' method="post">
                     {% csrf_token %}
                     {{ form.as_p }}

     <html>
     <head>
       <script src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>
       <script src="{% static 'mandaye.post.js' %}"></script>
       <script type='text/javascript'>
           var url = "{{ address }}" ;
       </script>
     </head>
     <body>
     	Please wait...

+    #
     # 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 os
     import json
     import subprocess
     from django.conf import settings
     import urlparse
     from Cookie import SimpleCookie
     def exec_phantom(data):
         phantom = subprocess.Popen(['/usr/bin/phantomjs',
             '--ignore-ssl-errors=yes',
             '--ssl-protocol=any',
             '--cookies-file=cookies.txt',
             os.path.join(settings.BASE_DIR, 'mandayejs', 'do_login.js')],
             close_fds=True,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE)
         stdout, stderr = phantom.communicate(json.dumps(data))
         result = json.loads(stdout)
         return result
     def cookie_builder(headers):
         """Build Cookies from list of headers
         """

     # 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/>.
     from __future__ import absolute_import
     import os
     import json
     import logging
     import subprocess
     import urlparse
     import urllib
-...
     from django.contrib.auth import logout as auth_logout
     from django.contrib.auth import get_user_model
     from django.contrib.auth.decorators import login_required
     from django.contrib import messages
     from django.forms import PasswordInput
     from django.forms import models as model_forms
     from django.http import HttpResponseRedirect, HttpResponse
-...
     from django.views.decorators.csrf import csrf_exempt
     from django.db import IntegrityError
     from django.utils.translation import ugettext_lazy as _
     from django.template import RequestContext, Template
     from .models import UserCredentials
     from mandayejs.mandaye.forms import FormFactory
     from mandayejs.mandaye.utils import cookie_builder, get_location
     from mandayejs.mandaye.utils import exec_phantom, cookie_builder, get_location
     logger = logging.getLogger(__name__)
     def login(request, *args, **kwargs):
         return auth_views.login(request, *args, **kwargs)
-...
         def is_account_linked(self):
             """Check if user account is associated
             """
             try:
                 UserCredentials.objects.get(user=self.request.user)
                 return True
             except :
             try:
                 User = get_user_model()
                 user = User.objects.get(username=self.request.user.username)
                 return user.usercredentials_set.get().linked
             except:
                 return False
-...
     @login_required
     def post_login(request, *args, **kwargs):
         try:
             user = get_user_model().objects.get(username=request.user.username)
             logger.debug(user)
             credentials = UserCredentials.objects.get(
                     user=request.user)
                     user=user,
                     linked=True)
             logger.debug(credentials)
         except UserCredentials.DoesNotExist:
             return HttpResponseRedirect(resolve_url('associate'))
-...
     @csrf_exempt
     def associate(request, *args, **kwargs):
         if request.POST:
             credentials = UserCredentials()
             credentials.user = request.user
             credentials, created = UserCredentials.objects.get_or_create(user=request.user)
             credentials.locators = request.POST
             credentials.linked = True
             credentials.save()
             form = FormFactory(request.POST, auto_id=True, locators=settings.SITE_LOCATORS)
         else:
             form = FormFactory(auto_id=True, locators=settings.SITE_LOCATORS)
         if not form.is_valid():
             return render(request, 'mandaye/associate.html', {
             response = render(request, 'mandaye/associate.html', {
                         'form': form,
                         'submit': _('submit'),
                         'associate': _('associate your account'),
-...
                             'SITE_ASSOCIATE_STATIC',
                             {'css':'', 'js':''})
                     })
         try:
             credentials.save()
         except (IntegrityError,) as e:
             pass
             return response
         return HttpResponseRedirect(resolve_url('post-login'))
     @login_required
     def dissociate(request, *args, **kwargs):
         try:
             User = get_user_model()
             User.objects.get(username=request.user).delete()
             c_user = UserCredentials.objects.get(
                     user__username=request.user.username)
             c_user.linked = False
             c_user.save()
             return HttpResponseRedirect(resolve_url('mellon_logout'))
         except (User.DoesNotExist,) as e:
         except:
             return HttpResponseRedirect(resolve_url('associate'))
     @login_required
-...
         login_info = {
             'address': request.build_absolute_uri(settings.SITE_LOGIN_PATH),
             'cookies': [],
             'locators': [ credentials.to_login_info() ]
             'locators': [ credentials.to_login_info() ],
             'homepath': getattr(settings, 'SITE_HOME_PATH', '/')
+        }
         logger.debug(login_info)
         result = exec_phantom(login_info)
         logger.debug(result)
         if result.get('result') != 'ok':
             return HttpResponseRedirect('/')
         location = get_location(result.get('url','/'))
         response = HttpResponseRedirect(location)
         response.cookies = cookie_builder(result.get('headers'))
             logger.debug('authentication failed')
             User = get_user_model()
             user = User.objects.get(username=request.user.username)
             c_user = user.usercredentials_set.get()
             c_user.linked = False
             c_user.save()
             logger.debug("redirecting to {}".format(resolve_url('associate')))
             messages.error(request, _('wrong user credentials'))
             url = resolve_url('associate')
         else:
             url = getattr(settings, 'SITE_HOME_PATH', '/')
         template = Template('<script type="text/javascript">\
                     window.top.location = "{{url}}";</script>')
         context = RequestContext(request, {'url': url})
         response = HttpResponse(template.render(context))
         if result.get('headers',None):
             response.cookies = cookie_builder(result.get('headers'))
         return response
     def exec_phantom(data):
         phantom = subprocess.Popen(['/usr/bin/phantomjs',
             '--ignore-ssl-errors=yes',
             '--ssl-protocol=any',
             '--cookies-file=cookies.txt',
             os.path.join(settings.BASE_DIR,'mandayejs/do_login.js')],
             close_fds=True,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE)
         stdout, stderr = phantom.communicate(json.dumps(data))
         result = json.loads(stdout)
         return result

         font-size: x-small;
+    }
     .messages {
         font-size: small;
         text-align: left;
         postion: relative;
         margin-left: 90px;
         color: red;
+    }
     .messages li { list-style-type: none }
     .errorlist {
         font-size: small;
         text-align: left;
+    -

Projet

Général

Profil

Produits Entr'ouvert » Mandaye

0001-association-failure-handled-9415.patch