Merge remote-tracking branch 'gstrat/elep' into elep

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

diff --git a/cas_provider/models.py b/cas_provider/models.py
index 0c21f39..43463d5 100644 (file)
--- a/cas_provider/models.py
+++ b/cas_provider/models.py
@@ -1,18 +1,19 @@
-from django.contrib.auth.models import User
+from django.conf import settings

 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from random import Random
 import string
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from random import Random
 import string

-import urllib
-import urlparse
-
-if hasattr(urlparse, 'parse_qs'):
-    parse_qs = urlparse.parse_qs
-else:
-    # Python <2.6 compatibility
-    from cgi import parse_qs
-
-__all__ = ['ServiceTicket', 'LoginTicket']
+try:
+    from urllib.parse import urlencode, urlparse, parse_qs, ParseResult
+except ImportError:
+    from urllib import urlencode
+    from urlparse import urlparse, ParseResult
+    try:
+        from urlparse import parse_qs
+    except: # Python <2.6 compatibility
+        from cgi import parse_qs
+
+__all__ = ['ServiceTicket', 'LoginTicket', 'ProxyGrantingTicket', 'ProxyTicket', 'ProxyGrantingTicketIOU']

 
 class BaseTicket(models.Model):
     ticket = models.CharField(_('ticket'), max_length=32)
 
 class BaseTicket(models.Model):
     ticket = models.CharField(_('ticket'), max_length=32)


@@ -29,14 +30,14 @@ class BaseTicket(models.Model):
     def __unicode__(self):
         return self.ticket
 
     def __unicode__(self):
         return self.ticket
 

-    def _generate_ticket(self, length=29, chars=string.ascii_letters + string.digits):
+    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. """
         """ Generates a random string of the requested length. Used for creation of tickets. """

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

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

-    user = models.ForeignKey(User, verbose_name=_('user'))
-    service = models.URLField(_('service'), verify_exists=False)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'))
+    service = models.URLField(_('service'))

 
     prefix = 'ST'
 
 
     prefix = 'ST'
 


@@ -45,13 +46,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()
 
 


@@ -66,7 +67,6 @@ class LoginTicket(BaseTicket):
 class ProxyGrantingTicket(BaseTicket):
     serviceTicket = models.ForeignKey(ServiceTicket, null=True)
     pgtiou = models.CharField(max_length=256, verbose_name=_('PGTiou'))
 class ProxyGrantingTicket(BaseTicket):
     serviceTicket = models.ForeignKey(ServiceTicket, null=True)
     pgtiou = models.CharField(max_length=256, verbose_name=_('PGTiou'))

-    targetService = models.URLField(_('service'), verify_exists=False)

     prefix = 'PGT'
 
     def __init__(self, *args, **kwargs):
     prefix = 'PGT'
 
     def __init__(self, *args, **kwargs):


@@ -98,4 +98,3 @@ class ProxyGrantingTicketIOU(BaseTicket):
         verbose_name = _('Proxy Granting Ticket IOU')
         verbose_name_plural = _('Proxy Granting Tickets IOU')
 
         verbose_name = _('Proxy Granting Ticket IOU')
         verbose_name_plural = _('Proxy Granting Tickets IOU')
 

-