p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bad exception handling in version_update.py

This commit is contained in:
VakarisZ 2020-10-09 10:19:32 +03:00
parent 1cbcb69697
commit 7abafb70e1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monkey/common/utils/exceptions.py
View File

@ -20,3 +20,7 @@ class CredentialsNotRequiredError(RegistrationNotNeededError):
class AlreadyRegisteredError(RegistrationNotNeededError): class AlreadyRegisteredError(RegistrationNotNeededError):
""" Raise to indicate the reason why registration is not required """ """ Raise to indicate the reason why registration is not required """
class NoInternetError(Exception):
""" Raise to indicate problems caused when no internet connection is present"""

11
monkey/monkey_island/cc/services/version_update.py
View File

@ -3,6 +3,7 @@ import logging
import requests import requests
import monkey_island.cc.environment.environment_singleton as env_singleton import monkey_island.cc.environment.environment_singleton as env_singleton
from common.utils.exceptions import NoInternetError
from common.version import get_version from common.version import get_version
__author__ = "itay.mizeretz" __author__ = "itay.mizeretz"
@ -29,8 +30,8 @@ class VersionUpdateService:
if VersionUpdateService.newer_version is None: if VersionUpdateService.newer_version is None:
try: try:
VersionUpdateService.newer_version = VersionUpdateService._check_new_version() VersionUpdateService.newer_version = VersionUpdateService._check_new_version()
except Exception: except NoInternetError:
logger.exception('Failed updating version number') logger.info('Failed updating version number')
return VersionUpdateService.newer_version return VersionUpdateService.newer_version
@ -42,7 +43,11 @@ class VersionUpdateService:
""" """
url = VersionUpdateService.VERSION_SERVER_CHECK_NEW_URL % (env_singleton.env.get_deployment(), get_version()) url = VersionUpdateService.VERSION_SERVER_CHECK_NEW_URL % (env_singleton.env.get_deployment(), get_version())
reply = requests.get(url, timeout=15) try:
reply = requests.get(url, timeout=7)
except requests.exceptions.RequestException:
logger.info("Can't get latest monkey version, probably no connection to the internet.")
raise NoInternetError
res = reply.json().get('newer_version', None) res = reply.json().get('newer_version', None)