Merge pull request #41 from FireTail-io/fix/response/payload

changed response body to use stringified json

Author: rileyfiretail

firetail/auditor.py

@@ -26,7 +26,15 @@ def __init__(
         number_of_retries=4,
         retry_timeout=2,
         logs_drain_timeout=5,
-        scrub_headers=["set-cookie", "cookie", "authorization", "x-api-key", "token", "api-token", "api-key"],
+        scrub_headers=[
+            "set-cookie",
+            "cookie",
+            "authorization",
+            "x-api-key",
+            "token",
+            "api-token",
+            "api-key",
+        ],
         enrich_oauth=True,
     ):
         self.startThread = True
@@ -49,7 +57,12 @@ def __init__(
         self.LOGGING = {
             "version": 1,
             "disable_existing_loggers": False,
-            "formatters": {"firetailFormat": {"format": '{"additional_field": "value"}', "validate": False}},
+            "formatters": {
+                "firetailFormat": {
+                    "format": '{"additional_field": "value"}',
+                    "validate": False,
+                }
+            },
             "handlers": {
                 "firetail": {
                     "class": "firetail.handlers.FiretailHandler",
@@ -98,7 +111,10 @@ def clean_pii(self, payload):
 
         if self.oauth and self.enrich_oauth:
             try:
-                jwt_decoded = jwt.decode(self.auth_token, options={"verify_signature": False, "verify_exp": False})
+                jwt_decoded = jwt.decode(
+                    self.auth_token,
+                    options={"verify_signature": False, "verify_exp": False},
+                )
             except jwt.exceptions.DecodeError:
                 self.oauth = False
             if self.oauth:
@@ -124,7 +140,7 @@ def create(self, response, token, diff=-1, scrub_headers=None, debug=False):
             logging.config.dictConfig(self.LOGGING)
             self.logger = logging.getLogger("firetailLogger")
         try:
-            response_data = response.get_json() if response.is_json else str(response.response[0].decode("utf-8"))
+            response_data = response.get_data(as_text=True)
         except Exception:
             response_data = ""
         payload = {
@@ -137,12 +153,13 @@ def create(self, response, token, diff=-1, scrub_headers=None, debug=False):
                 "headers": self.format_headers(dict(request.headers)),
                 "resource": request.url_rule.rule if request.url_rule is not None else request.path,
                 "method": request.method,
-                "body": str(request.data),
+                "body": request.get_data(as_text=True),
+
                 "ip": request.remote_addr,
             },
             "response": {
                 "statusCode": response.status_code,
-                "body": str(response_data),
+                "body": response_data,
                 "headers": self.format_headers(dict(response.headers)),
             },
         }