Fixed handling of iterables inside attribute_formatters.

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

diff --git a/cas_provider/models.py b/cas_provider/models.py
index 2075c2e..8306d3c 100644 (file)
--- a/cas_provider/models.py
+++ b/cas_provider/models.py
@@ -12,9 +12,7 @@ else:
     # Python <2.6 compatibility
     from cgi import parse_qs
 
     # Python <2.6 compatibility
     from cgi import parse_qs
 

-
-__all__ = ['ServiceTicket', 'LoginTicket']
-
+__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)


@@ -31,9 +29,9 @@ 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):


@@ -50,17 +48,52 @@ class ServiceTicket(BaseTicket):
         parsed = urlparse.urlparse(self.service)
         query = parse_qs(parsed.query)
         query['ticket'] = [self.ticket]
         parsed = urlparse.urlparse(self.service)
         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()]
+        query = [((k, v) if len(v) > 1 else (k, v[0])) for k, v in query.iteritems()]

         parsed = urlparse.ParseResult(parsed.scheme, parsed.netloc,
         parsed = urlparse.ParseResult(parsed.scheme, parsed.netloc,

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

         return parsed.geturl()
 
 
 class LoginTicket(BaseTicket):
         return parsed.geturl()
 
 
 class LoginTicket(BaseTicket):

-

     prefix = 'LT'
 
     class Meta:
         verbose_name = _('Login Ticket')
         verbose_name_plural = _('Login Tickets')
     prefix = 'LT'
 
     class Meta:
         verbose_name = _('Login Ticket')
         verbose_name_plural = _('Login Tickets')

+
+
+class ProxyGrantingTicket(BaseTicket):
+    serviceTicket = models.ForeignKey(ServiceTicket, null=True)
+    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)
+
+    class Meta:
+        verbose_name = _('Proxy Granting Ticket')
+        verbose_name_plural = _('Proxy Granting Tickets')
+
+
+class ProxyTicket(ServiceTicket):
+    proxyGrantingTicket = models.ForeignKey(ProxyGrantingTicket, verbose_name=_('Proxy Granting Ticket'))
+
+    prefix = 'PT'
+
+    class Meta:
+        verbose_name = _('Proxy Ticket')
+        verbose_name_plural = _('Proxy Tickets')
+
+
+class ProxyGrantingTicketIOU(BaseTicket):
+    proxyGrantingTicket = models.ForeignKey(ProxyGrantingTicket, verbose_name=_('Proxy Granting Ticket'))
+
+    prefix = 'PGTIOU'
+
+    class Meta:
+        verbose_name = _('Proxy Granting Ticket IOU')
+        verbose_name_plural = _('Proxy Granting Tickets IOU')
+