Fix standard urls. Test for Django up to 5.0.

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

diff --git a/cas_provider/models.py b/cas_provider/models.py
index 4b75fca..8e05337 100644 (file)
--- a/cas_provider/models.py
+++ b/cas_provider/models.py
@@ -1,16 +1,10 @@
 from django.conf import settings
 from django.db import models
 from django.conf import settings
 from django.db import models

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from random import Random
 import string
 from random import Random
 import string

-import urllib
-import urlparse
+from urllib.parse import urlencode, urlparse, parse_qs, ParseResult

 
 

-if hasattr(urlparse, 'parse_qs'):
-    parse_qs = urlparse.parse_qs
-else:
-    # Python <2.6 compatibility
-    from cgi import parse_qs

 
 __all__ = ['ServiceTicket', 'LoginTicket', 'ProxyGrantingTicket', 'ProxyTicket', 'ProxyGrantingTicketIOU']
 
 
 __all__ = ['ServiceTicket', 'LoginTicket', 'ProxyGrantingTicket', 'ProxyTicket', 'ProxyGrantingTicketIOU']
 


@@ -22,21 +16,21 @@ class BaseTicket(models.Model):
         abstract = True
 
     def __init__(self, *args, **kwargs):
         abstract = True
 
     def __init__(self, *args, **kwargs):

-        if 'ticket' not in kwargs:
-            kwargs['ticket'] = self._generate_ticket()

         super(BaseTicket, self).__init__(*args, **kwargs)
         super(BaseTicket, self).__init__(*args, **kwargs)

+        if not self.ticket:
+            self.ticket = self._generate_ticket()

 
     def __unicode__(self):
         return self.ticket
 
     def _generate_ticket(self, length=ticket.max_length, chars=string.ascii_letters + string.digits):
         """ Generates a random string of the requested length. Used for creation of tickets. """
 
     def __unicode__(self):
         return self.ticket
 
     def _generate_ticket(self, length=ticket.max_length, chars=string.ascii_letters + string.digits):
         """ Generates a random string of the requested length. Used for creation of tickets. """

-        return u"%s-%s" % (self.prefix, ''.join(Random().sample(chars, length - (len(self.prefix) + 1))))
+        return "%s-%s" % (self.prefix, ''.join(Random().sample(chars, length - (len(self.prefix) + 1))))

 
 
 class ServiceTicket(BaseTicket):
 
 
 class ServiceTicket(BaseTicket):

-    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'))
-    service = models.URLField(_('service'))
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'), on_delete=models.CASCADE)
+    service = models.URLField(_('service'), max_length=2048)

 
     prefix = 'ST'
 
 
     prefix = 'ST'
 


@@ -45,13 +39,13 @@ class ServiceTicket(BaseTicket):
         verbose_name_plural = _('Service Tickets')
 
     def get_redirect_url(self):
         verbose_name_plural = _('Service Tickets')
 
     def get_redirect_url(self):

-        parsed = urlparse.urlparse(self.service)
+        parsed = urlparse(self.service)

         query = parse_qs(parsed.query)
         query['ticket'] = [self.ticket]
         query = parse_qs(parsed.query)
         query['ticket'] = [self.ticket]

-        query = [((k, v) if len(v) > 1 else (k, v[0])) for k, v in query.iteritems()]
-        parsed = urlparse.ParseResult(parsed.scheme, parsed.netloc,
+        query = [((k, v) if len(v) > 1 else (k, v[0])) for k, v in query.items()]
+        parsed = ParseResult(parsed.scheme, parsed.netloc,

                                       parsed.path, parsed.params,
                                       parsed.path, parsed.params,

-                                      urllib.urlencode(query), parsed.fragment)
+                                      urlencode(query), parsed.fragment)

         return parsed.geturl()
 
 
         return parsed.geturl()
 
 


@@ -64,14 +58,16 @@ class LoginTicket(BaseTicket):
 
 
 class ProxyGrantingTicket(BaseTicket):
 
 
 class ProxyGrantingTicket(BaseTicket):

-    serviceTicket = models.ForeignKey(ServiceTicket, null=True)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'), on_delete=models.CASCADE)
+    service = models.URLField(_('service'), null=True)
+    pgt = models.ForeignKey('self', null=True, on_delete=models.CASCADE)

     pgtiou = models.CharField(max_length=256, verbose_name=_('PGTiou'))
     prefix = 'PGT'
 
     def __init__(self, *args, **kwargs):
     pgtiou = models.CharField(max_length=256, verbose_name=_('PGTiou'))
     prefix = 'PGT'
 
     def __init__(self, *args, **kwargs):

-        if 'pgtiou' not in kwargs:
-            kwargs['pgtiou'] = u"PGTIOU-%s" % (''.join(Random().sample(string.ascii_letters + string.digits, 50)))

         super(ProxyGrantingTicket, self).__init__(*args, **kwargs)
         super(ProxyGrantingTicket, self).__init__(*args, **kwargs)

+        if not self.pgtiou:
+            self.pgtiou = "PGTIOU-%s" % (''.join(Random().sample(string.ascii_letters + string.digits, 50)))

 
     class Meta:
         verbose_name = _('Proxy Granting Ticket')
 
     class Meta:
         verbose_name = _('Proxy Granting Ticket')


@@ -79,7 +75,7 @@ class ProxyGrantingTicket(BaseTicket):
 
 
 class ProxyTicket(ServiceTicket):
 
 
 class ProxyTicket(ServiceTicket):

-    proxyGrantingTicket = models.ForeignKey(ProxyGrantingTicket, verbose_name=_('Proxy Granting Ticket'))
+    proxyGrantingTicket = models.ForeignKey(ProxyGrantingTicket, verbose_name=_('Proxy Granting Ticket'), on_delete=models.CASCADE)

 
     prefix = 'PT'
 
 
     prefix = 'PT'
 


@@ -89,7 +85,7 @@ class ProxyTicket(ServiceTicket):
 
 
 class ProxyGrantingTicketIOU(BaseTicket):
 
 
 class ProxyGrantingTicketIOU(BaseTicket):

-    proxyGrantingTicket = models.ForeignKey(ProxyGrantingTicket, verbose_name=_('Proxy Granting Ticket'))
+    proxyGrantingTicket = models.ForeignKey(ProxyGrantingTicket, verbose_name=_('Proxy Granting Ticket'), on_delete=models.CASCADE)

 
     prefix = 'PGTIOU'
 
 
     prefix = 'PGTIOU'