Merge branch 'Elarnon/django_cas_ng'

This commit is contained in:
Martin Pépin 2016-06-03 12:32:10 +02:00
commit 8f05489c5d
7 changed files with 14 additions and 9 deletions

View file

@ -45,6 +45,7 @@ INSTALLED_APPS = (
'bda3', 'bda3',
'autocomplete_light', 'autocomplete_light',
'captcha', 'captcha',
'django_cas_ng',
'debug_toolbar', 'debug_toolbar',
) )

View file

@ -16,8 +16,8 @@ from gestioncof.petits_cours_views import DemandeListView
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', 'gestioncof.views.home', name = 'home'), url(r'^$', 'gestioncof.views.home', name = 'home'),
url(r'^cof/denied$', TemplateView.as_view(template_name = 'cof-denied.html'), name = "cof-denied"), url(r'^cof/denied$', TemplateView.as_view(template_name = 'cof-denied.html'), name = "cof-denied"),
url(r'^cas/login$', 'django_cas.views.login', name = "cas_login_view"), url(r'^cas/login$', 'django_cas_ng.views.login', name = "cas_login_view"),
url(r'^cas/logout$', 'django_cas.views.logout'), url(r'^cas/logout$', 'django_cas_ng.views.logout'),
url(r'^outsider/login$', 'gestioncof.views.login_ext'), url(r'^outsider/login$', 'gestioncof.views.login_ext'),
url(r'^outsider/logout$', 'django.contrib.auth.views.logout', {'next_page': '/gestion/'}), url(r'^outsider/logout$', 'django.contrib.auth.views.logout', {'next_page': '/gestion/'}),
url(r'^outsider/password-change$', 'django.contrib.auth.views.password_change'), url(r'^outsider/password-change$', 'django.contrib.auth.views.password_change'),

View file

@ -1,4 +1,4 @@
from django_cas.decorators import user_passes_test from django_cas_ng.decorators import user_passes_test
def is_cof(user): def is_cof(user):
try: try:

View file

@ -1,7 +1,8 @@
from django.contrib.sites.models import Site from django.contrib.sites.models import Site
from django.conf import settings from django.conf import settings
from django_cas.backends import CASBackend, _verify as CASverify from django_cas_ng.backends import CASBackend
from django_cas.models import User from django_cas_ng.utils import get_cas_client
from django.contrib.auth import get_user_model
from django.contrib.auth.models import User as DjangoUser from django.contrib.auth.models import User as DjangoUser
from django.db import models, connection from django.db import models, connection
from django.core.mail import send_mail from django.core.mail import send_mail
@ -9,11 +10,14 @@ from django.template import Template, Context
from gestioncof.models import CofProfile, CustomMail from gestioncof.models import CofProfile, CustomMail
User = get_user_model()
class COFCASBackend(CASBackend): class COFCASBackend(CASBackend):
def authenticate_cas(self, ticket, service, request): def authenticate_cas(self, ticket, service, request):
"""Verifies CAS ticket and gets or creates User object""" """Verifies CAS ticket and gets or creates User object"""
username, attributes = CASverify(ticket, service) client = get_cas_client(service_url=service)
username, attributes, _= client.verify_ticket(ticket)
if attributes: if attributes:
request.session['attributes'] = attributes request.session['attributes'] = attributes
if not username: if not username:

View file

@ -3,7 +3,7 @@
{% block content %} {% block content %}
<div id="main-login-container"> <div id="main-login-container">
<div id="main-login"> <div id="main-login">
<a id="login_clipper" href="{% url 'django_cas.views.login' %}"> <a id="login_clipper" href="{% url 'django_cas_ng.views.login' %}">
Compte clipper Compte clipper
</a> </a>
<a id="login_outsider" href="{% url 'gestioncof.views.login_ext' %}"> <a id="login_outsider" href="{% url 'gestioncof.views.login_ext' %}">

View file

@ -56,7 +56,7 @@ def logout(request):
except CofProfile.DoesNotExist: except CofProfile.DoesNotExist:
profile, created = CofProfile.objects.get_or_create(user = request.user) profile, created = CofProfile.objects.get_or_create(user = request.user)
if profile.login_clipper: if profile.login_clipper:
return redirect("django_cas.views.logout") return redirect("django_cas_ng.views.logout")
else: else:
return redirect("django.contrib.auth.views.logout") return redirect("django.contrib.auth.views.logout")

View file

@ -2,7 +2,7 @@ configparser==3.5.0
Django==1.8.13 Django==1.8.13
django-autocomplete-light==2.3.3 django-autocomplete-light==2.3.3
django-autoslug==1.8.0 django-autoslug==1.8.0
-e hg+https://bitbucket.org/cpcc/django-cas@47d19f3a871fa744dabe884758f90fff6ba135d5#egg=django_cas django-cas-ng==3.5.4
django-grappelli==2.6.5 django-grappelli==2.6.5
django-recaptcha==1.0.5 django-recaptcha==1.0.5
MySQL-python==1.2.5 MySQL-python==1.2.5