stoobly-agent 1.9.12__py3-none-any.whl → 1.10.0__py3-none-any.whl

stoobly_agent/app/cli/scaffold/templates/constants.py

@@ -13,6 +13,7 @@ CORE_RECORD_WORKFLOW = 'record'
 
 CUSTOM_BUILD = os.path.join('bin', 'build')
 CUSTOM_CONFIGURE = os.path.join('bin', 'configure')
+CUSTOM_DOCKER_COMPOSE = 'docker-compose.yml'
 CUSTOM_INIT = os.path.join('bin', 'init')
 CUSTOM_FIXTURES = 'fixtures.yml'
 CUSTOM_LIFECYCLE_HOOKS = os.path.join('lifecycle_hooks.py')
@@ -28,6 +29,7 @@ MOCK_WORKFLOW_MAINTAINED_FILES = [
 MOCK_WORKFLOW_CUSTOM_FILES = [
   CUSTOM_BUILD,
   CUSTOM_CONFIGURE,
+  CUSTOM_DOCKER_COMPOSE,
   CUSTOM_FIXTURES,
   CUSTOM_INIT,
   CUSTOM_LIFECYCLE_HOOKS,
@@ -42,6 +44,7 @@ RECORD_WORKFLOW_MAINTAINED_FILES = [
 RECORD_WORKFLOW_CUSTOM_FILES = [
   CUSTOM_BUILD,
   CUSTOM_CONFIGURE,
+  CUSTOM_DOCKER_COMPOSE,
   CUSTOM_INIT,
   CUSTOM_LIFECYCLE_HOOKS,
 ]
@@ -54,6 +57,7 @@ TEST_WORKFLOW_MAINTAINED_FILES = [
 TEST_WORKFLOW_CUSTOM_FILES = [
   CUSTOM_BUILD,
   CUSTOM_CONFIGURE,
+  CUSTOM_DOCKER_COMPOSE,
   CUSTOM_FIXTURES,
   CUSTOM_INIT,
   CUSTOM_LIFECYCLE_HOOKS,

stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.Dockerfile.cypress

@@ -0,0 +1,22 @@
+ARG CYPRESS_IMAGE
+FROM ${CYPRESS_IMAGE}
+
+# Change user id of stoobly user to that of host's user id
+ARG USER_ID
+ARG USER_NAME=stoobly
+RUN set -eux; \
+    # Check if a user with this UID exists
+    if getent passwd "${USER_ID}" > /dev/null; then \
+        EXISTING_USER="$(getent passwd "${USER_ID}" | cut -d: -f1)"; \
+        if [ "$EXISTING_USER" != "${USER_NAME}" ]; then \
+            usermod -l "${USER_NAME}" "$EXISTING_USER"; \
+            usermod -d "/home/${USER_NAME}" -m "${USER_NAME}"; \
+        fi; \
+    else \
+        useradd -u "${USER_ID}" -m "${USER_NAME}"; \
+    fi
+
+USER stoobly
+WORKDIR /home/stoobly
+
+RUN npx cypress install # Install Cypress binary into image

stoobly_agent/app/cli/scaffold/templates/plugins/cypress/test/.docker-compose.test.yml

@@ -0,0 +1,19 @@
+services:
+  entrypoint.cypress:
+    build:
+      args:
+        CYPRESS_IMAGE: ${CYPRESS_IMAGE:-cypress/browsers:22.11.0}
+        USER_ID: ${USER_ID}
+      context: ./
+      dockerfile: ./.Dockerfile.cypress
+    command: npx cypress run --project .
+    depends_on:
+      entrypoint.configure:
+        condition: service_completed_successfully
+    networks:
+      - "app.ingress"
+    profiles:
+      - ${WORKFLOW_NAME}
+    user: stoobly
+    volumes:
+      - ${CONTEXT_DIR}:/home/stoobly

stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.Dockerfile.playwright

@@ -0,0 +1,33 @@
+ARG PLAYWRIGHT_IMAGE
+FROM ${PLAYWRIGHT_IMAGE} 
+
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends ca-certificates wget; \
+    dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
+    wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.16/gosu-$dpkgArch"; \
+    chmod +x /usr/local/bin/gosu; \
+    gosu --version;
+RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN npx playwright install --with-deps
+
+# Change user id of stoobly user to that of host's user id
+ARG USER_ID
+ARG USER_NAME=stoobly
+RUN set -eux; \
+    # Check if a user with this UID exists
+    if getent passwd "${USER_ID}" > /dev/null; then \
+        EXISTING_USER="$(getent passwd "${USER_ID}" | cut -d: -f1)"; \
+        if [ "$EXISTING_USER" != "${USER_NAME}" ]; then \
+            usermod -l "${USER_NAME}" "$EXISTING_USER"; \
+            usermod -d "/home/${USER_NAME}" -m "${USER_NAME}"; \
+        fi; \
+    else \
+        useradd -u "${USER_ID}" -m "${USER_NAME}"; \
+    fi
+
+WORKDIR /home/stoobly
+
+COPY .entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.docker-compose.test.yml

@@ -0,0 +1,18 @@
+services:
+  entrypoint.playwright:
+    build:
+      args:
+        PLAYWRIGHT_IMAGE: ${PLAYWRIGHT_IMAGE:-mcr.microsoft.com/playwright:v1.46.1-jammy}
+        USER_ID: ${USER_ID}
+      context: ./
+      dockerfile: ./.Dockerfile.playwright
+    command: npx playwright test --reporter dot
+    depends_on:
+      entrypoint.configure:
+        condition: service_completed_successfully
+    networks:
+      - "app.ingress"
+    profiles:
+      - ${WORKFLOW_NAME}
+    volumes:
+      - ${CONTEXT_DIR}:/home/stoobly

stoobly_agent/app/cli/scaffold/templates/plugins/playwright/test/.entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+# Copy certs and update trust store
+if [ -d "/home/stoobly/.stoobly/certs" ]; then
+  cp /home/stoobly/.stoobly/certs/*.crt /usr/local/share/ca-certificates/ || true
+  update-ca-certificates
+fi
+
+# Execute the CMD from Dockerfile or passed command
+exec gosu stoobly "$@"

stoobly_agent/app/cli/scaffold/templates/workflow/mock/docker-compose.yml

@@ -0,0 +1,17 @@
+# Define custom services here
+#
+# 1. Uncomment the following
+# 2. Replace <SERVICE-NAME> with the name of the service, this can be found in ../config.yml
+# 3. Extend as needed
+#
+# To learn more, see https://docs.stoobly.com/core-concepts/scaffold
+
+#services:
+#  <SERVICE-NAME>.<CUSTOM-SERVICE-NAME>:
+#    depends_on:
+#      <SERVICE-NAME>.configure:
+#        condition: service_completed_successfully
+#    networks:
+#      app.ingress: {}
+#    profiles:
+#      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/workflow/record/docker-compose.yml

@@ -0,0 +1,17 @@
+# Define custom services here
+#
+# 1. Uncomment the following
+# 2. Replace <SERVICE-NAME> with the name of the service, this can be found in ../config.yml
+# 3. Extend as needed
+#
+# To learn more, see https://docs.stoobly.com/core-concepts/scaffold
+
+#services:
+#  <SERVICE-NAME>.<CUSTOM-SERVICE-NAME>:
+#    depends_on:
+#      <SERVICE-NAME>.configure:
+#        condition: service_completed_successfully
+#    networks:
+#      app.egress: {}
+#    profiles:
+#      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/templates/workflow/test/docker-compose.yml

@@ -0,0 +1,17 @@
+# Define custom services here
+#
+# 1. Uncomment the following
+# 2. Replace <SERVICE-NAME> with the name of the service, this can be found in ../config.yml
+# 3. Extend as needed
+#
+# To learn more, see https://docs.stoobly.com/core-concepts/scaffold
+
+#services:
+#  <SERVICE-NAME>.<CUSTOM-SERVICE-NAME>:
+#    depends_on:
+#      <SERVICE-NAME>.configure:
+#        condition: service_completed_successfully
+#    networks:
+#      app.ingress: {}
+#    profiles:
+#      - ${WORKFLOW_NAME}

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -92,6 +92,5 @@ class WorkflowCreateCommand(WorkflowCommand):
         workflow_decorator(workflow_builder).decorate()
 
     workflow_builder.write()
-    workflow_builder.initialize_custom_file()
 
     return workflow_builder

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -10,7 +10,7 @@ from stoobly_agent.lib.logger import Logger
 
 from .app import App
 from .constants import (
-  APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV,
+  APP_DIR_ENV, APP_NETWORK_ENV, APP_PLUGINS_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, 
   SERVICE_DNS_ENV, SERVICE_NAME_ENV, SERVICE_SCRIPTS_DIR,  SERVICE_SCRIPTS_ENV, USER_ID_ENV, 
   WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_SCRIPTS_DIR, WORKFLOW_SCRIPTS_ENV, WORKFLOW_TEMPLATE_ENV
 )

stoobly_agent/app/cli/scaffold_cli.py

@@ -14,6 +14,7 @@ from stoobly_agent.app.cli.scaffold.app_create_command import AppCreateCommand
 from stoobly_agent.app.cli.scaffold.constants import (
   DOCKER_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 )
+from stoobly_agent.app.cli.scaffold.constants import PLUGIN_CYPRESS, PLUGIN_PLAYWRIGHT
 from stoobly_agent.app.cli.scaffold.containerized_app import ContainerizedApp
 from stoobly_agent.app.cli.scaffold.docker.service.configure_gateway import configure_gateway
 from stoobly_agent.app.cli.scaffold.docker.workflow.decorators_factory import get_workflow_decorators
@@ -90,6 +91,7 @@ def hostname(ctx):
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to create the app scaffold.')
 @click.option('--docker-socket-path', default='/var/run/docker.sock', type=click.Path(exists=True, file_okay=True, dir_okay=False), help='Path to Docker socket.')
+@click.option('--plugin', multiple=True, type=click.Choice([PLUGIN_CYPRESS, PLUGIN_PLAYWRIGHT]), help='Scaffold integrations.')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--ui-port', default=4200, type=click.IntRange(1, 65535), help='UI service port.')
 @click.argument('app_name', callback=validate_app_name)
@@ -101,7 +103,10 @@ def create(**kwargs):
   if not kwargs['quiet'] and os.path.exists(app.scaffold_namespace_path):
     print(f"{kwargs['app_dir_path']} already exists, updating scaffold maintained files...")
 
-  AppCreateCommand(app, **kwargs).build()
+  res = AppCreateCommand(app, **kwargs).build()
+
+  for warning in res['warnings']:
+    print(f"{bcolors.WARNING}WARNING{bcolors.ENDC}: {warning}")
 
 @app.command(
   help="Scaffold app service certs"
@@ -129,24 +134,20 @@ def mkcert(**kwargs):
 @click.option('--detached', is_flag=True, help='Use isolated and non-persistent context directory.')
 @click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--hostname', callback=validate_hostname, help='Service hostname.')
+@click.option('--local', is_flag=True, help='Specifies upstream service is local. Overrides `--upstream-hostname` option.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
 @click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
-@click.option('--proxy-mode', help='''
-  Proxy mode can be "regular", "transparent", "socks5",
-  "reverse:SPEC", or "upstream:SPEC". For reverse and
-  upstream proxy modes, SPEC is host specification in
-  the form of "http[s]://host[:port]".
-''')
+@click.option('--proxy-mode', type=click.Choice(['regular', 'reverse']), help='Proxy mode can be regular or reverse.')
 @click.option('--quiet', is_flag=True, help='Disable log output.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
+@click.option('--upstream-hostname', callback=validate_hostname, help='Upstream service hostname.')
+@click.option('--upstream-port', type=click.IntRange(1, 65535), help='Upstream service port.')
+@click.option('--upstream-scheme', type=click.Choice(['http', 'https']), help='Upstream service scheme.')
 @click.option('--workflow', multiple=True, type=click.Choice([WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]), help='Include pre-defined workflows.')
 @click.argument('service_name', callback=validate_service_name)
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])
 
-  if kwargs.get("proxy_mode"):
-    __validate_proxy_mode(kwargs.get("proxy_mode"))
-
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   service = Service(kwargs['service_name'], app)
 
@@ -164,15 +165,17 @@ def create(**kwargs):
 @click.option('--select', multiple=True, help='Select column(s) to display.')
 @click.option('--service', multiple=True, help='Select specific services.')
 @click.option('--without-headers', is_flag=True, default=False, help='Disable printing column headers.')
+@click.option('--all', is_flag=True, default=False, help='Display all services including core and user defined services')
 @click.option('--workflow', multiple=True, help='Specify workflow(s) to filter the services by. Defaults to all.')
 def _list(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
   __validate_app(app)
 
-  services = __get_services(app, service=kwargs['service'], workflow=kwargs['workflow'])
+  without_core = not kwargs['all']
+  services = __get_services(app, service=kwargs['service'],  without_core=without_core, workflow=kwargs['workflow'])
 
   rows = []
-  for service_name in services: 
+  for service_name in services:
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
 
@@ -184,6 +187,22 @@ def _list(**kwargs):
 
   print_services(rows, **select_print_options(kwargs))
 
+@service.command(
+  help="Show information about a service",
+)
+@click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
+@click.option('--format', type=click.Choice(FORMATS), help='Format output.')
+@click.option('--without-headers', is_flag=True, default=False, help='Disable printing column headers.')
+@click.argument('service_name')
+@click.pass_context
+def show(ctx, **kwargs):
+  service_name = kwargs['service_name']
+  del kwargs['service_name']
+  kwargs['service'] = [service_name]
+
+  # Invoke list with 1 service
+  ctx.invoke(_list, **kwargs)
+
 @service.command(
   help="Delete a service",
 )
@@ -207,16 +226,15 @@ def delete(**kwargs):
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--hostname', callback=validate_hostname, help='Service hostname.')
+@click.option('--local', is_flag=True, help='Specifies upstream service is local. Overrides `--upstream-hostname` option.')
+@click.option('--name', callback=validate_service_name, type=click.STRING, help='New name of the service to update to.')
 @click.option('--port', type=click.IntRange(1, 65535), help='Service port.')
-@click.option('--priority', default=5, type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
+@click.option('--priority', type=click.FloatRange(1.0, 9.0), help='Determines the service run order. Lower values run first.')
+@click.option('--proxy-mode', type=click.Choice(['regular', 'reverse']), help='Proxy mode can be regular or reverse.')
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Defaults to https if hostname is set.')
-@click.option('--name', callback=validate_service_name, type=click.STRING, help='New name of the service to update to.')
-@click.option('--proxy-mode', help='''
-  Proxy mode can be "regular", "transparent", "socks5",
-  "reverse:SPEC", or "upstream:SPEC". For reverse and
-  upstream proxy modes, SPEC is host specification in
-  the form of "http[s]://host[:port]".
-''')
+@click.option('--upstream-hostname', callback=validate_hostname, help='Upstream service hostname.')
+@click.option('--upstream-port', type=click.IntRange(1, 65535), help='Upstream service port.')
+@click.option('--upstream-scheme', type=click.Choice(['http', 'https']), help='Upstream service scheme.')
 @click.argument('service_name')
 def update(**kwargs):
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
@@ -228,29 +246,32 @@ def update(**kwargs):
 
   service_config = ServiceConfig(service.dir_path)
 
-  if kwargs['hostname']:
-    old_hostname = service_config.hostname
-
-    if old_hostname != kwargs['hostname']:
-      service_config.hostname = kwargs['hostname']
+  service_config.local = kwargs['local']
 
-      # If this is the default proxy_mode and the origin matches the original hostname, assume it is safe to update with the new hostname
-      if service_config.proxy_mode.startswith("reverse:"):
-        old_origin = service_config.proxy_mode.split("reverse:")[1]
-        parsed_origin_url = urlparse(old_origin)
+  if kwargs['hostname']:
+    service_config.hostname = kwargs['hostname']
 
-        if old_hostname == parsed_origin_url.hostname:
-          service_config.proxy_mode = service_config.proxy_mode.replace(old_hostname, service_config.hostname)
+  if kwargs['port']:
+    service_config.port = kwargs['port']
 
   if kwargs['priority']:
     service_config.priority = kwargs['priority']
 
-  if kwargs['port']:
-    service_config.port = kwargs['port']
+  if kwargs['proxy_mode']:
+    service_config.proxy_mode = kwargs['proxy_mode']
 
   if kwargs['scheme']:
     service_config.scheme = kwargs['scheme']
 
+  if kwargs['upstream_hostname']:
+    service_config.upstream_hostname = kwargs['upstream_hostname']
+
+  if kwargs['upstream_port']:
+    service_config.upstream_port = kwargs['upstream_port']
+
+  if kwargs['upstream_scheme']:
+    service_config.upstream_scheme = kwargs['upstream_scheme']
+
   if kwargs['name']:
     old_service_name = service.service_name
     new_service_name = kwargs['name']
@@ -264,10 +285,6 @@ def update(**kwargs):
 
     print(f"Successfully renamed service to: {new_service_name}")
 
-  if kwargs['proxy_mode']:
-    __validate_proxy_mode(kwargs['proxy_mode'])
-    service_config.proxy_mode = kwargs['proxy_mode']
-
   service_config.write()
 
 @workflow.command(
@@ -314,7 +331,7 @@ def copy(**kwargs):
     config = { **kwargs }
     del config['service']
     config['service_name'] = service_name
-      
+
     command = WorkflowCopyCommand(app, **config)
 
     if not command.app_dir_exists:
@@ -384,7 +401,7 @@ def down(**kwargs):
     )
     if not exec_command:
       continue
-    
+
     print(exec_command, file=script)
 
   # After services are stopped, their network needs to be removed
@@ -448,7 +465,7 @@ def logs(**kwargs):
         continue
 
     config = { **kwargs }
-    config['service_name'] = service 
+    config['service_name'] = service
     command = WorkflowLogCommand(app, **config)
     commands.append(command)
 
@@ -585,7 +602,7 @@ def validate(**kwargs):
   __validate_app(app)
 
   workflow = Workflow(kwargs['workflow_name'], app)
-  
+
   config = { **kwargs }
   config['service_name'] = 'build'
 
@@ -625,7 +642,7 @@ def install(**kwargs):
   )
 
   hostnames = []
-  for service_name in services: 
+  for service_name in services:
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
 
@@ -657,7 +674,7 @@ def uninstall(**kwargs):
   )
 
   hostnames = []
-  for service_name in services: 
+  for service_name in services:
     service = Service(service_name, app)
     __validate_service_dir(service.dir_path)
 
@@ -734,7 +751,7 @@ def __get_services(app: App, **kwargs):
 
   services = list(set(selected_services))
   services.sort()
-  
+
   return services
 
 def __print_header(text: str):
@@ -771,7 +788,7 @@ def __services_mkcert(app: App, services):
       continue
 
     hostname = service_config.hostname
-    
+
     if not hostname:
       continue
 
@@ -786,8 +803,11 @@ def __validate_app(app: App):
     sys.exit(1)
 
 def __validate_app_dir(app_dir_path):
-  if not os.path.exists(app_dir_path):
-    print(f"Error: {app_dir_path} does not exist", file=sys.stderr)
+  __validate_dir(app_dir_path)
+
+def __validate_dir(dir_path):
+  if not os.path.exists(dir_path):
+    print(f"Error: {dir_path} does not exist", file=sys.stderr)
     sys.exit(1)
 
 def __validate_service_dir(service_dir_path):
@@ -795,35 +815,6 @@ def __validate_service_dir(service_dir_path):
     print(f"Error: '{service_dir_path}' does not exist, please scaffold this service", file=sys.stderr)
     sys.exit(1)
 
-def __validate_proxy_mode(proxy_mode: str) -> None:
-  valid_exact_matches = {
-    "regular": None,
-    "transparent": None,
-    "socks5": None,
-  }
-
-  valid_prefixes = {
-    "reverse": None,
-    "upstream": None
-  }
-
-  if proxy_mode in valid_exact_matches:
-    return
-
-  split_str = proxy_mode.split(":", 1)
-  if len(split_str) != 2:
-    print(f"Error: {proxy_mode} is invalid.", file=sys.stderr)
-    sys.exit(1)
-
-  prefix = split_str[0]
-  spec = split_str[1]
-
-  if prefix not in valid_prefixes:
-    print(f"Error: {proxy_mode} is invalid.", file=sys.stderr)
-    sys.exit(1)
-
-  # TODO: validate SPEC
-
 def __with_namespace_defaults(kwargs):
   if not kwargs.get('namespace'):
     kwargs['namespace'] = kwargs.get('workflow_name')
@@ -842,4 +833,4 @@ def __workflow_create(app, **kwargs):
 def __with_workflow_namespace(app: App, namespace: str):
   workflow_namespace = WorkflowNamespace(app, namespace)
   workflow_namespace.copy_dotenv()
-  return workflow_namespace
+  return workflow_namespace

stoobly_agent/app/proxy/handle_record_service.py

@@ -9,7 +9,7 @@ from stoobly_agent.app.settings.constants.mode import TEST
 from stoobly_agent.app.models.request_model import RequestModel
 from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
 from stoobly_agent.config.constants.env_vars import ENV
-from stoobly_agent.config.constants import lifecycle_hooks, record_order, record_policy
+from stoobly_agent.config.constants import lifecycle_hooks, record_order, record_policy, record_strategy
 from stoobly_agent.lib.logger import Logger
 
 from .constants import custom_response_codes
@@ -19,8 +19,11 @@ from .record.overwrite_scenario_service import overwrite_scenario
 from .record.upload_request_service import inject_upload_request
 from .replay.body_parser_service import is_json, is_xml
 from .utils.allowed_request_service import get_active_mode_policy
+from .utils.minimize_headers import minimize_headers
 from .utils.response_handler import bad_request, disable_transfer_encoding 
 from .utils.rewrite import rewrite_request_response
+from .utils.strategy import get_active_mode_strategy
+
 
 LOG_ID = 'Record'
 
@@ -54,7 +57,7 @@ def handle_response_record(context: RecordContext):
         res = inject_eval_request(request_model, intercept_settings)(request, [])
 
         if res.status_code != custom_response_codes.NOT_FOUND:
-            __record_request(context , request_model)
+            __record_request(context, request_model)
     elif active_record_policy == record_policy.NOT_FOUND:
         res = inject_eval_request(request_model, intercept_settings)(request, [])
 
@@ -74,7 +77,13 @@ def __record_handler(context: RecordContext, request_model: RequestModel):
     intercept_settings = context.intercept_settings
 
     context.flow = flow_copy # Deep copy flow to prevent response modifications from persisting
-    rewrite_request_response(flow_copy, intercept_settings.record_rewrite_rules) 
+
+    active_record_strategy = get_active_mode_strategy(intercept_settings)
+    if active_record_strategy == record_strategy.MINIMAL:
+        minimize_headers(flow_copy)
+
+    rewrite_request_response(flow_copy, intercept_settings.record_rewrite_rules)
+
     __record_hook(lifecycle_hooks.BEFORE_RECORD, context)
 
     inject_upload_request(request_model, intercept_settings)(flow_copy)

stoobly_agent/app/proxy/handle_replay_service.py

@@ -5,9 +5,10 @@ from typing import TypedDict
 
 from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
 from stoobly_agent.app.proxy.replay.context import ReplayContext
-from stoobly_agent.config.constants import lifecycle_hooks, replay_policy
+from stoobly_agent.config.constants import lifecycle_hooks, replay_policy, custom_headers, mode, record_strategy
 
 from .utils.allowed_request_service import get_active_mode_policy
+from .utils.minimize_headers import minimize_response_headers
 from .utils.rewrite import rewrite_request, rewrite_response
 
 LOG_ID = 'HandleReplay'
@@ -66,7 +67,18 @@ def __rewrite_response(replay_context: ReplayContext):
     After replaying a request, see if the request needs to be rewritten
     """
     intercept_settings: InterceptSettings = replay_context.intercept_settings
+    flow = replay_context.flow
+    request = flow.request
+    response = flow.response
+
+    request_proxy_mode_header = request.headers.get(custom_headers.PROXY_MODE)
+    response_proxy_mode_header = response.headers.get(custom_headers.RESPONSE_PROXY_MODE)
+
+    if request_proxy_mode_header == mode.REPLAY and response_proxy_mode_header == mode.RECORD:
+        if intercept_settings.record_strategy == record_strategy.MINIMAL:
+            minimize_response_headers(flow)
+
     rewrite_rules = intercept_settings.replay_rewrite_rules
 
     if len(rewrite_rules) > 0:
-        rewrite_response(replay_context.flow, rewrite_rules)
+        rewrite_response(flow, rewrite_rules)

stoobly_agent/app/proxy/intercept_settings.py

@@ -57,14 +57,11 @@ class InterceptSettings:
 
   @property
   def active(self):
-    if self.__intercept_settings.active:
-      return True
+    if self.__headers and custom_headers.PROXY_MODE in self.__headers:
+      return not not self.__headers[custom_headers.PROXY_MODE]
 
-    if not self.__headers:
-      return False
+    return self.__intercept_settings.active
     
-    return custom_headers.PROXY_MODE in self.__headers
-
   @property
   def lifecycle_hooks_path(self):
     if self.__headers and custom_headers.LIFECYCLE_HOOKS_PATH in self.__headers:
@@ -182,6 +179,13 @@ class InterceptSettings:
 
     return self.policy
 
+  @property
+  def record_strategy(self):
+    if self.__headers and custom_headers.RECORD_STRATEGY in self.__headers:
+      return self.__headers[custom_headers.RECORD_STRATEGY]
+
+    return self.__data_rules.record_strategy
+
   @property
   def exclude_rules(self) -> List[FirewallRule]:
     _mode = self.mode
@@ -365,4 +369,4 @@ class InterceptSettings:
 
       return self.__data_rules.test_policy
     elif mode == intercept_mode.REPLAY:
-      return self.__data_rules.replay_policy
+      return self.__data_rules.replay_policy

stoobly_agent/app/proxy/record/upload_request_service.py

@@ -49,7 +49,7 @@ def inject_upload_request(request_model: RequestModel, intercept_settings: Inter
 def upload_request(
     request_model: RequestModel, intercept_settings: InterceptSettings, flow: MitmproxyHTTPFlow = None
 ):
-    Logger.instance(LOG_ID).info(f"{bcolors.OKCYAN}Recording{bcolors.ENDC} {flow.request.url}")
+    Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Recording{bcolors.ENDC} {flow.request.url}")
 
     flow_copy = deepcopy(flow) # When applying modifications we don't want to persist them in the response
     joined_request = join_request_from_flow(flow_copy, intercept_settings=intercept_settings)
@@ -80,7 +80,7 @@ def upload_request(
 def upload_staged_request(
     request: Request, request_model: RequestModel, project_key: str, scenario_key: str = None
 ):
-    Logger.instance(LOG_ID).info(f"{bcolors.OKCYAN}Recording{bcolors.ENDC} {request.url}")
+    Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Recording{bcolors.ENDC} {request.url}")
 
     response = request.response
 

stoobly_agent/app/proxy/replay/replay_request_service.py

@@ -72,6 +72,9 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
   if options.get('public_directory_path'):
     __handle_path_header(custom_headers.PUBLIC_DIRECTORY_PATH, options['public_directory_path'], headers)
 
+  if options.get('record_strategy'):
+    headers[custom_headers.RECORD_STRATEGY] = options['record_strategy']
+
   if options.get('report_key'):
     headers[custom_headers.REPORT_KEY] = options['report_key']