Fixed socialauth-login url.

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

diff --git a/cas_provider/models.py b/cas_provider/models.py
index 0c21f39..8306d3c 100644 (file)
--- a/cas_provider/models.py
+++ b/cas_provider/models.py
@@ -12,7 +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)


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


@@ -66,7 +66,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 +97,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')
 

-