test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #31358 -- Added constant for get_random_string()'s default alphabet.

This commit is contained in:
Florian Apolloner 2021-01-13 20:40:40 +01:00 committed by Mariusz Felisiak
parent 9204485396
commit 64cc9dcdad
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/auth/hashers.py
View File

@ -10,7 +10,7 @@ from django.core.exceptions import ImproperlyConfigured
from django.core.signals import setting_changed from django.core.signals import setting_changed
from django.dispatch import receiver from django.dispatch import receiver
from django.utils.crypto import ( from django.utils.crypto import (
constant_time_compare, get_random_string, pbkdf2, RANDOM_STRING_CHARS, constant_time_compare, get_random_string, pbkdf2,
) )
from django.utils.module_loading import import_string from django.utils.module_loading import import_string
from django.utils.translation import gettext_noop as _ from django.utils.translation import gettext_noop as _
@ -190,8 +190,8 @@ class BasePasswordHasher:
def salt(self): def salt(self):
"""Generate a cryptographically secure nonce salt in ASCII.""" """Generate a cryptographically secure nonce salt in ASCII."""
# 12 returns a 71-bit value, log_2((26+26+10)^12) =~ 71 bits # 12 returns a 71-bit value, log_2(len(RANDOM_STRING_CHARS)^12) =~ 71 bits
return get_random_string(12) return get_random_string(12, RANDOM_STRING_CHARS)
def verify(self, password, encoded): def verify(self, password, encoded):
"""Check if the given password is correct.""" """Check if the given password is correct."""

8
django/utils/crypto.py
View File

@ -47,14 +47,12 @@ def salted_hmac(key_salt, value, secret=None, *, algorithm='sha1'):
NOT_PROVIDED = object() # RemovedInDjango40Warning. NOT_PROVIDED = object() # RemovedInDjango40Warning.
RANDOM_STRING_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
# RemovedInDjango40Warning: when the deprecation ends, replace with: # RemovedInDjango40Warning: when the deprecation ends, replace with:
# def get_random_string(length, allowed_chars='...'): # def get_random_string(length, allowed_chars=RANDOM_STRING_CHARS):
def get_random_string(length=NOT_PROVIDED, allowed_chars=( def get_random_string(length=NOT_PROVIDED, allowed_chars=RANDOM_STRING_CHARS):
'abcdefghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
)):
""" """
Return a securely generated random string. Return a securely generated random string.