Compatibility up to Django 2.1, dropped < 1.8. Removed unused code, fixed tests.

[django-cas-provider.git] / cas_provider / views.py

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 0f53d38..ccf84a2 100644 (file)
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+

 import logging
 logger = logging.getLogger('cas_provider.views')
 
 import logging
 logger = logging.getLogger('cas_provider.views')
 


@@ -11,6 +13,7 @@ except ImportError:
     from urlparse import parse_qsl, urlparse, urlsplit, urlunsplit
 from functools import wraps
 
     from urlparse import parse_qsl, urlparse, urlsplit, urlunsplit
 from functools import wraps
 

+from django import VERSION

 from django.utils.decorators import available_attrs
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.cache import cache_control
 from django.utils.decorators import available_attrs
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.cache import cache_control


@@ -20,12 +23,11 @@ from django.views.decorators.csrf import csrf_protect
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
 from django.contrib.auth import login as auth_login, logout as auth_logout
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
 from django.contrib.auth import login as auth_login, logout as auth_logout

-from django.core.urlresolvers import get_callable
-from django.shortcuts import render_to_response
+
+from django.shortcuts import render

 from django.utils.translation import ugettext as _
 from django.template import RequestContext
 from django.contrib.auth import authenticate
 from django.utils.translation import ugettext as _
 from django.template import RequestContext
 from django.contrib.auth import authenticate

-from django.core.urlresolvers import reverse

 from django.utils.translation import ugettext as _
 
 from lxml import etree
 from django.utils.translation import ugettext as _
 
 from lxml import etree


@@ -37,6 +39,13 @@ from cas_provider.forms import LoginForm, MergeLoginForm
 
 from . import signals
 
 
 from . import signals
 

+if VERSION >= (1, 10):
+    from django.urls import get_callable, reverse
+    user_is_authenticated = lambda user: user.is_authenticated
+else:
+    from django.core.urlresolvers import get_callable, reverse
+    user_is_authenticated = lambda user: user.is_authenticated()
+

 __all__ = ['login', 'validate', 'logout', 'service_validate']
 
 INVALID_TICKET = 'INVALID_TICKET'
 __all__ = ['login', 'validate', 'logout', 'service_validate']
 
 INVALID_TICKET = 'INVALID_TICKET'


@@ -45,10 +54,10 @@ INVALID_REQUEST = 'INVALID_REQUEST'
 INTERNAL_ERROR = 'INTERNAL_ERROR'
 
 ERROR_MESSAGES = (
 INTERNAL_ERROR = 'INTERNAL_ERROR'
 
 ERROR_MESSAGES = (

-    (INVALID_TICKET, u'The provided ticket is invalid.'),
-    (INVALID_SERVICE, u'Service is invalid'),
-    (INVALID_REQUEST, u'Not all required parameters were sent.'),
-    (INTERNAL_ERROR, u'An internal error occurred during ticket validation'),
+    (INVALID_TICKET, 'The provided ticket is invalid.'),
+    (INVALID_SERVICE, 'Service is invalid'),
+    (INVALID_REQUEST, 'Not all required parameters were sent.'),
+    (INTERNAL_ERROR, 'An internal error occurred during ticket validation'),

     )
 
 
     )
 
 


@@ -141,7 +150,7 @@ def login(request, template_name='cas/login.html',
         else:
             form = LoginForm(initial={'service': service})
 
         else:
             form = LoginForm(initial={'service': service})
 

-    if user is not None and user.is_authenticated():
+    if user is not None and user_is_authenticated(user):

         # We have an authenticated user.
         if not user.is_active:
             errors.append(_('This account is disabled. Please contact us if you feel it should be enabled again.'))
         # We have an authenticated user.
         if not user.is_active:
             errors.append(_('This account is disabled. Please contact us if you feel it should be enabled again.'))


@@ -164,10 +173,10 @@ def login(request, template_name='cas/login.html',
                 return HttpResponseRedirect(success_redirect)
             else:
                 if request.GET.get('warn', False):
                 return HttpResponseRedirect(success_redirect)
             else:
                 if request.GET.get('warn', False):

-                    return render_to_response(warn_template_name, {
+                    return render(request, warn_template_name, {

                         'service': service,
                         'warn': False
                         'service': service,
                         'warn': False

-                    }, context_instance=RequestContext(request))
+                    })

 
                 # Create a service ticket and redirect to the service.
                 ticket = ServiceTicket.objects.create(service=service, user=user)
 
                 # Create a service ticket and redirect to the service.
                 ticket = ServiceTicket.objects.create(service=service, user=user)


@@ -180,7 +189,7 @@ def login(request, template_name='cas/login.html',
                 return HttpResponseRedirect(url)
 
     logging.debug('Rendering response on %s, merge is %s', template_name, merge)
                 return HttpResponseRedirect(url)
 
     logging.debug('Rendering response on %s, merge is %s', template_name, merge)

-    return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
+    return render(request, template_name, {'form': form, 'errors': errors})

 
 
 @never_cache
 
 
 @never_cache


@@ -218,14 +227,13 @@ def validate(request):
 def logout(request, template_name='cas/logout.html',
            auto_redirect=settings.CAS_AUTO_REDIRECT_AFTER_LOGOUT):
     url = request.GET.get('url', None)
 def logout(request, template_name='cas/logout.html',
            auto_redirect=settings.CAS_AUTO_REDIRECT_AFTER_LOGOUT):
     url = request.GET.get('url', None)

-    if request.user.is_authenticated():
+    if user_is_authenticated(request.user):

         for ticket in ServiceTicket.objects.filter(user=request.user):
             ticket.delete()
         auth_logout(request)
         if url and auto_redirect:
             return HttpResponseRedirect(url)
         for ticket in ServiceTicket.objects.filter(user=request.user):
             ticket.delete()
         auth_logout(request)
         if url and auto_redirect:
             return HttpResponseRedirect(url)

-    return render_to_response(template_name, {'url': url},
-        context_instance=RequestContext(request))
+    return render(request, template_name, {'url': url})

 
 
 @never_cache
 
 
 @never_cache


@@ -239,7 +247,7 @@ def proxy(request):
         return _cas2_error_response(INVALID_TICKET)
 
     pt = ProxyTicket.objects.create(proxyGrantingTicket=proxyGrantingTicket,
         return _cas2_error_response(INVALID_TICKET)
 
     pt = ProxyTicket.objects.create(proxyGrantingTicket=proxyGrantingTicket,

-        user=proxyGrantingTicket.serviceTicket.user,
+        user=proxyGrantingTicket.user,

         service=targetService)
     return _cas2_proxy_success(pt.ticket)
 
         service=targetService)
     return _cas2_proxy_success(pt.ticket)
 


@@ -273,16 +281,16 @@ def ticket_validate(service, ticket_string, pgtUrl):
         if pgt:
             pgtIouId = pgt.pgtiou
 
         if pgt:
             pgtIouId = pgt.pgtiou
 

-    if hasattr(ticket, 'proxyticket'):
-        pgt = ticket.proxyticket.proxyGrantingTicket
+    try:
+        proxyTicket = ticket.proxyticket
+    except ProxyTicket.DoesNotExist:
+        pass
+    else:
+        pgt = proxyTicket.proxyGrantingTicket

         # I am issued by this proxy granting ticket
         # I am issued by this proxy granting ticket

-        if hasattr(pgt.serviceTicket, 'proxyticket'):
-            while pgt:
-                if hasattr(pgt.serviceTicket, 'proxyticket'):
-                    proxies += (pgt.serviceTicket.service,)
-                    pgt = pgt.serviceTicket.proxyticket.proxyGrantingTicket
-                else:
-                    pgt = None
+        while pgt.pgt is not None:
+            proxies += (pgt.service,)
+            pgt = pgt.pgt

 
     user = ticket.user
     ticket.delete()
 
     user = ticket.user
     ticket.delete()


@@ -315,12 +323,10 @@ def generate_proxy_granting_ticket(pgt_url, ticket):
     uri = list(urlsplit(pgt_url))
 
     pgt = ProxyGrantingTicket()
     uri = list(urlsplit(pgt_url))
 
     pgt = ProxyGrantingTicket()

-    pgt.serviceTicket = ticket
-    pgt.targetService = pgt_url
-
-    if hasattr(ticket, 'proxyGrantingTicket'):
-        # here we got a proxy ticket! tata!
-        pgt.pgt = ticket.proxyGrantingTicket
+    pgt.user = ticket.user
+    pgt.service = ticket.service
+    # Remember if it's a chained PGT.
+    pgt.pgt = getattr(ticket, 'proxyGrantingTicket', None)

 
     params = {'pgtId': pgt.ticket, 'pgtIou': pgt.pgtiou}
 
 
     params = {'pgtId': pgt.ticket, 'pgtIou': pgt.pgtiou}
 


@@ -333,10 +339,10 @@ def generate_proxy_granting_ticket(pgt_url, ticket):
         urlopen(urlunsplit(uri))
     except HTTPError as e:
         if not e.code in proxy_callback_good_status:
         urlopen(urlunsplit(uri))
     except HTTPError as e:
         if not e.code in proxy_callback_good_status:

-            logger.debug('Checking Proxy Callback URL {} returned {}. Not issuing PGT.'.format(uri, e.code))
+            logger.debug('Checking Proxy Callback URL {0} returned {1}. Not issuing PGT.'.format(uri, e.code))

             return
     except URLError as e:
             return
     except URLError as e:

-        logger.debug('Checking Proxy Callback URL {} raised URLError. Not issuing PGT.'.format(uri))
+        logger.debug('Checking Proxy Callback URL {0} raised URLError. Not issuing PGT.'.format(uri))

         return
 
     pgt.save()
         return
 
     pgt.save()


@@ -352,7 +358,7 @@ def _cas2_sucess_response(user, pgt=None, proxies=None):
 
 
 def _cas2_error_response(code, message=None):
 
 
 def _cas2_error_response(code, message=None):

-    return HttpResponse(u'''<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">
+    return HttpResponse('''<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">

             <cas:authenticationFailure code="%(code)s">
                 %(message)s
             </cas:authenticationFailure>
             <cas:authenticationFailure code="%(code)s">
                 %(message)s
             </cas:authenticationFailure>