IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Vault: Add argument checks to encrypt/decrypt

Browse Source 
Vault's encrypt and decrypt helper function take either symmetric or
public/private key. Raise an exception if either both or none of them
are passed down.

See https://pagure.io/freeipa/issue/7326

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Felipe Volpone <fbarreto@redhat.com>
This commit is contained in:
Christian Heimes
2017-12-18 11:59:25 +01:00
parent 8cb756a229
commit 1c9f0a4b19
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ipaclient/plugins/vault.py
View File

@@ -101,11 +101,15 @@ def encrypt(data, symmetric_key=None, public_key=None):
"""
Encrypts data with symmetric key or public key.
"""
if symmetric_key:
if symmetric_key is not None:
if public_key is not None:
raise ValueError(
"Either a symmetric or a public key is required, not both."
)
fernet = Fernet(symmetric_key)
return fernet.encrypt(data)
elif public_key:
elif public_key is not None:
public_key_obj = load_pem_public_key(
data=public_key,
backend=default_backend()
@@ -119,14 +123,18 @@ def encrypt(data, symmetric_key=None, public_key=None):
)
)
else:
return None
raise ValueError("Either a symmetric or a public key is required.")
def decrypt(data, symmetric_key=None, private_key=None):
"""
Decrypts data with symmetric key or public key.
"""
if symmetric_key:
if symmetric_key is not None:
if private_key is not None:
raise ValueError(
"Either a symmetric or a private key is required, not both."
)
try:
fernet = Fernet(symmetric_key)
return fernet.decrypt(data)
@@ -134,7 +142,7 @@ def decrypt(data, symmetric_key=None, private_key=None):
raise errors.AuthenticationError(
message=_('Invalid credentials'))
elif private_key:
elif private_key is not None:
try:
private_key_obj = load_pem_private_key(
data=private_key,
@@ -153,7 +161,7 @@ def decrypt(data, symmetric_key=None, private_key=None):
raise errors.AuthenticationError(
message=_('Invalid credentials'))
else:
return None
raise ValueError("Either a symmetric or a private key is required.")
@register(no_fail=True)