X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/6e6126a7402676610d76703bdb7c37dabddde1a8..02f62d8125f0fdc4e8610bd80d336859debe196b:/cas_provider/models.py

diff --git a/cas_provider/models.py b/cas_provider/models.py
index 4ec2e85..4b75fca 100644
--- a/cas_provider/models.py
+++ b/cas_provider/models.py
@@ -1,4 +1,4 @@
-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
@@ -12,7 +12,7 @@ else:
     # 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)
@@ -29,14 +29,14 @@ class BaseTicket(models.Model):
     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. """
-        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):
-    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'
 
@@ -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'))
-    targetService = models.URLField(_('service'), verify_exists=False)
     prefix = 'PGT'
 
     def __init__(self, *args, **kwargs):