From 37150d710cbf6d375448db17a5129b81b3ea3ea7 Mon Sep 17 00:00:00 2001 From: Richard Jansen Date: Sun, 16 Feb 2014 15:04:00 +0100 Subject: [PATCH 1/2] When settings.SECRET_KEY is set, also use this to generate key --- rest_framework/authtoken/models.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 8eac2cc49..023185aad 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -34,6 +34,9 @@ class Token(models.Model): return super(Token, self).save(*args, **kwargs) def generate_key(self): + if hasattr(settings, 'SECRET_KEY') and len(settings.SECRET_KEY): + return sha1('%s%s' % (settings.SECRET_KEY, binascii.hexlify(os.urandom(20))).hexdigest()) + return binascii.hexlify(os.urandom(20)) def __unicode__(self): From cb4562b9bd0535ea9b616597acc9c44970ada232 Mon Sep 17 00:00:00 2001 From: Richard Jansen Date: Sun, 16 Feb 2014 15:09:07 +0100 Subject: [PATCH 2/2] wrongly placed parentheses --- rest_framework/authtoken/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 023185aad..366d7a4da 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -35,7 +35,7 @@ class Token(models.Model): def generate_key(self): if hasattr(settings, 'SECRET_KEY') and len(settings.SECRET_KEY): - return sha1('%s%s' % (settings.SECRET_KEY, binascii.hexlify(os.urandom(20))).hexdigest()) + return sha1('%s%s' % (settings.SECRET_KEY, binascii.hexlify(os.urandom(20)))).hexdigest() return binascii.hexlify(os.urandom(20))