updated gitignore

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

diff --git a/cas_provider/views.py b/cas_provider/views.py
index 3883ed0..7aeaafb 100644 (file)
--- a/cas_provider/views.py
+++ b/cas_provider/views.py
@@ -6,9 +6,12 @@ import logging
 from urllib import urlencode
 import urllib2
 import urlparse
 from urllib import urlencode
 import urllib2
 import urlparse

+from functools import wraps

 
 

+from django.utils.decorators import available_attrs

 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.debug import sensitive_post_parameters

-from django.views.decorators.cache import never_cache
+from django.views.decorators.cache import cache_control
+from django.utils.cache import patch_cache_control

 from django.views.decorators.csrf import csrf_protect
 
 from django.http import HttpResponse, HttpResponseRedirect
 from django.views.decorators.csrf import csrf_protect
 
 from django.http import HttpResponse, HttpResponseRedirect


@@ -48,6 +51,24 @@ ERROR_MESSAGES = (
 logger = logging.getLogger(__name__)
 
 
 logger = logging.getLogger(__name__)
 
 

+_never_cache = cache_control(no_cache=True, must_revalidate=True)
+
+
+def never_cache(view_func):
+    """
+    Decorator that adds headers to a response so that it will
+    never be cached.
+    """
+    @wraps(view_func, assigned=available_attrs(view_func))
+    def _wrapped_view_func(request, *args, **kwargs):
+        response = view_func(request, *args, **kwargs)
+        patch_cache_control(response, no_cache=True,
+                            must_revalidate=True, proxy_revalidate=True)
+        response['Pragma'] = 'no-cache'
+        return response
+    return _wrapped_view_func
+
+

 @sensitive_post_parameters()
 @csrf_protect
 @never_cache
 @sensitive_post_parameters()
 @csrf_protect
 @never_cache


@@ -103,7 +124,7 @@ def login(request, template_name='cas/login.html',
                     url = '%s?%s' % (base_url, args)
                     logging.debug('Redirecting to %s', url)
                     return HttpResponseRedirect(url)
                     url = '%s?%s' % (base_url, args)
                     logging.debug('Redirecting to %s', url)
                     return HttpResponseRedirect(url)

-            
+

             if user is None:
                 errors.append('Incorrect username and/or password.')
             else:
             if user is None:
                 errors.append('Incorrect username and/or password.')
             else:


@@ -125,11 +146,11 @@ def login(request, template_name='cas/login.html',
             for receiver, response in signals.on_cas_login.send(sender=login, request=request, **kwargs):
                 if isinstance(response, HttpResponse):
                     return response
             for receiver, response in signals.on_cas_login.send(sender=login, request=request, **kwargs):
                 if isinstance(response, HttpResponse):
                     return response

-            
+

             if service is None:
                 # Try and pull the service off the session
                 service = request.session.pop('service', service)
             if service is None:
                 # Try and pull the service off the session
                 service = request.session.pop('service', service)

-            
+

             signals.on_cas_login_success.send(sender=login, request=request,
                                               service=service, **kwargs)
 
             signals.on_cas_login_success.send(sender=login, request=request,
                                               service=service, **kwargs)
 


@@ -143,7 +164,7 @@ def login(request, template_name='cas/login.html',
                         'service': service,
                         'warn': False
                     }, context_instance=RequestContext(request))
                         '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)
                 if 'service' in request.session:
                 # Create a service ticket and redirect to the service.
                 ticket = ServiceTicket.objects.create(service=service, user=user)
                 if 'service' in request.session:


@@ -158,6 +179,7 @@ def login(request, template_name='cas/login.html',
     return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
 
 
     return render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request))
 
 

+@never_cache

 def validate(request):
     """Validate ticket via CAS v.1 protocol
     """
 def validate(request):
     """Validate ticket via CAS v.1 protocol
     """


@@ -186,8 +208,9 @@ def validate(request):
 
     logger.info('Validation failed.')
     return HttpResponse("no\n\n")
 
     logger.info('Validation failed.')
     return HttpResponse("no\n\n")

-    

 
 

+
+@never_cache

 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)


@@ -201,6 +224,7 @@ def logout(request, template_name='cas/logout.html',
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

+@never_cache

 def proxy(request):
     targetService = request.GET['targetService']
     pgt_id = request.GET['pgt']
 def proxy(request):
     targetService = request.GET['targetService']
     pgt_id = request.GET['pgt']


@@ -261,6 +285,7 @@ def ticket_validate(service, ticket_string, pgtUrl):
     return _cas2_sucess_response(user, pgtIouId, proxies)
 
 
     return _cas2_sucess_response(user, pgtIouId, proxies)
 
 

+@never_cache

 def service_validate(request):
     """Validate ticket via CAS v.2 protocol"""
     service = request.GET.get('service', None)
 def service_validate(request):
     """Validate ticket via CAS v.2 protocol"""
     service = request.GET.get('service', None)


@@ -272,6 +297,7 @@ def service_validate(request):
         return ticket_validate(service, ticket_string, pgtUrl)
 
 
         return ticket_validate(service, ticket_string, pgtUrl)
 
 

+@never_cache

 def proxy_validate(request):
     """Validate ticket via CAS v.2 protocol"""
     service = request.GET.get('service', None)
 def proxy_validate(request):
     """Validate ticket via CAS v.2 protocol"""
     service = request.GET.get('service', None)