From 1e2cac87e9a1ea6b6ab04dbb166d6b64ddcc771f Mon Sep 17 00:00:00 2001 From: El Mau Date: Wed, 9 Feb 2022 21:39:50 -0600 Subject: [PATCH] Validar FIEL en cada proceso --- CHANGELOG.md | 5 +++++ VERSION | 2 +- source/sat/util.py | 16 ++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1a19db..75e154c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Lista de cambios +## v 0.5.1 [09-Feb-22] +--- +* Fix - Validar fiel en cada proceso. + + ## v 0.5.0 [06-Feb-22] --- * Se cambia la lógica para evitar el error de token caducado. diff --git a/VERSION b/VERSION index 8f0916f..4b9fcbe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.0 +0.5.1 diff --git a/source/sat/util.py b/source/sat/util.py index 2397048..3328694 100644 --- a/source/sat/util.py +++ b/source/sat/util.py @@ -221,14 +221,12 @@ def _validate_verificar_args(args): if not result: return False, {} - if not data['path_enc'].is_file(): - msg = f"No se encontró la FIEL encriptada. \nRuta: {data['path_enc']}" + if not data['path_enc'].is_file() and not data['path_pem'].is_file(): + msg = f"No se encontró la FIEL [enc|pem].\nRuta: {data['path_enc']}" log.error(msg) return False, {} - cer = data['path_cer'].read_bytes() - key = data['path_enc'].read_bytes() - cert = SATCertificate(cer, key) + cert = _get_cert(data) if not cert.is_valid_time: msg = 'La FIEL no es vigente' @@ -251,14 +249,12 @@ def _validate_download_args(args): if not result: return False, {} - if not data['path_enc'].is_file(): - msg = f"No se encontró la FIEL encriptada. \nRuta: {data['path_enc']}" + if not data['path_enc'].is_file() and not data['path_pem'].is_file(): + msg = f"No se encontró la FIEL [enc|pem].\nRuta: {data['path_enc']}" log.error(msg) return False, {} - cer = data['path_cer'].read_bytes() - key = data['path_enc'].read_bytes() - cert = SATCertificate(cer, key) + cert = _get_cert(data) if not cert.is_valid_time: msg = 'La FIEL no es vigente'