mirror of
https://github.com/django/django.git
synced 2024-12-24 10:05:46 +00:00
Backed out [16356] due to later rejection of #16182.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
222a5ed69e
commit
838a16ec20
@ -158,12 +158,8 @@ class Signer(object):
|
||||
|
||||
|
||||
class TimestampSigner(Signer):
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.time_func = kwargs.pop('time', time.time)
|
||||
super(TimestampSigner, self).__init__(*args, **kwargs)
|
||||
|
||||
def timestamp(self):
|
||||
return baseconv.base62.encode(int(self.time_func() * 10000))
|
||||
return baseconv.base62.encode(int(time.time()))
|
||||
|
||||
def sign(self, value):
|
||||
value = smart_str('%s%s%s' % (value, self.sep, self.timestamp()))
|
||||
@ -172,10 +168,10 @@ class TimestampSigner(Signer):
|
||||
def unsign(self, value, max_age=None):
|
||||
result = super(TimestampSigner, self).unsign(value)
|
||||
value, timestamp = result.rsplit(self.sep, 1)
|
||||
timestamp = baseconv.base62.decode(timestamp) / 10000.0
|
||||
timestamp = baseconv.base62.decode(timestamp)
|
||||
if max_age is not None:
|
||||
# Check timestamp is not older than max_age
|
||||
age = self.time_func() - timestamp
|
||||
age = time.time() - timestamp
|
||||
if age > max_age:
|
||||
raise SignatureExpired(
|
||||
'Signature age %s > %s seconds' % (age, max_age))
|
||||
|
@ -1,3 +1,5 @@
|
||||
import time
|
||||
|
||||
from django.core import signing
|
||||
from django.test import TestCase
|
||||
from django.utils.encoding import force_unicode
|
||||
@ -96,21 +98,19 @@ class TestTimestampSigner(TestCase):
|
||||
|
||||
def test_timestamp_signer(self):
|
||||
value = u'hello'
|
||||
signer = signing.TimestampSigner('predictable-key',
|
||||
time=lambda: 123456789)
|
||||
ts = signer.sign(value)
|
||||
self.assertNotEqual(ts,
|
||||
signing.Signer('predictable-key').sign(value))
|
||||
_time = time.time
|
||||
time.time = lambda: 123456789
|
||||
try:
|
||||
signer = signing.TimestampSigner('predictable-key')
|
||||
ts = signer.sign(value)
|
||||
self.assertNotEqual(ts,
|
||||
signing.Signer('predictable-key').sign(value))
|
||||
|
||||
self.assertEqual(signer.unsign(ts), value)
|
||||
signer = signing.TimestampSigner('predictable-key',
|
||||
time=lambda: 123456800)
|
||||
self.assertEqual(signer.unsign(ts, max_age=12), value)
|
||||
self.assertEqual(signer.unsign(ts, max_age=11), value)
|
||||
self.assertRaises(
|
||||
signing.SignatureExpired, signer.unsign, ts, max_age=10)
|
||||
|
||||
def test_timestamp_precision(self):
|
||||
one = signing.TimestampSigner('key', time=lambda: 123.4567).sign('v')
|
||||
two = signing.TimestampSigner('key', time=lambda: 123.4568).sign('v')
|
||||
self.assertNotEqual(one, two)
|
||||
self.assertEqual(signer.unsign(ts), value)
|
||||
time.time = lambda: 123456800
|
||||
self.assertEqual(signer.unsign(ts, max_age=12), value)
|
||||
self.assertEqual(signer.unsign(ts, max_age=11), value)
|
||||
self.assertRaises(
|
||||
signing.SignatureExpired, signer.unsign, ts, max_age=10)
|
||||
finally:
|
||||
time.time = _time
|
||||
|
Loading…
Reference in New Issue
Block a user