aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 22:24:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more contrains to load_keys and updates unit tests

Browse Source
This commit is contained in:
Sergi Delgado Segura
2020-03-17 20:22:03 +01:00
parent 568d72a1ad
commit d18944e2ba
2 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/cli/teos_cli.py
View File

@@ -39,24 +39,39 @@ def load_keys(teos_pk_path, cli_sk_path, cli_pk_path):
encoded key if all keys can be loaded. ``None`` otherwise.
"""
teos_pk_der = Cryptographer.load_key_file(teos_pk_path)
teos_pk = PublicKey(teos_pk_der)
if teos_pk is None:
if teos_pk_path is None:
logger.error("TEOS's public key file not found. Please check your settings")
return None
if cli_sk_path is None:
logger.error("Client's private key file not found. Please check your settings")
return None
if cli_pk_path is None:
logger.error("Client's public key file not found. Please check your settings")
return None
try:
teos_pk_der = Cryptographer.load_key_file(teos_pk_path)
teos_pk = PublicKey(teos_pk_der)
except ValueError:
logger.error("TEOS public key is invalid or cannot be parsed")
return None
cli_sk_der = Cryptographer.load_key_file(cli_sk_path)
cli_sk = Cryptographer.load_private_key_der(cli_sk_der)
if cli_sk is None:
logger.error("Client's private key file not found. Please check your settings")
logger.error("Client private key is invalid or cannot be parsed")
return None
cli_pk_der = Cryptographer.load_key_file(cli_pk_path)
try:
cli_pk_der = Cryptographer.load_key_file(cli_pk_path)
PublicKey(cli_pk_der)
if cli_pk_der is None:
logger.error("Client's public key file not found. Please check your settings")
except ValueError:
logger.error("Client public key is invalid or cannot be parsed")
return None
return teos_pk, cli_sk, cli_pk_der