Align timeout and default response

Author: Inbal Tako

securenative/api_manager.py

@@ -23,7 +23,7 @@ def verify(self, event_options):
         Logger.debug("Verify event call")
         event = SDKEvent(event_options, self.options)
         try:
-            res = json.loads(self.event_manager.send_sync(event, ApiRoute.VERIFY.value, False).text)
+            res = json.loads(self.event_manager.send_sync(event, ApiRoute.VERIFY.value).text)
             return VerifyResult(res["riskLevel"], res["score"], res["triggers"])
         except Exception as e:
             Logger.debug("Failed to call verify; {}".format(e))

securenative/event_manager.py

@@ -54,7 +54,7 @@ def flush(self):
         for item in self.queue:
             self.http_client.post(item.url, item.body)
 
-    def send_sync(self, event, resource_path, retry):
+    def send_sync(self, event, resource_path):
         if self.options.disable:
             Logger.warning("SDK is disabled. no operation will be performed")
             return
@@ -64,17 +64,9 @@ def send_sync(self, event, resource_path, retry):
             resource_path,
             json.dumps(EventManager.serialize(event))
         )
-        if res.status_code != 200:
-            Logger.info("SecureNative failed to call endpoint {} with event {}. adding back to queue".format(
-                resource_path, event))
-            item = QueueItem(
-                resource_path,
-                json.dumps(EventManager.serialize(event)),
-                retry
-            )
-            self.queue.append(item)
-            if self._is_queue_full():
-                self.queue = self.queue[:len(self.queue - 1)]
+        if res is None or res.status_code != 200:
+            Logger.info("SecureNative failed to call endpoint {} with event {}.".format(resource_path, event))
+
         return res
 
     def _is_queue_full(self):

securenative/http/securenative_http_client.py

@@ -1,4 +1,5 @@
 import requests
+from requests import Timeout
 
 from securenative.utils.version_utils import VersionUtils
 
@@ -24,4 +25,8 @@ def _headers(self):
 
     def post(self, path, body):
         url = "{}/{}".format(self.options.api_url, path)
-        return requests.post(url=url, data=body, headers=self._headers())
+        try:
+            res = requests.post(url=url, data=body, headers=self._headers(), timeout=self.options.timeout / 1000)
+            return res
+        except Timeout:
+            return None

tests/api_manager_test.py

@@ -8,7 +8,6 @@
 from securenative.enums.event_types import EventTypes
 from securenative.enums.risk_level import RiskLevel
 from securenative.event_manager import EventManager
-from securenative.exceptions.securenative_invalid_options_exception import SecureNativeInvalidOptionsException
 from securenative.models.event_options import EventOptions
 from securenative.models.user_traits import UserTraits
 from securenative.models.verify_result import VerifyResult
@@ -49,6 +48,25 @@ def test_track_event(self):
         finally:
             event_manager.stop_event_persist()
 
+    @responses.activate
+    def test_should_timeout_on_post(self):
+        options = SecureNativeOptions(api_key="YOUR_API_KEY", auto_send=True, timeout=-1,
+                                      api_url="https://api.securenative-stg.com/collector/api/v1")
+
+        responses.add(responses.POST, "https://api.securenative-stg.com/collector/api/v1/verify",
+                      json={"event": "SOME_EVENT_NAME"}, status=408)
+
+        event_manager = EventManager(options)
+        event_manager.start_event_persist()
+        api_manager = ApiManager(event_manager, options)
+
+        verify_result = VerifyResult(RiskLevel.LOW.value, 0, None)
+        res = api_manager.verify(self.event_options)
+
+        self.assertEqual(res.risk_level, verify_result.risk_level)
+        self.assertEqual(res.score, verify_result.score)
+        self.assertEqual(res.triggers, verify_result.triggers)
+
     @responses.activate
     def test_verify_event(self):
         options = SecureNativeOptions(api_key="YOUR_API_KEY",

tests/event_manager_test.py

@@ -37,7 +37,7 @@ def test_should_successfully_send_sync_event_with_status_code_200(self):
                       json=json.loads(res_body), status=200)
         event_manager = EventManager(options)
 
-        data = event_manager.send_sync(self.event, "some-path/to-api", False)
+        data = event_manager.send_sync(self.event, "some-path/to-api")
         self.assertEqual(res_body, data.text)
 
     @responses.activate
@@ -49,7 +49,7 @@ def test_should_send_sync_event_and_fail_when_status_code_401(self):
                       json={}, status=401)
         event_manager = EventManager(options)
 
-        res = event_manager.send_sync(self.event, "some-path/to-api", False)
+        res = event_manager.send_sync(self.event, "some-path/to-api")
 
         self.assertEqual(res.status_code, 401)
 
@@ -62,6 +62,6 @@ def test_should_send_sync_event_and_fail_when_status_code_500(self):
                       json={}, status=500)
         event_manager = EventManager(options)
 
-        res = event_manager.send_sync(self.event, "some-path/to-api", False)
+        res = event_manager.send_sync(self.event, "some-path/to-api")
 
         self.assertEqual(res.status_code, 500)