read req body without renderer_context,added warns

Author: monrax

usagelogger/django.py

@@ -24,40 +24,45 @@ def __init__(self, get_response):
             url=__read_settings__("url"), rules=__read_settings__("rules")
         )
 
-    def prepare_request(self, request, response):
+    def prepare_request_body(self, request, response=None):
         RE_PATTERN = r'(?<=; filename=")(.*?)"\\r\\nContent-Type: (.*?)\\r\\n(.*?)((-+)([a-zA-Z0-9_.-]+)\\r\\nContent-Disposition:)'  # noqa
         RE_REPLACE_TO = r'\1"\\r\\nContent-Type: \2\\r\\n\\r\\n<file-data>\\r\\n\4'
         request.encoding = "utf-8"
         is_multipart = request.content_type == "multipart/form-data"
 
-        try:
-            if is_multipart:
-                request._rsf_body = (
-                    re.sub(
-                        pattern=RE_PATTERN,
-                        repl=RE_REPLACE_TO,
-                        string="%r" % request.body,
+        if response is None:
+            try:
+                if is_multipart:
+                    body = (
+                        re.sub(
+                            pattern=RE_PATTERN,
+                            repl=RE_REPLACE_TO,
+                            string="%r" % request.body,
+                        )
+                        .encode()
+                        .decode("unicode_escape")
                     )
-                    .encode()
-                    .decode("unicode_escape")
-                )
-            else:
-                request._rsf_body = request.body.decode(request.encoding)
-        except RawPostDataException:
+                else:
+                    body = request.body.decode(request.encoding)
+            except RawPostDataException:
+                body = None
+        else:
             try:
-                request._rsf_body = str(response.renderer_context["request"].data)
+                body = str(response.renderer_context["request"].data)
             except AttributeError:
-                request._rsf_body = request.readlines()
+                body = request.readlines()
 
-        return request
+        return body
 
     def __call__(self, request):
         start_time = time.time()
+        request_body = self.prepare_request_body(request)
         response = self.get_response(request)
         interval = str((time.time() - start_time) * 1000)
         method = request.method
-
-        _request = self.prepare_request(request, response)
+        
+        if request_body is None:
+            request_body = self.prepare_request_body(request, response)
 
         HttpMessage.send(
             self.logger,
@@ -66,7 +71,7 @@ def __call__(self, request):
                 url=str(request.build_absolute_uri()),
                 headers=request.headers,
                 params=request.POST if method == "POST" else request.GET,
-                body=_request._rsf_body,
+                body=request_body,
             ),
             response=HttpResponseImpl(
                 status=response.status_code,

usagelogger/http_logger.py

@@ -2,6 +2,7 @@
 # © 2016-2021 Resurface Labs Inc.
 
 import json
+import logging
 from typing import List, Optional
 
 from .base_logger import BaseLogger
@@ -24,6 +25,14 @@ def __init__(
         rules: Optional[str] = None,
     ) -> None:
 
+        warner = logging.getLogger(__name__)
+        argtype_warn = "Resurface: Invalid type for {} " \
+                  "(argument should be a {}). Logger won't be enabled."
+        if url and type(url) != str:
+            warner.error(argtype_warn.format("url", "string"))
+        if rules and type(rules) != str:
+            warner.error(argtype_warn.format("rules", "string"))
+
         super().__init__(
             self.AGENT,
             enabled=enabled,
@@ -47,6 +56,9 @@ def __init__(
         ):
             self._enableable = False
             self._enabled = False
+        
+        if not self.enabled:
+            warner.error("Resurface: Logger is not enabled.")
 
     @property
     def rules(self) -> HttpRules: