X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/2cf88a572643b5e54858f5d3b00d188b8e7230ed..refs/heads/master:/cas_provider/views.py?ds=inline diff --git a/cas_provider/views.py b/cas_provider/views.py index 126e3d1..a8e166c 100644 --- a/cas_provider/views.py +++ b/cas_provider/views.py @@ -1,17 +1,11 @@ import logging logger = logging.getLogger('cas_provider.views') -try: - from urllib.error import HTTPError, URLError - from urllib.parse import parse_qsl, urlencode, urlparse, urlsplit, urlunsplit - from urllib.request import urlopen -except ImportError: - from urllib import urlencode - from urllib2 import HTTPError, URLError, urlopen - from urlparse import parse_qsl, urlparse, urlsplit, urlunsplit +from urllib.error import HTTPError, URLError +from urllib.parse import parse_qsl, urlencode, urlparse, urlsplit, urlunsplit +from urllib.request import urlopen from functools import wraps -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.cache import patch_cache_control @@ -20,13 +14,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.core.urlresolvers import get_callable -from django.shortcuts import render_to_response -from django.utils.translation import ugettext as _ + +from django.shortcuts import render +from django.utils.translation import gettext 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 cas_provider.attribute_formatters import NSMAP, CAS @@ -37,6 +29,8 @@ from cas_provider.forms import LoginForm, MergeLoginForm from . import signals +from django.urls import get_callable, reverse + __all__ = ['login', 'validate', 'logout', 'service_validate'] INVALID_TICKET = 'INVALID_TICKET' @@ -45,10 +39,10 @@ INVALID_REQUEST = 'INVALID_REQUEST' 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'), ) @@ -63,7 +57,7 @@ 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)) + @wraps(view_func) def _wrapped_view_func(request, *args, **kwargs): response = view_func(request, *args, **kwargs) patch_cache_control(response, no_cache=True, @@ -141,7 +135,7 @@ def login(request, template_name='cas/login.html', else: form = LoginForm(initial={'service': service}) - if user is not None and user.is_authenticated(): + if user is not None and user.is_authenticated: # 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 +158,10 @@ def login(request, template_name='cas/login.html', 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 - }, context_instance=RequestContext(request)) + }) # Create a service ticket and redirect to the service. ticket = ServiceTicket.objects.create(service=service, user=user) @@ -180,7 +174,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 render_to_response(template_name, {'form': form, 'errors': errors}, context_instance=RequestContext(request)) + return render(request, template_name, {'form': form, 'errors': errors}) @never_cache @@ -218,14 +212,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) - if request.user.is_authenticated(): + if request.user.is_authenticated: 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 @@ -273,8 +266,12 @@ def ticket_validate(service, ticket_string, pgtUrl): 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 while pgt.pgt is not None: proxies += (pgt.service,) @@ -327,10 +324,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: - 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: - 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() @@ -346,7 +343,7 @@ def _cas2_sucess_response(user, pgt=None, proxies=None): def _cas2_error_response(code, message=None): - return HttpResponse(u''' + return HttpResponse(''' %(message)s