Fixed version update bug that happens on systems with no internet connection

monkey/common/utils/exceptions.py

@@ -28,3 +28,7 @@ class RulePathCreatorNotFound(Exception):
 
 class InvalidAWSKeys(Exception):
     """ Raise to indicate that AWS API keys are invalid"""
+
+
+class NoInternetError(Exception):
+    """ Raise to indicate problems caused when no internet connection is present"""

monkey/monkey_island/cc/services/version_update.py

@@ -3,6 +3,7 @@ import logging
 import requests
 
 import monkey_island.cc.environment.environment_singleton as env_singleton
+from common.utils.exceptions import NoInternetError
 from common.version import get_version
 
 __author__ = "itay.mizeretz"
@@ -42,7 +43,11 @@ class VersionUpdateService:
         """
         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)