From 64f06b11b8ff108957b520862fcbc771cdc900ae Mon Sep 17 00:00:00 2001 From: Sergio Garcia <38561120+sergargar@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:44:16 +0200 Subject: [PATCH] fix(version): add timeout and check HTTP errors (#2886) --- prowler/config/config.py | 9 ++++----- tests/config/config_test.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/prowler/config/config.py b/prowler/config/config.py index 7e4bfd3a..9bd75c22 100644 --- a/prowler/config/config.py +++ b/prowler/config/config.py @@ -64,17 +64,16 @@ def check_current_version(): try: prowler_version_string = f"Prowler {prowler_version}" release_response = requests.get( - "https://api.github.com/repos/prowler-cloud/prowler/tags" + "https://api.github.com/repos/prowler-cloud/prowler/tags", timeout=1 ) latest_version = release_response.json()[0]["name"] if latest_version != prowler_version: return f"{prowler_version_string} (latest is {latest_version}, upgrade for the latest features)" else: return f"{prowler_version_string} (it is the latest version, yay!)" - except Exception as error: - logger.error( - f"{error.__class__.__name__}[{error.__traceback__.tb_lineno}] -- {error}" - ) + except requests.RequestException: + return f"{prowler_version_string}" + except Exception: return f"{prowler_version_string}" diff --git a/tests/config/config_test.py b/tests/config/config_test.py index ddf8257b..ab116d35 100644 --- a/tests/config/config_test.py +++ b/tests/config/config_test.py @@ -17,7 +17,7 @@ MOCK_PROWLER_VERSION = "3.3.0" MOCK_OLD_PROWLER_VERSION = "0.0.0" -def mock_prowler_get_latest_release(_): +def mock_prowler_get_latest_release(_, **kwargs): """Mock requests.get() to get the Prowler latest release""" response = Response() response._content = b'[{"name":"3.3.0"}]'