fnp
/
django-cas-provider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add South migrations back, use in tests in Django<1.7.
[django-cas-provider.git]
/
cas_provider
/
models.py
diff --git
a/cas_provider/models.py
b/cas_provider/models.py
index
43463d5
..
36014b5
100644
(file)
--- a/
cas_provider/models.py
+++ b/
cas_provider/models.py
@@
-1,3
+1,5
@@
+from __future__ import unicode_literals
+
from django.conf import settings
from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.conf import settings
from django.db import models
from django.utils.translation import ugettext_lazy as _
@@
-8,10
+10,7
@@
try:
except ImportError:
from urllib import urlencode
from urlparse import urlparse, 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
+ from urlparse import parse_qs
__all__ = ['ServiceTicket', 'LoginTicket', 'ProxyGrantingTicket', 'ProxyTicket', 'ProxyGrantingTicketIOU']
__all__ = ['ServiceTicket', 'LoginTicket', 'ProxyGrantingTicket', 'ProxyTicket', 'ProxyGrantingTicketIOU']
@@
-32,7
+31,7
@@
class BaseTicket(models.Model):
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. """
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 - (len(self.prefix) + 1))))
+ return "%s-%s" % (self.prefix, ''.join(Random().sample(chars, length - (len(self.prefix) + 1))))
class ServiceTicket(BaseTicket):
class ServiceTicket(BaseTicket):
@@
-65,13
+64,15
@@
class LoginTicket(BaseTicket):
class ProxyGrantingTicket(BaseTicket):
class ProxyGrantingTicket(BaseTicket):
- serviceTicket = models.ForeignKey(ServiceTicket, null=True)
+ user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'))
+ service = models.URLField(_('service'), null=True)
+ pgt = models.ForeignKey('self', null=True)
pgtiou = models.CharField(max_length=256, verbose_name=_('PGTiou'))
prefix = 'PGT'
def __init__(self, *args, **kwargs):
if 'pgtiou' not in kwargs:
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)))
+ kwargs['pgtiou'] = "PGTIOU-%s" % (''.join(Random().sample(string.ascii_letters + string.digits, 50)))
super(ProxyGrantingTicket, self).__init__(*args, **kwargs)
class Meta:
super(ProxyGrantingTicket, self).__init__(*args, **kwargs)
class Meta: