X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/blobdiff_plain/04859e08e7434a55c110ffb2031c205ee7239a9c..5562191e9b70aec9192ad161e2f5c208621e5cd3:/cas_provider/models.py?ds=sidebyside diff --git a/cas_provider/models.py b/cas_provider/models.py index eda83b1..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 @@ -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'