stoobly-agent 1.8.5__py3-none-any.whl → 1.9.1__py3-none-any.whl

stoobly_agent/app/proxy/record/request_string.py

@@ -9,7 +9,7 @@ from stoobly_agent.lib.utils.decode import decode
 from .proxy_request import ProxyRequest
 from .request_string_control import RequestStringControl
 
-CLRF = "\r\n"
+CLRF = b"\r\n"
 
 class RequestString:
     ENCODING = 'utf-8'
@@ -36,20 +36,19 @@ class RequestString:
 
     def get(self, **kwargs):
         if kwargs.get('control'):
-            return CLRF.join([self.control] + self.lines).encode(self.ENCODING)
+            return CLRF.join([self.control] + self.lines)
         else:
-            return CLRF.join(self.lines).encode(self.ENCODING)
+            return CLRF.join(self.lines)
 
     def set(self, s: bytes):
-        decoded_s = decode(s, self.ENCODING)
-        self.lines = decoded_s.split(CLRF)
+        self.lines = s.split(CLRF)
 
     @property
     def control(self):
         control = RequestStringControl()
         control.id = self.request_id
         control.timestamp = self.__current_time
-        return control.serialize()
+        return control.serialize().encode(self.ENCODING)
 
     @control.setter
     def control(self, c: str):
@@ -58,20 +57,27 @@ class RequestString:
         self.__current_time = control.timestamp
 
     def __request_line(self):
-        self.lines.append("{} {} HTTP/1.1".format(self.request.method, self.proxy_request.url()))
+        line = "{} {} HTTP/1.1".format(self.request.method, self.proxy_request.url())
+        self.lines.append(line.encode(self.ENCODING))
 
     def __headers(self):
         headers = self.request.headers
 
         for name, val in headers.items():
+            if 'content-encoding' in headers:
+                # self.request.body will decode content-encoding
+                # to maintain internal consistency, remove this header since it will be decoded
+                print(self.request.body)
+                pass
+
             line = ' '.join([
                 "{}:".format(self.__to_header_case(self.__to_str(name))), 
                 self.__to_str(val)
             ])
-            self.lines.append(line)
+            self.lines.append(line.encode(self.ENCODING))
 
     def __body(self):
-        self.lines.append("{}{}".format(CLRF, self.request.body))
+        self.lines.append(CLRF + self.request.body)
 
     def __to_header_case(self, header: str) -> str:
         toks = header.split('_')

stoobly_agent/app/proxy/replay/body_parser_service.py

@@ -14,6 +14,7 @@ from .multipart import decode as multipart_decode, encode as multipart_encode
 JSON = 'application/json'
 MULTIPART_FORM = 'multipart/form-data'
 WWW_FORM_URLENCODED = 'application/x-www-form-urlencoded'
+XML = 'application/xml'
 
 def compress(body: Union[bytes, str], content_encoding: Union[None, str]) -> Union[bytes, str]:
     if content_encoding:
@@ -113,14 +114,24 @@ def normalize_header(header):
 def is_traversable(content):
     return isinstance(content, list) or isinstance(content, dict) or isinstance(content, MultiDict)
 
-def is_json(content_type):
-   _content_type = content_type.lower()
-   return _content_type == JSON or _content_type.startswith('application/x-amz-json') 
+def is_json(content_type: str):
+    if not content_type:
+        return False
+
+    _content_type = content_type.lower().split(';')[0]
+    # e.g. custom json content-type: application/x-amz-json
+    return _content_type == JSON or (_content_type.startswith('application/') and _content_type.endswith('json'))
 
+def is_xml(content_type: str):
+    if not content_type:
+        return False
+
+    _content_type = content_type.lower().split(';')[0]
+    # e.g. custom json content-type: application/x-amz-json
+    return _content_type == XML or (_content_type.startswith('application/') and _content_type.endswith('xml'))
 
 def __parse_separated_header(header: str):
     # Adapted from https://peps.python.org/pep-0594/#cgi
     message = Message()
     message['content-type'] = header 
     return message.get_content_type()
-

stoobly_agent/app/proxy/replay/replay_request_service.py

@@ -150,6 +150,7 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
     if options.get('save') or options.get('overwrite'):
       replayed_response, status = __create_replayed_response(context.request.id, res, latency)
 
+      # TODO: allow overwriting if status is the same
       if status < 400 and options.get('overwrite'):
         __overwrite_response(replayed_response.get('id'))
 

stoobly_agent/app/settings/data_rules.py

@@ -1,4 +1,4 @@
-from stoobly_agent.config.constants import mock_policy, record_policy, replay_policy, test_strategy
+from stoobly_agent.config.constants import mock_policy, record_order, record_policy, replay_policy, test_strategy
 
 from .types.proxy_settings import DataRules as IDataRules
 
@@ -8,6 +8,7 @@ class DataRules:
     self.__data_rules = data_rules or {}
 
     self.__mock_policy = self.__data_rules.get('mock_policy') or mock_policy.FOUND
+    self.__record_order = self.__data_rules.get('record_order') or record_order.APPEND
     self.__record_policy = self.__data_rules.get('record_policy') or record_policy.ALL
     self.__replay_policy = self.__data_rules.get('replay_policy') or replay_policy.ALL
     self.__scenario_key = self.__data_rules.get('scenario_key')
@@ -32,6 +33,19 @@ class DataRules:
     self.__record_policy = v
     self.__data_rules['record_policy'] = v
 
+  @property
+  def record_order(self):
+    return self.__record_order
+
+  @record_order.setter
+  def record_order(self, v):
+    valid_orders = [record_order.APPEND, record_order.OVERWRITE]
+    if v not in valid_orders:
+      raise TypeError(f"record_order has to be one of {valid_orders}, got {v}")
+
+    self.__record_order = v
+    self.__data_rules['record_order'] = v
+
   @property
   def replay_policy(self):
     return self.__replay_policy
@@ -68,6 +82,7 @@ class DataRules:
   def to_dict(self) -> IDataRules:
     return {
       'mock_policy': self.__mock_policy,
+      'record_order': self.__record_order,
       'record_policy': self.__record_policy,
       'replay_policy': self.__replay_policy,
       'scenario_key': self.__scenario_key,

stoobly_agent/config/constants/custom_headers.py

@@ -23,6 +23,7 @@ SESSION_ID = 'X-Stoobly-Session-Id'
 SERVICE_URL = 'X-Stoobly-Service-Url'
 TEST_FILTER = 'X-Stoobly-Test-Filter'
 TEST_ID = 'X-Stoobly-Test-Id'
+TEST_POLICY = 'X-Stoobly-Test-Policy'
 TEST_SAVE_RESULTS = 'X-Stoobly-Test-Save-Results'
 TEST_SKIP = 'X-Stoobly-Test-Skip'
 TEST_STRATEGY = 'X-Stoobly-Test-Strategy'

stoobly_agent/config/constants/lifecycle_hooks.py

@@ -1,4 +1,5 @@
 AFTER_MOCK = 'handle_after_mock'
+AFTER_MOCK_NOT_FOUND = 'handle_after_mock_not_found'
 AFTER_RECORD = 'handle_after_record'
 AFTER_REPLAY = 'handle_after_replay'
 AFTER_TEST = 'handle_after_test'

stoobly_agent/config/constants/record_order.py

@@ -0,0 +1,6 @@
+from typing import Literal
+
+APPEND = 'append'
+OVERWRITE = 'overwrite'
+
+RecordOrder = Literal[APPEND, OVERWRITE]

stoobly_agent/config/constants/record_policy.py

@@ -1,7 +1,7 @@
 from .intercept_policy import ALL as INTERCEPT_ALL, NONE as INTERCEPT_NONE
 
 ALL = INTERCEPT_ALL
+API = 'api'
 FOUND = 'found'
 NONE = INTERCEPT_NONE
-NOT_FOUND = 'not_found'
-OVERWRITE = 'overwrite'
+NOT_FOUND = 'not_found'