External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 03:10:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove unused encryption method and update comment

Browse Source
This commit is contained in:
Wayne Witzel III 2017-06-12 13:00:38 -04:00
parent 861d6a659c
commit d1008e4ccd
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/utils/encryption.py
View File

@ -7,7 +7,7 @@ from cryptography.fernet import Fernet
from django.utils.encoding import smart_str
__all__ = ['get_encryption_key', 'encrypt_field', 'decrypt_field', 'decrypt_value', 'decrypt_field_value']
__all__ = ['get_encryption_key', 'encrypt_field', 'decrypt_field', 'decrypt_value']
def get_encryption_key(field_name, pk=None):
@ -15,7 +15,7 @@ def get_encryption_key(field_name, pk=None):
Generate key for encrypted password based on field name,
``settings.SECRET_KEY``, and instance pk (if available).
:param pk: (optional) the primary key of the ``awx.conf.model.Setting``;
:param pk: (optional) the primary key of the model object;
can be omitted in situations where you're encrypting a setting
that is not database-persistent (like a read-only setting)
'''
@ -84,8 +84,3 @@ def decrypt_field(instance, field_name, subfield=None):
key = get_encryption_key(field_name, getattr(instance, 'pk', None))
return decrypt_value(key, value)
def decrypt_field_value(pk, field_name, value):
key = get_encryption_key(field_name, pk)
return decrypt_value(key, value)