diff options
| author | Tom Christie | 2014-02-05 08:45:30 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-02-05 08:45:30 +0000 |
| commit | 00b187710623d8efda62f207573fa4e356d1f8ef (patch) | |
| tree | b00a3f2361c5ccc0fadbe2b2c8494430fe841bfc | |
| parent | 74fc6d8f49a180c04229f002d3a3eb44fe8b1cab (diff) | |
| parent | f8cda8adbd7db4cd60b1dbdcd4bb5debc64ba572 (diff) | |
| download | django-rest-framework-00b187710623d8efda62f207573fa4e356d1f8ef.tar.bz2 | |
Merge pull request #1382 from mking/use-urandom-directly
Generate random token directly
| -rw-r--r-- | rest_framework/authtoken/models.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 024f62bf..8eac2cc4 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -1,5 +1,5 @@ -import uuid -import hmac +import binascii +import os from hashlib import sha1 from django.conf import settings from django.db import models @@ -34,8 +34,7 @@ class Token(models.Model): return super(Token, self).save(*args, **kwargs) def generate_key(self): - unique = uuid.uuid4() - return hmac.new(unique.bytes, digestmod=sha1).hexdigest() + return binascii.hexlify(os.urandom(20)) def __unicode__(self): return self.key |
