Switched to a custom low-iteration Secret hasher to avoid excessive delay when retrieving many Secrets
This commit is contained in:
9
netbox/secrets/hashers.py
Normal file
9
netbox/secrets/hashers.py
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
from django.contrib.auth.hashers import PBKDF2PasswordHasher
|
||||||
|
|
||||||
|
|
||||||
|
class SecretValidationHasher(PBKDF2PasswordHasher):
|
||||||
|
"""
|
||||||
|
We're using Django's stock SHA256 hasher with a low iteration count to avoid introducing excessive delay when
|
||||||
|
retrieving a large number of Secrets (the plaintext of each Secret is validated against its hash upon decryption).
|
||||||
|
"""
|
||||||
|
iterations = 1000
|
@@ -11,6 +11,7 @@ from django.db import models
|
|||||||
from django.utils.encoding import force_bytes
|
from django.utils.encoding import force_bytes
|
||||||
|
|
||||||
from dcim.models import Device
|
from dcim.models import Device
|
||||||
|
from .hashers import SecretValidationHasher
|
||||||
|
|
||||||
|
|
||||||
def generate_master_key():
|
def generate_master_key():
|
||||||
@@ -245,7 +246,7 @@ class Secret(models.Model):
|
|||||||
self.ciphertext = iv + aes.encrypt(self._pad(self.plaintext))
|
self.ciphertext = iv + aes.encrypt(self._pad(self.plaintext))
|
||||||
|
|
||||||
# Generate SHA256 using Django's built-in password hashing mechanism
|
# Generate SHA256 using Django's built-in password hashing mechanism
|
||||||
self.hash = make_password(self.plaintext, hasher='pbkdf2_sha256')
|
self.hash = make_password(self.plaintext, hasher=SecretValidationHasher())
|
||||||
|
|
||||||
self.plaintext = None
|
self.plaintext = None
|
||||||
|
|
||||||
@@ -277,4 +278,4 @@ class Secret(models.Model):
|
|||||||
"""
|
"""
|
||||||
if not self.hash:
|
if not self.hash:
|
||||||
raise Exception("Hash has not been generated for this secret.")
|
raise Exception("Hash has not been generated for this secret.")
|
||||||
return check_password(plaintext, self.hash)
|
return check_password(plaintext, self.hash, preferred=SecretValidationHasher())
|
||||||
|
Reference in New Issue
Block a user