refactor(security): improve encryption using PyCryptodome and PBKDF2
Replace the `cryptography` library with `pycryptodome` for password encryption. The previous implementation used AES-GCM with a static key derived from a hardcoded secret. This change introduces a more robust security model by: - Using PBKDF2 to derive the encryption key from the secret. - Adding a unique, randomly generated salt for each encrypted password. This significantly enhances security by protecting against rainbow table and pre-computation attacks. BREAKING CHANGE: The password encryption format has changed. All previously encrypted passwords stored in the database are now invalid and will need to be reset.
This commit is contained in:
parent
79a2f6e944
commit
aa1b9d7281
@ -1,30 +1,26 @@
|
||||
import os
|
||||
import hashlib
|
||||
from cryptography.hazmat.primitives.ciphers.aead import AESGCM
|
||||
from Crypto.Cipher import AES
|
||||
from Crypto.Protocol.KDF import PBKDF2
|
||||
from Crypto.Random import get_random_bytes
|
||||
|
||||
SECRET = "BBLBTV-DNS-PASSWORDS"
|
||||
KEY = hashlib.sha256(SECRET.encode()).digest()
|
||||
ALGORITHM = "aes-256-gcm"
|
||||
IV_LENGTH = 16
|
||||
AUTH_TAG_LENGTH = 16
|
||||
SALT_SIZE = 16
|
||||
KEY_SIZE = 32
|
||||
ITERATIONS = 100000
|
||||
|
||||
def encrypt_password(clear_string):
|
||||
iv = os.urandom(IV_LENGTH)
|
||||
aesgcm = AESGCM(KEY)
|
||||
|
||||
ciphertext_and_tag = aesgcm.encrypt(iv, clear_string.encode(), None)
|
||||
ciphertext = ciphertext_and_tag[:-AUTH_TAG_LENGTH]
|
||||
tag = ciphertext_and_tag[-AUTH_TAG_LENGTH:]
|
||||
|
||||
return (iv + tag + ciphertext).hex()
|
||||
salt = get_random_bytes(SALT_SIZE)
|
||||
key = PBKDF2(SECRET, salt, dkLen=KEY_SIZE, count=ITERATIONS)
|
||||
cipher = AES.new(key, AES.MODE_GCM)
|
||||
ciphertext, tag = cipher.encrypt_and_digest(clear_string.encode())
|
||||
return (salt + cipher.nonce + tag + ciphertext).hex()
|
||||
|
||||
def decrypt_password(encrypted_string):
|
||||
data = bytes.fromhex(encrypted_string)
|
||||
|
||||
iv = data[:IV_LENGTH]
|
||||
tag = data[IV_LENGTH:IV_LENGTH + AUTH_TAG_LENGTH]
|
||||
ciphertext = data[IV_LENGTH + AUTH_TAG_LENGTH:]
|
||||
|
||||
aesgcm = AESGCM(KEY)
|
||||
decrypted_bytes = aesgcm.decrypt(iv, ciphertext + tag, None)
|
||||
return decrypted_bytes.decode()
|
||||
salt = data[:SALT_SIZE]
|
||||
nonce = data[SALT_SIZE:SALT_SIZE + 16]
|
||||
tag = data[SALT_SIZE + 16:SALT_SIZE + 32]
|
||||
ciphertext = data[SALT_SIZE + 32:]
|
||||
key = PBKDF2(SECRET, salt, dkLen=KEY_SIZE, count=ITERATIONS)
|
||||
cipher = AES.new(key, AES.MODE_GCM, nonce=nonce)
|
||||
return cipher.decrypt_and_verify(ciphertext, tag).decode()
|
||||
|
Loading…
x
Reference in New Issue
Block a user