stoobly-agent 1.5.6__tar.gz → 1.5.8__tar.gz

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.5.6
+Version: 1.5.8
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/pyproject.toml

@@ -10,7 +10,7 @@ description = "Record, mock, and test HTTP(s) requests. CLI agent for Stoobly"
 license = "Apache License 2.0"
 name = "stoobly-agent"
 readme = "README.md"
-version = "1.5.6"
+version = "1.5.8"
 
 [tool.poetry.dependencies]
 python = "^3.10"

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.6'
+VERSION = '1.5.8'

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/api/application_http_request_handler.py

@@ -117,14 +117,6 @@ class ApplicationHTTPRequestHandler(SimpleHTTPRequestHandler):
             self.send_header(header, _headers.get(header) or '7200')
             rendered_headers.append(header)
 
-        if self.command == 'GET':
-            header = 'Access-Control-Expose-Headers'
-            exposed_headers = ', '.join([
-                'Content-Disposition',
-            ])
-            self.send_header(header, exposed_headers)
-            rendered_headers.append(header)
-
         return rendered_headers
 
     def preprocess(self):

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/api/bodies_controller.py

@@ -59,7 +59,7 @@ class BodiesController:
         # Extract specific headers
         headers = {}
 
-        accepted_headers = ['content-encoding', 'content-length', 'content-type']
+        accepted_headers = ['content-encoding', 'content-type']
         for header, val in request.headers.items():
             decoded_header = header.lower()
 

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/api/requests_controller.py

@@ -266,6 +266,9 @@ class RequestsController:
             context.render(
                 download = text,
                 filename = filename,
+                headers = {
+                    'Access-Control-Expose-Headers': 'Content-Disposition'
+                },
                 status = 200
             )
         else:

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/api/responses_controller.py

@@ -1,6 +1,7 @@
 import pdb
 import requests
 
+
 from stoobly_agent.app.api.simple_http_request_handler import SimpleHTTPRequestHandler
 from stoobly_agent.app.models.response_model import ResponseModel
 from stoobly_agent.app.settings import Settings
@@ -45,9 +46,9 @@ class ResponsesController:
             'requestId': 1,
             'responseId': 3,
         })
-
+ 
         response_model = self.__response_model(context) 
-        response, status = response_model.update(context.params.get('requestId'), **context.params)
+        response, status = response_model.update(context.params.get('responseId'), **context.params)
 
         if context.filter_response(response, status):
             return
@@ -84,9 +85,7 @@ class ResponsesController:
             )
 
         # Extract specific headers
-        headers = {
-            'Access-Control-Expose-Headers': custom_headers.RESPONSE_ID,
-        }
+        headers = {}
 
         accepted_headers = ['content-type', custom_headers.RESPONSE_ID.lower()]
         for header, val in response.headers.items():
@@ -97,6 +96,12 @@ class ResponsesController:
 
             headers[decoded_header] = val
 
+        expose_headers = 'Access-Control-Expose-Headers'
+        if expose_headers in headers:
+            headers[expose_headers] = ','.join([headers[expose_headers], custom_headers.RESPONSE_ID])
+        else:
+            headers[expose_headers] = custom_headers.RESPONSE_ID
+
         context.render(
             data = response.content,
             headers = headers,

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/cli/ca_cert_cli.py

@@ -32,7 +32,6 @@ def mkcert(**kwargs):
 @ca_cert.command()
 @click.option('--ca-certs-dir-path', default=DataDir.instance().ca_certs_dir_path, help='Path to ca certs directory.')
 def install(**kwargs):
-    pdb.set_trace()
     ca_certs_dir_path = kwargs['ca_certs_dir_path']
     installer = CertificateAuthority(ca_certs_dir_path)
 

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -22,7 +22,7 @@ context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 
 user_id_option=--user-id $(USER_ID)
-stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
+stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p "$(shell echo $(context_dir) | md5sum | awk '{print $$1}')"
 workflow_run_options=--script-path $(workflow_script) $(workflow_service_options)
 workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) $(user_id_option)
 
@@ -30,14 +30,15 @@ app_data_dir=$(app_dir)/.stoobly
 app_namespace_dir=$(app_data_dir)/docker
 app_tmp_dir=$(app_data_dir)/tmp
 dockerfile_path=$(app_namespace_dir)/.Dockerfile.context
-docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
+exec_docker_compose_file_path=$(app_namespace_dir)/stoobly-ui/exec/.docker-compose.exec.yml
 workflow_script=.stoobly/tmp/$(WORKFLOW).sh
 
 # Commands
 docker_command=docker
 docker_compose_command=$(docker_command) compose
+exec_down=$(docker_compose_command) -f "$(exec_docker_compose_file_path)" $(stoobly_exec_options) down
 exec_env=APP_DIR="$(app_dir)" CA_CERTS_DIR="$(ca_certs_dir)" USER_ID="$(USER_ID)"
-exec_up=$(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
+exec_up=$(docker_compose_command) -f "$(exec_docker_compose_file_path)" $(stoobly_exec_options) up --remove-orphans
 source_env=set -a; [ -f .env ] && source .env; set +a
 
 # Build base image
@@ -74,6 +75,8 @@ command/install:
 	$(eval COMMAND=install)
 command/uninstall:
 	$(eval COMMAND=uninstall)
+exec/down:
+	@$(stoobly_exec_env) EXEC_COMMAND=- EXEC_ARGS=- EXEC_OPTIONS=- $(exec_down)
 nameservers: tmpdir
 	@if [ -f /etc/resolv.conf ]; then \
 		nameserver=$$(grep -Eo '([0-9]{1,3}\.){3}[0-9]{1,3}' /etc/resolv.conf) && \
@@ -96,7 +99,7 @@ intercept/enable:
 mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
 mock/services: workflow/mock workflow/services
 mock/logs: workflow/mock workflow/logs
-mock/down: workflow/mock workflow/down workflow/hostname/uninstall
+mock/down: workflow/mock workflow/down workflow/hostname/uninstall exec/down
 pipx/install:
 	@if ! command -v pipx >/dev/null 2>&1; then \
 		echo "pipx is not installed. Installing pipx..."; \
@@ -108,7 +111,7 @@ python/validate:
 		exit 1; \
 	fi
 record: workflow/record ca-cert/install workflow/hostname/install nameservers workflow/up
-record/down: workflow/record workflow/down workflow/hostname/uninstall
+record/down: workflow/record workflow/down workflow/hostname/uninstall exec/down
 record/services: workflow/record workflow/services
 record/logs: workflow/record workflow/logs
 scenario/create:
@@ -148,7 +151,7 @@ stoobly/install: python/validate pipx/install
 test: workflow/test workflow/up
 test/services: workflow/test workflow/services
 test/logs: workflow/test workflow/logs
-test/down: workflow/test workflow/down
+test/down: workflow/test workflow/down exec/down
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down:

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/cli/scaffold_cli.py

@@ -619,6 +619,10 @@ def __build_script(**kwargs):
   if not script_path:
     script_file_name = f"{kwargs['workflow_name']}.sh"
     script_path = os.path.join(data_dir.tmp_dir_path, script_file_name)
+  else:
+    script_dir = os.path.dirname(script_path)
+    if not os.path.exists(script_dir):
+      os.makedirs(script_dir, exist_ok=True)
 
   # Truncate
   with open(script_path, 'w'):

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/models/adapters/python/response/mitmproxy_adapter.py

@@ -46,9 +46,11 @@ class MitmproxyResponseAdapter():
     return self.__timestamp_start + self.__latency
 
   def adapt(self):
+    content = self.__response.content
+
     res = MitmproxyResponse.make(
       self.status_code,
-      self.__response.content,
+      content,
       self.headers,
     )
 

stoobly_agent-1.5.8/stoobly_agent/app/models/factories/resource/local_db/local_db_adapter.py

@@ -0,0 +1,47 @@
+import uuid
+
+from mitmproxy.http import Response as MitmproxyResponse
+
+class LocalDBAdapter():
+
+  def content_encoding_header(self, new_headers: dict, old_headers: dict):
+    content_encoding = new_headers.get('content-encoding')
+    if not content_encoding:
+      # If content-encoding has changed, we will need to decode 'text' and re-encode it
+      content_encoding = old_headers.get('content-encoding') 
+    return content_encoding
+
+  def encode_body(self, body: str, content_encoding: str):
+    # If a content encoding is set in the response headers, encode the body
+    # TODO: we may want to create a separate endpoint for this and have the client drive encoding before updating
+    # otherwise, there's an assumption that the 'text' will always be provided as decoded
+
+    if content_encoding:
+      # Use MitmproxyResponse to encode the body
+      res = MitmproxyResponse.make(
+          200,
+          body,
+          {'content-encoding': content_encoding}
+      )
+      return res.raw_content
+    else: 
+      return body.encode()
+
+  def success(self, d):
+    return d, 200
+
+  def bad_request(self, d = ''):
+    return d, 400
+
+  def not_found(self, d = 'Not Found'):
+    return d, 404
+
+  def internal_error(self, d = 'Internal Error'):
+    return d, 500
+
+  def validate_uuid(self, id: str):
+    try:
+      uuid.UUID(id)
+      return True
+    except Exception:
+      return False

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/models/factories/resource/local_db/request_adapter.py

@@ -233,7 +233,6 @@ class LocalDBRequestAdapter(LocalDBAdapter):
         response_params['status'] = params['status']
 
       if request.update(params):
-
         if len(response_params.keys()) != 0:
           response = request.response
           LocalDBResponseAdapter(self.__request_orm).update(response.id, **response_params)

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/models/factories/resource/local_db/response_adapter.py

@@ -47,18 +47,28 @@ class LocalDBResponseAdapter(LocalDBAdapter):
 
     request_params = {}
 
-    if params.get('headers'):
-      transformer.with_headers(params['headers'])
-      request_params['response_headers_hash'] = RequestHasher.instance().hash_params(params['headers'])
-
     if params.get('status'):
       transformer.with_status(params['status'])
 
+    headers = params.get('headers') or {}
+    if params.get('headers'):
+      transformer.with_headers(headers)
+      request_params['response_headers_hash'] = RequestHasher.instance().hash_params(headers)
+ 
+    # If text not set and content-encoding changed 
+    current_python_response = ORMToRequestsResponseTransformer(response).transform()
+    if not params.get('text'):
+      if headers.get('content-encoding') != current_python_response.headers.get('content-encoding'):
+        params['text'] = current_python_response.content
+
     if params.get('text'):
-      encoded_text = params['text'].encode()
+      text: str = params['text'] # This will be given in decoded format
+      content_encoding = self.content_encoding_header(headers, current_python_response.headers)
+      encoded_text = self.encode_body(text, content_encoding)
+
       transformer.with_body(encoded_text)
       request_params['response_hash'] = RequestHasher.instance().hash_text(encoded_text)
-
+      
     if params.get('latency'):
       control = response.control
       control = ResponseStringControl(control)
@@ -75,7 +85,6 @@ class LocalDBResponseAdapter(LocalDBAdapter):
       }
 
     if response.update(params):
-
       if len(request_params.keys()) != 0:
         request = self.__request_orm.find(response.request_id)
 
@@ -88,11 +97,12 @@ class LocalDBResponseAdapter(LocalDBAdapter):
 
   def __to_show_response(self, response: Response):
     python_response = ORMToRequestsResponseTransformer(response).transform()
+    headers = python_response.headers
     content = python_response.content
 
     return {
       'id': response.id,
-      'mime_type': python_response.headers.get('content-type'),
+      'mime_type': headers.get('content-type'),
       'text': decode(content),
     }
 

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/models/factories/resource/local_db/response_header_adapter.py

@@ -39,7 +39,7 @@ class LocalDBResponseHeaderAdapter(LocalDBAdapter):
     headers = python_response.headers
     headers[name] = value
 
-    LocalDBResponseAdapter(self.__request_orm).update(request_id, headers=headers)
+    LocalDBResponseAdapter(self.__request_orm).update(response.id, headers=headers)
 
     return self.success({
       'name': name,

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/app/models/response_model.py

@@ -30,8 +30,8 @@ class ResponseModel(Model):
     except requests.exceptions.RequestException as e:
       return self.handle_request_error(e)
 
-  def update(self, request_id: str, **params):
+  def update(self, response_id: str, **params):
     try:
-      return self.adapter.update(request_id, **params)
+      return self.adapter.update(response_id, **params)
     except requests.exceptions.RequestException as e:
       return self.handle_request_error(e)

{stoobly_agent-1.5.6 → stoobly_agent-1.5.8}/stoobly_agent/lib/orm/transformers/orm_to_requests_response_transformer.py

@@ -44,7 +44,7 @@ class ORMToRequestsResponseTransformer():
     self.__with_response_id = True
     return self
 
-  def with_body(self, body: str):
+  def with_body(self, body: bytes):
     self.__body = body
     self.__dirty = True