stoobly-agent 1.0.5__py3-none-any.whl → 1.0.6__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.0.5'
+VERSION = '1.0.6'

stoobly_agent/app/cli/ca_cert_cli.py

@@ -1,8 +1,10 @@
-
 import click
-import distro
+import pdb
+import sys
+
+from stoobly_agent.config.data_dir import DataDir
 
-from .ca_cert_installer import CACertInstaller
+from .helpers.certificate_authority import CertificateAuthority
 
 @click.group(
     epilog="Run 'stoobly-agent COMMAND --help' for more information on a command.",
@@ -13,22 +15,31 @@ def ca_cert(ctx):
     pass
 
 @ca_cert.command()
+@click.option('--ca-certs-dir-path', default=DataDir.instance().mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
+@click.option('--certs-dir-path', default=DataDir.instance().certs_dir_path, help='Output directory.')
+@click.argument('hostname')
+def mkcert(**kwargs):
+    mitmproxy_ca_certs_dir = kwargs['ca_certs_dir_path']
+
+    installer = CertificateAuthority(mitmproxy_ca_certs_dir)
+
+    try:
+        installer.sign(kwargs['hostname'], kwargs['certs_dir_path'])
+    except Exception as e:
+        print(e, file=sys.stderr)
+        sys.exit(1)
+
+@ca_cert.command()
+@click.option('--ca-certs-dir-path', default=DataDir.instance().mitmproxy_conf_dir_path, help='Path to ca certs directory.')
 def install(**kwargs):
-    distro_name = distro.name(pretty=True)
-
-    installer = CACertInstaller()
-
-    # Ubuntu or other Debian based
-    if distro.like() == 'debian':
-        print(f"Installing CA certificate for {distro_name}...")
-        installer.handle_debian()
-    # MacOS
-    elif distro.id() == 'darwin':
-        installer.handle_darwin()
-    # elif distro.id() == 'rhel':
-    #     return
-    else:
-        print(f"{distro_name} is not supported yet for automatic CA cert installation.")
+    mitmproxy_ca_certs_dir = kwargs['ca_certs_dir_path']
+    installer = CertificateAuthority(mitmproxy_ca_certs_dir)
+
+    try:
+        installer.install()
+    except Exception as e:
+        print(e, file=sys.stderr)
+        sys.exit(1)
 
 @ca_cert.command()
 def uninstall():

stoobly_agent/app/cli/helpers/certificate_authority.py

@@ -0,0 +1,201 @@
+import distro
+import os
+import pdb
+import socket
+import ssl
+import subprocess
+
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import serialization
+from cryptography.x509.oid import NameOID
+from mitmproxy.certs import CertStore
+from pathlib import Path
+
+from stoobly_agent.config.data_dir import DataDir
+from stoobly_agent.lib.logger import Logger
+
+LOG_ID = 'CertificateAuthority'
+
+MITMPROXY_CN = 'mitmproxy'
+
+class CertificateAuthority():
+
+    def __init__(self, certs_dir = DataDir.instance().mitmproxy_conf_dir_path, cn = MITMPROXY_CN):
+        self.certs_dir = certs_dir
+        self.cn = cn
+        self.key_size = 2048
+
+    @property
+    def certs_generated(self):
+        if not os.path.exists(self.ca_cert_path('.pem')):
+            return False
+
+        if not os.path.exists(self.ca_cert_path('.cer')):
+            return False
+
+        if not os.path.exists(self.ca_path('.pem')):
+            return False
+
+        return True
+
+    def ca_file_name(self, extension: str):
+        return '{cn}-ca{extension}'.format(cn=self.cn, extension=extension)
+
+    def ca_path(self, extension: str):
+        file_name = self.ca_file_name(extension)
+        return os.path.join(self.certs_dir, file_name)
+
+    def ca_cert_file_name(self, extension: str):
+        return '{cn}-ca-cert{extension}'.format(cn=self.cn, extension=extension)
+
+    def ca_cert_path(self, extension: str):
+        file_name = self.ca_cert_file_name(extension)
+        return os.path.join(self.certs_dir, file_name)
+
+    def generate_certs(self):
+        if not os.path.exists(self.certs_dir):
+            os.makedirs(self.certs_dir)
+
+        path = Path(self.certs_dir)
+        CertStore.create_store(path, self.cn, self.key_size)
+
+    # https://askubuntu.com/a/94861
+    def handle_debian(self):
+        extra_ca_certs_dir = '/usr/local/share/ca-certificates/extra'
+
+        ca_cert_path = self.ca_cert_path('.cer')
+        self.__ensure_exists(ca_cert_path)
+
+        extra_crt_absolute_path = os.path.join(extra_ca_certs_dir, self.ca_cert_file_name('.crt'))
+
+        subprocess.run(f"sudo mkdir -p {extra_ca_certs_dir}".split(), check=True)
+        subprocess.run(f"sudo cp {ca_cert_path} {extra_crt_absolute_path}".split(), check=True)
+        subprocess.run("sudo update-ca-certificates".split(), check=True)
+
+    # https://www.dssw.co.uk/reference/security.html
+    def handle_darwin(self):
+        system_keychain_path = '/Library/Keychains/System.keychain'
+
+        ca_cert_path = self.ca_cert_path('.pem')
+        self.__ensure_exists(ca_cert_path)
+
+        subprocess.run(f"sudo security add-trusted-cert -d -p ssl -p basic -k {system_keychain_path} {ca_cert_path}".split(), check=True)
+
+    def handle_rhel(self):
+        ca_trust_dir = '/etc/pki/ca-trust/source/anchors'
+
+        ca_cert_path = self.ca_cert_path('.cer')
+        self.__ensure_exists(ca_cert_path)
+
+        ca_trust_crt_absolute_path = os.path.join(ca_trust_dir, self.crt_file_name)
+
+        subprocess.run(f"sudo cp {ca_cert_path} {ca_trust_crt_absolute_path}".split(), check=True)
+        subprocess.run("sudo update-ca-trust extract".split(), check=True)
+
+    def install(self):
+        distro_name = distro.name(pretty=True)
+
+        # Ubuntu or other Debian based
+        if distro.like() == 'debian':
+            self.handle_debian()
+        # MacOS
+        elif distro.id() == 'darwin':
+            self.handle_darwin()
+        # elif distro.id() == 'rhel':
+        #     return
+        else:
+            raise TypeError(f"{distro_name} is not supported yet for automatic CA cert installation.")
+
+    def sign(self, hostname: str, dest = None, port = 443):
+        dest = dest or self.certs_dir
+
+        if self.signed(hostname, dest):
+            return False
+
+        store = CertStore.from_store(self.certs_dir, self.cn, self.key_size)
+        organization, alt_names = self.__cert_details(hostname, port)
+        cert_entry = store.get_cert(alt_names[0], alt_names, organization)
+
+        crt_path = os.path.join(dest, f"{hostname}.crt")
+        with open(crt_path, 'wb') as fp:
+            cert = cert_entry.cert
+            crt = cert.to_pem()
+            fp.write(crt)
+
+        key_path = os.path.join(dest, f"{hostname}.key")
+        with open(key_path, 'wb') as fp:
+            private_key = cert_entry.privatekey
+            key = private_key.private_bytes(
+                encoding=serialization.Encoding.PEM,
+                format=serialization.PrivateFormat.TraditionalOpenSSL,
+                encryption_algorithm=serialization.NoEncryption(),
+            )
+            fp.write(key)
+
+        joined_path = os.path.join(dest, f"{hostname}-joined.pem")
+        with open(joined_path, 'wb') as fp:
+            fp.write(b"\n".join([crt, key]))
+
+        return True
+
+    def signed(self, hostname: str, dest = None):
+        dest = dest or self.certs_dir
+
+        crt_path = os.path.join(dest, f"{hostname}.crt")
+        if not os.path.exists(crt_path):
+            return False
+
+        key_path = os.path.join(dest, f"{hostname}.key")
+        if not os.path.exists(key_path):
+            return False
+
+        joined_path = os.path.join(dest, f"{hostname}-joined.pem")
+        if not os.path.exists(joined_path):
+            return False
+
+        return True
+
+    def __ensure_exists(self, file_path):
+        if not os.path.exists(file_path):
+            self.generate_certs()
+
+    def __cert_details(self, domain: str, port: int = 443):
+        """
+        Retrieves the organization name and subject alternative names from an HTTPS domain's certificate.
+
+        :param domain: The domain name (e.g., 'example.com').
+        :param port: The port number (default: 443 for HTTPS).
+        :return: A tuple containing the organization name and a list of alternative names (or None if not found).
+        """
+        alt_names = [domain]
+        try:
+            # Connect to the server and get the certificate
+            context = ssl.create_default_context()
+            context.minimum_version = ssl.TLSVersion.TLSv1_2
+            timeout = 2.5
+            with socket.create_connection((domain, port), timeout) as sock:
+                with context.wrap_socket(sock, server_hostname=domain) as ssock:
+                    cert_der = ssock.getpeercert(binary_form=True)
+
+            # Parse the certificate
+            cert = x509.load_der_x509_certificate(cert_der, default_backend())
+
+            # Extract the organization name
+            try:
+                org_name = cert.subject.get_attributes_for_oid(NameOID.ORGANIZATION_NAME)[0].value
+            except IndexError:
+                org_name = None
+
+            # Extract the Subject Alternative Names (SANs)
+            try:
+                ext = cert.extensions.get_extension_for_class(x509.SubjectAlternativeName)
+                alt_names.extend(ext.value.get_values_for_type(x509.DNSName))
+            except x509.ExtensionNotFound:
+                alt_names = []
+
+            return org_name, alt_names
+
+        except Exception as e:
+            Logger.instance(LOG_ID).warn(f"Could not retrieve certificate for {domain}: {e}")
+            return None, alt_names

stoobly_agent/app/cli/scaffold/app.py

@@ -10,7 +10,8 @@ class App():
     data_dir: DataDir = DataDir.instance(path) 
 
     self.__scaffold_dir_path = data_dir.path
-    self.__certs_dir_path = os.path.join(data_dir.tmp_dir_path, 'certs')
+    self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or data_dir.mitmproxy_conf_dir_path
+    self.__certs_dir_path = data_dir.certs_dir_path
     self.__context_dir_path = data_dir.context_dir_path
     self.__dir_path = path
     self.__name = os.path.basename(self.__dir_path)
@@ -18,6 +19,15 @@ class App():
     self.__namespace = namespace
     self.__skip_validate_path = not not kwargs.get('skip_validate_path')
 
+  @property
+  def ca_certs_dir_path(self):
+    return self.__ca_certs_dir_path
+
+  @ca_certs_dir_path.setter
+  def ca_certs_dir_path(self, v: str):
+    self.__validate_path(v)
+    self.__certs_dir_path = v
+
   @property
   def certs_dir_path(self):
     return self.__certs_dir_path
@@ -80,6 +90,24 @@ class App():
   def scaffold_namespace_path(self):
     return os.path.join(self.scaffold_dir_path, self.namespace)
 
+  @property
+  def services(self):
+    return list(map(lambda path: os.path.basename(path), self.service_paths))
+
+  @property
+  def service_paths(self):
+    services_dir = os.path.join(self.scaffold_dir_path, self.namespace)
+
+    services = []
+    for filename in os.listdir(services_dir):
+      path = os.path.join(services_dir, filename)
+      if not os.path.isdir(path):
+        continue
+      
+      services.append(path)
+
+    return services
+
   def copy_folders_and_hidden_files(self, src, dst):
       os.makedirs(dst, exist_ok=True)
 

stoobly_agent/app/cli/scaffold/constants.py

@@ -1,6 +1,7 @@
 from typing import Literal
 
 APP_NETWORK_ENV = 'APP_NETWORK'
+CA_CERTS_DIR_ENV = 'CA_CERTS_DIR'
 CERTS_DIR_ENV = 'CERTS_DIR'
 COMPOSE_TEMPLATE = '.docker-compose.{workflow}.yml'
 CONFIG_FILE = '.config.yml'

stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -1,8 +1,9 @@
 # Overridable Environment Variables
 #
 # STOOBLY_APP_DIR: path to the application source code directory
-# STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder
+# STOOBLY_CA_CERTS_DIR: path to folder where ca certs are stored
 # STOOBLY_CERTS_DIR: path to a folder to store certs
+# STOOBLY_CONTEXT_DIR: path to the folder containing the .stoobly folder
 # STOOBLY_WORKFLOW_RUN_OPTIONS: extra options to pass to 'stoobly-agent scaffold workflow run' command
 
 # Constants
@@ -13,6 +14,7 @@ CONTEXT_DIR_DEFAULT := $(realpath $(DIR)/../..)
 
 # Configuration
 app_dir=$$(realpath "$${STOOBLY_APP_DIR:-$(CONTEXT_DIR_DEFAULT)}")
+ca_certs_dir=$$(realpath "$${STOOBLY_CA_CERTS_DIR:-$$(realpath ~/.mitmproxy)}")
 certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
 workflow_run_options=$${STOOBLY_WORKFLOW_RUN_OPTIONS:+$$STOOBLY_WORKFLOW_RUN_OPTIONS }
@@ -26,29 +28,21 @@ source_env=set -a; [ -f .env ] && source .env; set +a
 
 docker_compose_file_path=$(app_data_dir)/docker/stoobly-ui/exec/.docker-compose.exec.yml
 stoobly_exec_args=--profile $(WORKFLOW_NAME) -p $(WORKFLOW_NAME) up --build --remove-orphans
-stoobly_exec_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID
+stoobly_exec_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
 stoobly_exec=$(stoobly_exec_env) && $(source_env) && $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
 
 # Because scaffold is stored in the APP_DIR, when running a scaffold command from within a container,
 # it needs access to APP_DIR rather than CONTEXT_DIR
-stoobly_exec_run_env=export USER_ID=$$UID
+stoobly_exec_run_env=export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
 stoobly_exec_run=$(stoobly_exec_run_env) && $(source_env) && CONTEXT_DIR=$(app_dir) $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
 
-run_script=$(app_data_dir)/tmp/run.sh
-run_env=export APP_DIR="$(app_dir)" && export CERTS_DIR="$(certs_dir)" && export CONTEXT_DIR="$(context_dir)"
-workflow_run=$(run_env) && $(source_env) && bash "$(run_script)"
+workflow_run_script=$(app_data_dir)/tmp/run.sh
+workflow_run_env=export APP_DIR="$(app_dir)" && export CERTS_DIR="$(certs_dir)" && export CONTEXT_DIR="$(context_dir)"
+workflow_run=$(workflow_run_env) && $(source_env) && bash "$(workflow_run_script)"
 
-cert:
-	if [ -z "$$(which mkcert)" ]; then \
-		echo "Error: missing mkcert command"; \
-	else \
-		mkdir -p "$(certs_dir)" && \
-		cd "$(certs_dir)" && \
-		mkcert --install && \
-		mkcert $(hostname) && \
-		cp $(hostname).pem $(hostname).crt && \
-		cp $(hostname)-key.pem $(hostname).key; \
-	fi
+certs:
+	export EXEC_COMMAND=bin/.mkcert && \
+	$(stoobly_exec)
 intercept/disable:
 	export EXEC_COMMAND=bin/.disable && \
 	$(stoobly_exec)
@@ -56,7 +50,7 @@ intercept/enable:
 	export EXEC_COMMAND=bin/.enable && \
 	export EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock:
+mock: certs
 	export EXEC_COMMAND=bin/.run && \
 	export EXEC_OPTIONS="$(workflow_run_options)$(options)" && \
 	export EXEC_ARGS="mock" && \
@@ -68,7 +62,7 @@ mock/stop:
 	export EXEC_ARGS="mock" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
-record:
+record: certs
 	export EXEC_COMMAND=bin/.run && \
 	export EXEC_OPTIONS="$(workflow_run_options)$(options)" && \
 	export EXEC_ARGS="record" && \

stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml

@@ -1,15 +1,18 @@
 services:
+  ui_base:
+    extends:
+      service: context_base 
+    volumes:
+      - ${CA_CERTS_DIR}:/home/stoobly/.mitmproxy   
   context_base:
     build:
       args:
         USER_ID: ${USER_ID}
       dockerfile: ./.Dockerfile.context
     volumes:
-      - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly   
+      - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly
   proxy_base:
     build:
-      args:
-        USER_ID: ${USER_ID}
       dockerfile: ./.Dockerfile.proxy
-    volumes:
-      - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly
+    extends:
+      service: context_base

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml

@@ -2,4 +2,4 @@ services:
   stoobly_ui.base:
     extends:
       file: ../.docker-compose.base.yml
-      service: context_base 
+      service: ui_base 

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.mkcert

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+stoobly-agent scaffold app mkcert

stoobly_agent/app/cli/scaffold/workflow.py

@@ -32,17 +32,7 @@ class Workflow():
 
   @property
   def service_paths(self):
-    services_dir = os.path.join(self.app.scaffold_dir_path, self.app.namespace)
-
-    services = []
-    for filename in os.listdir(services_dir):
-      path = os.path.join(services_dir, filename)
-      if not os.path.isdir(path):
-        continue
-      
-      services.append(path)
-
-    return services
+    return self.app.service_paths
 
   def service_paths_from_services(self, services: List[str]):
     app_namespace_path = self.app.namespace_path

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -5,7 +5,7 @@ from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.logger import Logger
 
 from .app import App
-from .constants import APP_NETWORK_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV
+from .constants import APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV
 from .env import Env
 from .workflow_command import WorkflowCommand
 
@@ -16,18 +16,23 @@ class WorkflowRunCommand(WorkflowCommand):
     super().__init__(app, **kwargs)
 
     self.__current_working_dir = os.getcwd()
+    self.__ca_certs_dir_path = app.ca_certs_dir_path
     self.__certs_dir_path = app.certs_dir_path
     self.__context_dir_path = app.context_dir_path
     self.__extra_compose_path = kwargs.get('extra_compose_path')
     self.__network = kwargs.get('network') or app.network
 
+  @property
+  def ca_certs_dir_path(self):
+    if not os.path.exists(self.__ca_certs_dir_path):
+      os.makedirs(self.__ca_certs_dir_path)
+
+    return self.__ca_certs_dir_path
+
   @property
   def certs_dir_path(self):
-    if not self.__certs_dir_path:
-      data_dir = DataDir.instance()
-      dir_path = os.path.join(data_dir.tmp_dir_path, 'certs')
-      if not os.path.exists(dir_path):
-          os.mkdir(dir_path)
+    if not os.path.exists(self.__certs_dir_path):
+      os.makedirs(self.__certs_dir_path)
 
     return self.__certs_dir_path
 
@@ -120,6 +125,7 @@ class WorkflowRunCommand(WorkflowCommand):
 
   def write_env(self):
     _config = {}
+    _config[CA_CERTS_DIR_ENV] = self.ca_certs_dir_path
     _config[CERTS_DIR_ENV] = self.certs_dir_path
     _config[CONTEXT_DIR_ENV] = self.context_dir_path
     _config[SERVICE_NAME_ENV] = self.service_name

stoobly_agent/app/cli/scaffold_cli.py

@@ -5,6 +5,7 @@ import sys
 
 from typing import List
 
+from stoobly_agent.app.cli.helpers.certificate_authority import CertificateAuthority
 from stoobly_agent.app.cli.helpers.shell import exec_stream
 from stoobly_agent.app.cli.scaffold.app import App
 from stoobly_agent.app.cli.scaffold.app_create_command import AppCreateCommand
@@ -68,10 +69,45 @@ def create(**kwargs):
   else:
     print(f"{kwargs['app_dir_path']} already exists, use option '--force' to continue ")
 
-def service_create_options(f):
-  def wrapper(*args, **kwargs):
-    return f(*args, **kwargs)
-  return wrapper
+@app.command(
+  help="Scaffold app service certs"
+)
+@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.option('--ca-certs-dir-path', default=DataDir.instance().mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
+@click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
+@click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
+@click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
+def mkcert(**kwargs):
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, ca_certs_dir_path=kwargs['ca_certs_dir_path'])
+
+  if kwargs['certs_dir_path']:
+    app.certs_dir_path = kwargs['certs_dir_path']
+
+  if kwargs['context_dir_path']:
+    app.context_dir_path = kwargs['context_dir_path']
+
+  if not app.exists:
+    print(f"Error: {app.dir_path} does not exist", file=sys.stderr)
+    sys.exit(1)
+
+  services = __get_services(app.services, service=kwargs['service'])
+
+  for service_name in services:
+    service = Service(service_name, app)
+    service_config = ServiceConfig(service.dir_path)
+
+    if service_config.scheme != 'https':
+      continue
+
+    hostname = service_config.hostname
+    
+    if not hostname:
+      continue
+
+    ca = CertificateAuthority(app.ca_certs_dir_path)
+    if not ca.signed(hostname, app.certs_dir_path):
+      Logger.instance(LOG_ID).info(f"Creating cert for {hostname}")
+      ca.sign(hostname, app.certs_dir_path)
 
 @service.command(
   help="Scaffold a service",
@@ -273,7 +309,8 @@ def logs(**kwargs):
  
 @workflow.command()
 @click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
-@click.option('--certs-dir-path', default=DataDir.instance().certs_dir_path, help='Path to certs directory.')
+@click.option('--ca-certs-dir-path', default=DataDir.instance().mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
+@click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--filter', multiple=True, type=click.Choice([WORKFLOW_CUSTOM_FILTER]), help='Select which service groups to run. Defaults to all.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
@@ -290,7 +327,11 @@ def run(**kwargs):
   if not os.getenv(env_vars.LOG_LEVEL):
     os.environ[env_vars.LOG_LEVEL] = kwargs['log_level']
 
-  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE, skip_validate_path=kwargs['dry_run'])
+  app = App(
+    kwargs['app_dir_path'], DOCKER_NAMESPACE, 
+    ca_certs_dir_path=kwargs['ca_certs_dir_path'], skip_validate_path=kwargs['dry_run']
+  )
+
   if kwargs['certs_dir_path']:
     app.certs_dir_path = kwargs['certs_dir_path']
 
@@ -344,16 +385,17 @@ def __get_services(services: List[str], **kwargs):
   # Log services that don't exist
   missing_services = [service for service in kwargs['service'] if service not in services]
   if missing_services:
-    Logger.instance(WARNING).warn(f"Service(s) {','.join(missing_services)} are not found")
+    Logger.instance(LOG_ID).warn(f"Service(s) {','.join(missing_services)} are not found")
 
+  filter = kwargs.get('filter') or []
   if kwargs['service']:
     # If service is specified, run only those services
     services = list(kwargs['service'])
 
-    if WORKFLOW_CUSTOM_FILTER not in kwargs['filter']:
+    if WORKFLOW_CUSTOM_FILTER not in filter:
       services += CORE_SERVICES
   else:
-    if WORKFLOW_CUSTOM_FILTER in kwargs['filter']:
+    if WORKFLOW_CUSTOM_FILTER in filter:
       # If this filter is set, then the user does not want to run core services
       services = list(filter(lambda service: service not in CORE_SERVICES, services))
     

stoobly_agent/app/proxy/replay/replay_request_service.py

@@ -5,7 +5,7 @@ import requests
 from time import time
 from typing import Callable, TypedDict, Union
 
-from stoobly_agent.app.cli.ca_cert_installer import CACertInstaller
+from stoobly_agent.app.cli.helpers.certificate_authority import CertificateAuthority
 from stoobly_agent.app.cli.helpers.context import ReplayContext
 from stoobly_agent.app.models.adapters.python import PythonResponseAdapterFactory
 from stoobly_agent.app.models.schemas.request import Request
@@ -125,6 +125,7 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
   else:
     settings = Settings.instance()
     handler = getattr(requests, method.lower())
+    ca = CertificateAuthority()
 
     res = handler(
       request.url, 
@@ -135,7 +136,7 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
           'http': settings.proxy.url,
           'https': settings.proxy.url,
         },
-        'verify': CACertInstaller().mitm_crt_absolute_path if request_config['verify'] else False,
+        'verify': ca.ca_cert_path('.crt') if request_config['verify'] else False,
       }
     )
   received_at = time()

stoobly_agent/app/settings/proxy_settings.py

@@ -1,4 +1,3 @@
-from nis import match
 import os
 
 from stoobly_agent.config.constants import env_vars

stoobly_agent/cli.py

@@ -11,7 +11,7 @@ from stoobly_agent.app.cli.helpers.handle_mock_service import print_raw_response
 from stoobly_agent.app.cli.helpers.validations import validate_project_key, validate_scenario_key
 from stoobly_agent.app.proxy.constants import custom_response_codes
 from stoobly_agent.app.proxy.replay.replay_request_service import replay as replay_request
-from stoobly_agent.config.constants import env_vars, mode
+from stoobly_agent.config.constants import env_vars, mitmproxy, mode
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.utils.conditional_decorator import ConditionalDecorator
 
@@ -87,7 +87,7 @@ def init(**kwargs):
   Passphrase for decrypting the private key provided in the --cert option. Note that passing cert_passphrase on the command line makes your passphrase visible in your system's process list. Specify it in
   config.yaml to avoid this.
 ''')
-@click.option('--confdir', default=os.path.join(os.path.expanduser('~'), '.mitmproxy'), help='Location of the default mitmproxy configuration files.')
+@click.option('--confdir', default=mitmproxy.DEFAULT_CONF_DIR_PATH, help='Location of the default mitmproxy configuration files.')
 @click.option('--connection-strategy', help=', '.join(CONNECTION_STRATEGIES), type=click.Choice(CONNECTION_STRATEGIES))
 @click.option('--flow-detail', default='1', type=click.Choice(['0', '1', '2', '3', '4']), help='''
   The display detail level for flows in mitmdump: 0 (quiet) to 4 (very verbose).

stoobly_agent/config/constants/mitmproxy.py

@@ -0,0 +1,4 @@
+import os
+
+CONF_DIR_NAME = '.mitmproxy'
+DEFAULT_CONF_DIR_PATH = os.path.join(os.path.expanduser('~'), CONF_DIR_NAME)

stoobly_agent/config/data_dir.py

@@ -6,6 +6,7 @@ from stoobly_agent.config.constants.env_vars import ENV
 DATA_DIR_NAME = '.stoobly'
 DB_FILE_NAME = 'stoobly_agent.sqlite3'
 DB_VERSION_NAME = 'VERSION'
+MITMPROXY_OPTIONS_FILE_NAME = 'options.json'
 
 class DataDir:
 
@@ -102,6 +103,35 @@ class DataDir:
     def db_version_path(self):
         return os.path.join(self.db_dir_path, DB_VERSION_NAME)
 
+    @property
+    def mitmproxy_options_json_path(self):
+        return os.path.join(self.tmp_dir_path, MITMPROXY_OPTIONS_FILE_NAME)
+
+    @property
+    def mitmproxy_conf_dir_path(self):
+        from stoobly_agent.config.constants.mitmproxy import DEFAULT_CONF_DIR_PATH
+
+        conf_dir = DEFAULT_CONF_DIR_PATH
+
+        options_json = self.mitmproxy_options_json_path
+        if os.path.exists(options_json):
+            try:
+                with open(options_json, 'r') as fp:
+                    import json
+                    contents = fp.read()
+                    options = json.loads(contents)
+                    _conf_dir = options.get('confdir')
+
+                    if _conf_dir or not os.path.exists(_conf_dir):
+                        conf_dir = _conf_dir
+            except Exception:
+                pass
+
+        if not os.path.exists(conf_dir):
+            os.makedirs(conf_dir)
+
+        return conf_dir
+
     @property
     def settings_file_path(self):
         return os.path.join(self.path, 'settings.yml')
@@ -182,6 +212,9 @@ class DataDir:
         if not os.path.exists(self.__data_dir_path):
             os.mkdir(self.__data_dir_path)
 
+            # Create tmp folder
+            os.mkdir(os.path.join(self.__data_dir_path, 'tmp'))
+
             with open(os.path.join(self.__data_dir_path, '.gitignore'), 'w') as fp:
                 fp.write(
                     "\n".join([

stoobly_agent/config/mitmproxy.py

@@ -3,11 +3,9 @@ import os
 import pdb
 
 from stoobly_agent.config.data_dir import DataDir
-from stoobly_agent.lib.logger import Logger
 
 class MitmproxyConfig():
   MITMPROXY_DIR_NAME = '.mitmproxy'
-  MITMPROXY_OPTIONS_FILE_NAME = 'options.json'
 
   __instance = None
   __master = None
@@ -18,7 +16,7 @@ class MitmproxyConfig():
     else:
         self.__master = master 
 
-        self.__mitmproxy_dir_path = os.path.join(os.path.expanduser('~'), self.MITMPROXY_DIR_NAME)
+        self.__mitmproxy_dir_path = DataDir.instance().mitmproxy_conf_dir_path
 
         if not os.path.exists(self.__mitmproxy_dir_path):
             os.mkdir(self.__mitmproxy_dir_path)
@@ -46,7 +44,7 @@ class MitmproxyConfig():
   def get(self, key: str):
     if not self.__master:
       try:
-        fp = open(self.options_json_path, 'r')
+        fp = open(DataDir.instance().mitmproxy_options_json_path, 'r')
         contents = fp.read()
         fp.close()
         options = json.loads(contents)
@@ -66,10 +64,6 @@ class MitmproxyConfig():
     if self.__master:
       self.__master.options.set(*option)
 
-  @property
-  def options_json_path(self):
-    return os.path.join(DataDir.instance().tmp_dir_path, self.MITMPROXY_OPTIONS_FILE_NAME)
-
   def dump(self):
     if not self.__master:
       return
@@ -78,6 +72,6 @@ class MitmproxyConfig():
     for k, v in self.__master.options.items():
       options[k] = v.current()
 
-    fp = open(self.options_json_path, 'w')
+    fp = open(DataDir.instance().mitmproxy_options_json_path, 'w')
     fp.write(json.dumps(options, indent=2, sort_keys=True))
     fp.close()

stoobly_agent/test/app/cli/helpers/certificate_authority_test.py

@@ -0,0 +1,77 @@
+import pdb
+import pytest
+
+from stoobly_agent.test.test_helper import reset
+
+from stoobly_agent.config.constants.mitmproxy import DEFAULT_CONF_DIR_PATH
+from stoobly_agent.config.data_dir import DataDir
+from stoobly_agent.app.cli.helpers.certificate_authority import CertificateAuthority
+
+@pytest.fixture(autouse=True, scope='module')
+def settings():
+  return reset()
+
+class TestCertificateAuthority():
+
+  @pytest.fixture(autouse=True, scope='class')
+  def certificate_authority(self):
+    return CertificateAuthority(DataDir.instance().certs_dir_path)
+
+  class TestWhenCertDirConfigured():
+
+    def test_defaults_to_not_installed(self, certificate_authority: CertificateAuthority):
+      assert not certificate_authority.certs_generated
+
+    def test_generates(self, certificate_authority: CertificateAuthority):
+      certificate_authority.generate_certs()
+      assert certificate_authority.certs_generated
+
+  class TestWhenCertDirNotConfigured():
+
+    @pytest.fixture(autouse=True, scope='class')
+    def certificate_authority(self):
+      return CertificateAuthority()
+
+    def test_defaults_to_mitmproxy_confdir(self, certificate_authority: CertificateAuthority):
+      assert certificate_authority.certs_dir == DEFAULT_CONF_DIR_PATH
+
+  class TestSign():
+
+    class TestWhenExistentHostname():
+
+      @pytest.fixture(scope='class')
+      def hostname(self):
+        return 'www.google.com'
+
+      @pytest.fixture(autouse=True, scope='class')
+      def sign(self, certificate_authority: CertificateAuthority, hostname: str):
+        certificate_authority.sign(hostname)
+
+      def test_signed(self, certificate_authority: CertificateAuthority, hostname: str):
+        assert certificate_authority.signed(hostname)
+
+    class TestWhenNonExistentHostname():
+
+      @pytest.fixture(scope='class')
+      def hostname(self):
+        return 'test.stoobly.com'
+
+      @pytest.fixture(autouse=True, scope='class')
+      def sign(self, certificate_authority: CertificateAuthority, hostname: str):
+        certificate_authority.sign(hostname)
+
+      def test_signed(self, certificate_authority: CertificateAuthority, hostname: str):
+        assert certificate_authority.signed(hostname)
+
+    class TestWhenSigned():
+
+      @pytest.fixture(scope='class')
+      def hostname(self):
+        return 'www.google.com'
+
+      @pytest.fixture(autouse=True, scope='class')
+      def sign(self, certificate_authority: CertificateAuthority, hostname: str):
+        certificate_authority.sign(hostname)
+
+      def test_it_does_not_sign(self, certificate_authority: CertificateAuthority, hostname: str):
+        assert not certificate_authority.sign(hostname)

stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

stoobly_agent/test/config/data_dir_test.py

@@ -5,10 +5,10 @@ import pytest
 
 from stoobly_agent.config.constants.env_vars import ENV
 from stoobly_agent.config.constants.mode import NONE
+from stoobly_agent.config.constants.mitmproxy import DEFAULT_CONF_DIR_PATH
 from stoobly_agent.config.data_dir import DataDir, DATA_DIR_NAME
 from stoobly_agent.test.test_helper import reset
 
-
 class TestDataDir():
   @pytest.fixture(autouse=True, scope='class')
   def settings(self):
@@ -85,3 +85,10 @@ class TestDataDir():
       shutil.rmtree(temp_dir)
       os.chdir(original_cwd)
 
+  class TestMitmproxyConfDirPath():
+    @pytest.fixture(autouse=True, scope='class')
+    def settings(self):
+      return reset()
+
+    def test_default_path(self):
+      assert DataDir.instance().mitmproxy_conf_dir_path == DEFAULT_CONF_DIR_PATH

{stoobly_agent-1.0.5.dist-info → stoobly_agent-1.0.6.dist-info}/METADATA

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

{stoobly_agent-1.0.5.dist-info → stoobly_agent-1.0.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=6tvkXcNE_sNjUAP2DAWOB3-aEqTtRoqoAFjoATyoFdM,44
+stoobly_agent/__init__.py,sha256=5X3amtha1fHxFEqgS7QTUVOXpD2fYkqLNspMcHbm1Mk,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=jf4fkqjOiCeI2IM5Ro7ie0v_C6y0-7-5TIE_IKMPOfg,5513
@@ -17,8 +17,7 @@ stoobly_agent/app/api/scenarios_controller.py,sha256=zJViyme9l36mlJDQONRu4N-A0kd
 stoobly_agent/app/api/simple_http_request_handler.py,sha256=ZdJ4kKEcPDpck74dJu--M7zw76wQzpo_AQArZwN9Bes,4466
 stoobly_agent/app/api/statuses_controller.py,sha256=gQsl28h-3mZ_bByEHpc4mRy3KFvUz5PeAgVB0cPx_Ao,1791
 stoobly_agent/app/cli/__init__.py,sha256=uS4KJgMAhm0JVnEUC-ONW-Bq6A8I9v7Fk-_Ka7gXlrU,470
-stoobly_agent/app/cli/ca_cert_cli.py,sha256=YKk7XAkDKL1edmDg3iqcBC1PAOrvOs2oJjWbmQEsaJE,859
-stoobly_agent/app/cli/ca_cert_installer.py,sha256=8bKW5SyPBHC1Luck_t14sJRvZYEvIP6zzH3GQ1lK70M,2252
+stoobly_agent/app/cli/ca_cert_cli.py,sha256=QXl01nyCQLhiGr8vozZicui36AlgHU1q_V9c_w_xY-Q,1444
 stoobly_agent/app/cli/config_cli.py,sha256=vgik4PwqKdq1cQ4BvmeyXTmh-LQZpe2PUkNIqblzP2E,15658
 stoobly_agent/app/cli/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/decorators/config.py,sha256=AWrDGZm_gjCWFYlRwdla3iE6H7OSlM4FxkaXRNovBZA,2428
@@ -29,6 +28,7 @@ stoobly_agent/app/cli/feature_cli.py,sha256=d-MUTbK3gbZxZNJUjM43fioZyhPyzetQNKjI
 stoobly_agent/app/cli/handlers/request_cli_handler.py,sha256=IPToK9OfiDda-mkq8HpiSSqK2m-UR15-8f8LVoLAHTA,6965
 stoobly_agent/app/cli/handlers/scenario_cli_handler.py,sha256=1KSsfhR1mmPUCmhjzWTjf_L9NcQglLvVK3KURrPt92A,7425
 stoobly_agent/app/cli/helpers/__init__.py,sha256=26ODsQi5NoJPwq4Ya7_lmtRalhhXOr_jfdZQWGLy6Gc,161
+stoobly_agent/app/cli/helpers/certificate_authority.py,sha256=d9hW_p3Uvnh5VAE0pCQMRTH77ihON7a-qUMCTbjOaqI,7178
 stoobly_agent/app/cli/helpers/context.py,sha256=Jv97ueNnqea5UDm57VOUiQSHKWBeNlCcrq5-qW2tcwQ,1624
 stoobly_agent/app/cli/helpers/endpoint_facade.py,sha256=_1TR9PcRnqpl9Q4njFHMM_Btqpr6cCf757FFcywa3oU,2318
 stoobly_agent/app/cli/helpers/endpoints_apply_context.py,sha256=PvUzJLXNKl6wIQj2q8YZK1MAm1yqzDLLlpCYMoyWb9I,1831
@@ -67,13 +67,13 @@ stoobly_agent/app/cli/project_cli.py,sha256=EXjeLjbnq9PhfCjvyfZ0UnJ2tejeCS0SIAo3
 stoobly_agent/app/cli/report_cli.py,sha256=ZxJw0Xkx7KFZJn9e45BSKRKon8AD0Msrwy1fbPfbv0c,2543
 stoobly_agent/app/cli/request_cli.py,sha256=THNloW111l9MLE0oPg4y7hVXL1U7OXoz760g0A1CtJ0,7747
 stoobly_agent/app/cli/scaffold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/app.py,sha256=iyNiQ54MYH8X_GNMfi2r3C8hr9zjKQm_cy3tAmbSRZs,2824
+stoobly_agent/app/cli/scaffold/app.py,sha256=y9es1fDnYwQ3s-Pp58KvSgkt8Chn7BTq16GBG5RmYpY,3555
 stoobly_agent/app/cli/scaffold/app_command.py,sha256=o6WV6tcMGBWJsPFdV2DD-m1Dq0cy3Q3SESokaU5hgp4,2061
 stoobly_agent/app/cli/scaffold/app_config.py,sha256=ZAHGovwxFy3zICfusj9_gUC_FBTIoB7KbPbQaGK8x1c,573
 stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=G4q-arXJH0uf6kagiWk26VqKG4zpOngxvJappxIkt-0,568
 stoobly_agent/app/cli/scaffold/command.py,sha256=klpsgL6V7b2DRHpN33pl-QlmntDkvDO_dsF5JziYnL8,245
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
-stoobly_agent/app/cli/scaffold/constants.py,sha256=u6uUThiypT3hK4rRhabYEet1FY_oKlsIkXvDvRC4KCQ,1252
+stoobly_agent/app/cli/scaffold/constants.py,sha256=SMuCd0FwX_C4wENUJU-AxW0KvEsg_1MhQ4GkU287B3Y,1286
 stoobly_agent/app/cli/scaffold/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/app_builder.py,sha256=IsXZFUumWEBA8NYDFdAohuKmxocoqHqlVFg0-E92QLI,621
 stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=lNOvDxoLB1L8KSDrvoG4CUuWLAM2egLxwOWeV9Tf8H8,2832
@@ -98,8 +98,8 @@ stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOW
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=1Zm5_ROKZzFMAkMt8dluEJASI2CBi9d9If_Gch9FMNM,193
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy,sha256=JfZOVALEmRE_hVEMIHTmem9Ln32qnfKOAUO1c5Z9fqw,1027
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=di-KeT_8vHlz86wqJeEx_jwbJrC3bSK_RHgJCGYrlpg,4114
-stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=jDEG7TkEyHhlt33H5JC-jD0nwdFk2rsDcaS6N9yjYRk,359
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=JOtlDYzba0phpQdsKcWPbJCS9ZWgoqixq7wwzKTVzj0,4161
+stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=LNNuygX6hMtmElxaO6jTIYq3psYmxNv7xax7ra6JzO4,407
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=t7xRaCc9q3k7W34S0h9KX02GljSVwGpPnFmiLUvWxsw,80
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
 stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml,sha256=WI1tE97QDXif1qGCyFbKWNw_2VhNvbBTT2mtwW6C-RI,270
@@ -143,12 +143,13 @@ stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.yml,sh
 stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml,sha256=LiMgBvOozkBH34-72kQXLylmrnERwjQfs8aws6BlZHM,232
 stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml,sha256=4pwMuBdfaf9hX1RVJ3KU3FY4E5BXYSPFsfUGKmiuXPk,234
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml,sha256=bxrtZqf3YtaJCukzScslh5PgWC5q8xkGIP1wKJf33LA,111
+stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml,sha256=GO3dIJ1WlazBDik_PDo1YvrSXcqeT5MMJjbb_iBdH6g,106
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exec.yml,sha256=rPc88-E1xoRwaqEVGVuTfOe7BcKCdDtatVqhNNIrhN8,299
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.create,sha256=EZe84bLAKB-mrB9PGMx-amyMjp6x-ESUZKC8wxrWdLE,245
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.delete,sha256=RspRDQ7WT5jpN2o-6qXOlH-A2VpN4981pD4ZJljk9Rw,260
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.disable,sha256=xVf4Pk1RLvJm7Ff0rbGoWhYHPv0ME5e93fxS2yFqLnE,45
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.enable,sha256=sfUSPG4uHdXX95BLgivXQYLbsLBP2DjJIiSTXRtvXuY,188
+stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.mkcert,sha256=vyHaXmvy-7oL2RD8rIxwT-fdJS5kXmB0yHK5fRMo_cM,46
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.reset,sha256=_pvbLk-ektsCHEh_egDtd6c0sVqCPunwUWggarfoli0,238
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.run,sha256=AporhoTO76u9lexoPJ9XnFsjRnhpPRZdv1g2ri3-V50,210
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.snapshot,sha256=Kav1QNhKG7f0DBzc4-9dmxZMmmVTxmPqakT_W4kVYKk,241
@@ -176,13 +177,13 @@ stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/init,sha256=YxWVVQMEd
 stoobly_agent/app/cli/scaffold/templates/workflow/test/fixtures/.keep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/templates/workflow/test/fixtures.yml,sha256=8DW2LN5WYg1hxmZkqr8o5dxLgDxHtBARFSUiNjz009Y,226
 stoobly_agent/app/cli/scaffold/templates/workflow/test/lifecycle_hooks.py,sha256=U7mlzT_wBR3uhHSG6CAyt5tBUNAvdIrCw33gdB-F294,467
-stoobly_agent/app/cli/scaffold/workflow.py,sha256=j2ihY_c7HPh275-awWARcsf1u4O2R1hhCXScLmO_Kn8,1096
+stoobly_agent/app/cli/scaffold/workflow.py,sha256=5Q0km8-QAylWOUxOtY2D-h0HlDWB8PmtSEYWLA6bLeo,828
 stoobly_agent/app/cli/scaffold/workflow_command.py,sha256=V4Wfv9bgh5MlWAaW_68uudC1wsMcvcTogjZ7mvKDD74,3308
 stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pENAA_a9gW56EkgG2K35nBQYXwyI,1462
 stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=5xnRYrVb2KlSDARZFjLGGWeURXRu63OHoRLEhO-EAvw,3401
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=FN-XyMVnulbassBuqeB21J_PQnOsr_LNs0Dg2tcDkjg,435
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=quPMwahE7TQozbzntIQJRoEhNjv0e_QfpYZnbWQV1iE,4025
-stoobly_agent/app/cli/scaffold_cli.py,sha256=5facvX1S-SnJWWe644_8bBV4ytLQlj25RYDiiselvcU,14765
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=AAiUKJ3Wd_Za1_AIKT_F5fvd4RYOMVNFOTNqMGJVbQI,4220
+stoobly_agent/app/cli/scaffold_cli.py,sha256=jk2RdQfd46FOPfOZZbz-jNEu-AXG5sauKYmox7arCaA,16586
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=XNxpTm5z3bnBGNGI3_XZIif0ypN62WqYfDmShL5fXg4,9965
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -328,7 +329,7 @@ stoobly_agent/app/proxy/replay/alias_resolver.py,sha256=0t7dISfVoFIa_fOqhUZQr0Ib
 stoobly_agent/app/proxy/replay/body_parser_service.py,sha256=ZoWEN9qdo8nMyWSM-YDeqD3YVybYGMk7EuT2qdguJ6I,3621
 stoobly_agent/app/proxy/replay/context.py,sha256=_dtU2-OmTVY_zsXRU7gdL9E7zbx9a9jSfkm9_H6vfp0,796
 stoobly_agent/app/proxy/replay/multipart.py,sha256=_jukCaTEuuUi5LhP_DCsEHupzGBUZiZyb51ed1rarm8,2249
-stoobly_agent/app/proxy/replay/replay_request_service.py,sha256=1OyrGb9Vfflhcfy4GBDIwa8iP5_7v3Cr7Q0zi6U9apc,7013
+stoobly_agent/app/proxy/replay/replay_request_service.py,sha256=ZxSD_7DhGgqS-BGUTpVgjLmE5O5qUwv-kOPSu6VEBkA,7045
 stoobly_agent/app/proxy/replay/replay_scenario_service.py,sha256=9jV-iO5EBg8geUblEtjjWRFIkom_Pqmo7P-lTc3S4Xw,2824
 stoobly_agent/app/proxy/replay/rewrite_params_service.py,sha256=jEHlT6_OHq_VBa09Hd6QaRyErv7tZnziDvW7m3Q8CQg,2234
 stoobly_agent/app/proxy/replay/trace_context.py,sha256=lKpnQWVCUTcMPE-SOi90za3U1yL0VeBlIgj_KP63VsE,10435
@@ -380,7 +381,7 @@ stoobly_agent/app/settings/intercept_settings.py,sha256=K5dY1y0nBcBMIVQzrIDYCgou
 stoobly_agent/app/settings/match_rule.py,sha256=8zNs8HybGaQrZQGo2EVfrlv_lqFHMgNpwkXRx_DIy9c,812
 stoobly_agent/app/settings/match_settings.py,sha256=QmFj79_twafbkyu2F20SOJ0guXBURiWgGIMkxItXumM,772
 stoobly_agent/app/settings/parameter_rule.py,sha256=UmmC73RY1c7PJ024wEh3IVm3veaDyHohov2OigdKpYI,881
-stoobly_agent/app/settings/proxy_settings.py,sha256=5Zmpmz6x0HpD1mSuoLpLd5vy67sqt-xEbm5PtHg8IvU,1875
+stoobly_agent/app/settings/proxy_settings.py,sha256=7sWQqRqpgOBlav2TI8KWS4bjR_JhX0q_Vv2sW0rdDLE,1853
 stoobly_agent/app/settings/remote_settings.py,sha256=z2q0i2hGNulonfpOZcBUwikNo_EEA5ChbOWumzzmqWc,1960
 stoobly_agent/app/settings/rewrite_rule.py,sha256=qECIEtZUOSww1Zsfmwh-L-mx7rFZWEuaPWfJ3faTlM4,1416
 stoobly_agent/app/settings/rewrite_settings.py,sha256=Ta8uk7usMZ9jgMg71ZNwUj9rQ1Cb8G9d--0lAQ-z7OQ,851
@@ -391,7 +392,7 @@ stoobly_agent/app/settings/types/remote_settings.py,sha256=4PvEGKULXM0zv29XTDzV7
 stoobly_agent/app/settings/types/ui_settings.py,sha256=BqPy2F32AbODqzi2mp2kRk28QVUydQIwVmvftn46pco,84
 stoobly_agent/app/settings/ui_settings.py,sha256=YDEUMPuJFh0SLHaGz6O-Gpz8nwsunNzeuc-TzO9OUbM,1170
 stoobly_agent/app/settings/url_rule.py,sha256=Qx7YrIpVRSC-4LeNiCAfCtE50Jou4423hojMW-4qUYg,954
-stoobly_agent/cli.py,sha256=cZJDCVa7PGGfiqg4GxaYn74-uPtQQAexHeWmGybw3YE,9915
+stoobly_agent/cli.py,sha256=4WLcWPHWdv5dZEitXtDj6_I5AH5WVvQqE_uDe6bPEno,9906
 stoobly_agent/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/config/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/config/constants/alias_resolve_strategy.py,sha256=_R1tVqFnyGxCraVS5-dhSskaDj_X8-NthsY7i_bEt9M,119
@@ -399,6 +400,7 @@ stoobly_agent/config/constants/custom_headers.py,sha256=90qrR2DeaoPQvxCBf_QLVFrD
 stoobly_agent/config/constants/env_vars.py,sha256=HAR_ZIdXXbpWQgCDaRR5RtpVyGXCsMLr_Fh8n6S12K0,1344
 stoobly_agent/config/constants/headers.py,sha256=fm5FxKroCpNHTaKMjrIO4npNmT-eAUplXt_ix0N5Ruo,223
 stoobly_agent/config/constants/lifecycle_hooks.py,sha256=aobclZmcND_mUnFKkUgpxgwd5EU3pjgAvB-NFf2dCgE,846
+stoobly_agent/config/constants/mitmproxy.py,sha256=AhaxRGMb7OC4DBqNvyBP0OVQSByCeA-itefzmMoIS14,116
 stoobly_agent/config/constants/mock_policy.py,sha256=KrRVPJYRSb0hIH9fjAV9aQ8OsnhnYo9l7dylug62YVg,41
 stoobly_agent/config/constants/mode.py,sha256=J35vV1LPQRhD2ob6DaJ7mLGJrMhv-CVnC6IHWd7b_GM,160
 stoobly_agent/config/constants/record_policy.py,sha256=2DZzMMuMSCH9ZEfQDpPQ7fLEiCz7BNLITzCQ7Ti39BQ,89
@@ -408,8 +410,8 @@ stoobly_agent/config/constants/statuses.py,sha256=dR88qHHnDR_5ppuKijwc0R24D_fWc6
 stoobly_agent/config/constants/test_filter.py,sha256=rQ-eMZ8kpq49pqS1PQhaRx59dlRicd-Ag4sjgoXfpY8,109
 stoobly_agent/config/constants/test_output_level.py,sha256=yrn8cs-lexrK0Ckpc_SX3NhsZPfVhNpmjzjSP62LCro,135
 stoobly_agent/config/constants/test_strategy.py,sha256=d6-WgKqElB3q_csP-QYFkhR4XvlPGfGdCJ-SBEDEoL4,152
-stoobly_agent/config/data_dir.py,sha256=8VUPD1HPGdOdfYJzjT2U_HQFsu5S2b85iroCTUYIhTk,6400
-stoobly_agent/config/mitmproxy.py,sha256=go7vzkSTr8Yz6k7P5tXgHB1agNu8uubHfaYa17LeR5c,2100
+stoobly_agent/config/data_dir.py,sha256=DT3bXdOEQPKKIxOX1zpBWHePYpHskUjia-hDT9BUCb4,7466
+stoobly_agent/config/mitmproxy.py,sha256=z9L1JSWwQFsn4gMZk8Dcz5mOcUc6dYnW1ZugrYTEttw,1902
 stoobly_agent/config/schema.yml,sha256=b4I8utMrUrMSr86UbXgYYxt2-TJynQA9oQtOQ7CM-PE,1963
 stoobly_agent/config/settings.yml.sample,sha256=muxP1bWrtknVaSgdseFaw23tuwduILNdQTVy7aB519M,404
 stoobly_agent/config/source_dir.py,sha256=3oYwWmIrid0YsIf91AIUI2itAA3pdPA10eHaC-nmelQ,1146
@@ -633,6 +635,7 @@ stoobly_agent/test/app/cli/config/project/config_project_set_test.py,sha256=bV2O
 stoobly_agent/test/app/cli/config/rewrite_test.py,sha256=Y1zSTJJK4Q8Ac8qqHbKt-kFraBIwJIpr29_7V81OTy0,5601
 stoobly_agent/test/app/cli/config/scenario/config_scenario_set_test.py,sha256=1A5cYH3OdwtRwTmDETg0af9urHA4K6VVeA76zub2dnQ,2525
 stoobly_agent/test/app/cli/endpoint/endpoint_cli_apply_test.py,sha256=cW5RDd-spyEknV1krFv37GHgWShPVOgvPyX2jgwnWZw,3886
+stoobly_agent/test/app/cli/helpers/certificate_authority_test.py,sha256=Y5YkwVFKyZBbfWK-vZVo3__jzRlRDOCFNvTLbDpjGg4,2639
 stoobly_agent/test/app/cli/helpers/openapi_endpoint_adapter_additional_props_test.py,sha256=t4Wggky_fexBrRqvK12Qgj71UKsM0gGqutOEfAdOqtk,1772
 stoobly_agent/test/app/cli/helpers/openapi_endpoint_adapter_missing_info_test.py,sha256=qA6PJEtv1tS7Ksl6R7GjbIS_f9SxINPr8SrcXTuG-WU,3027
 stoobly_agent/test/app/cli/helpers/openapi_endpoint_adapter_missing_oauth2_scopes_test.py,sha256=Gw_YtZR2EKy09jAJEGQ4phrAoHlzlqhbJ9bLH91UrRU,3143
@@ -673,7 +676,7 @@ stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sh
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=5IFGVGn3ogvRT0fzZgXzhrYlSfSlr8IR1p_XExaegMQ,3399
 stoobly_agent/test/app/models/factories/resource/local_db/request_adapter_test.py,sha256=Pzq1cBPnP9oSWG-p0c-VoymoHxgp483QmNwmV1b78RA,8453
 stoobly_agent/test/app/models/factories/resource/local_db/response_adapter_test.py,sha256=9P95EKH5rZGOrmRkRIDlQZqtiLJHk9735og18Ffwpfw,2204
-stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=rqWtvvV0eFJzxPOcG3aHz4AZk-DLa_Z4GkFonk7bsgw,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=nXE_EpedYoeSULwKIDXj71cxWsQlHoUBnSHHXtcmlyA,5
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -693,7 +696,7 @@ stoobly_agent/test/app/test/matchers/diff_test.py,sha256=fNbzAz3MptieVIrMInxGlNa
 stoobly_agent/test/app/test/matchers/fuzzy_test.py,sha256=wkySpK00dFZLlXmW7xE7Q6UPJYLiq8aCnIHt4Nm4WEk,3231
 stoobly_agent/test/cli/mock_test.py,sha256=Y3E_I4FnDf3aEOl1dDABC6x571iBgZuINE5giTH5Lcs,4566
 stoobly_agent/test/cli/record_test.py,sha256=UOR6KyN8FHRdo2k4ybC2OTKiMNg6Gns-A0qA4CeqlKI,13188
-stoobly_agent/test/config/data_dir_test.py,sha256=WbIFRerTzgvHmiRg8OyI1WDuwFeMu1tHqsJJb46PDkc,2341
+stoobly_agent/test/config/data_dir_test.py,sha256=sszUW6MKGFCS9JGhYL-E91hBzfI2jMaHRJMifNjZ00M,2659
 stoobly_agent/test/mock_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/test/mock_data/endpoint_show_response.py,sha256=JFEkceHI6nH38zitCbFMozE1lODahxmvj70N5eM_sec,5901
 stoobly_agent/test/mock_data/petstore-additional-props.yaml,sha256=CU5363OV1gFS9nC-oa6sRHncSQy16CF90kBalkCySQA,1512
@@ -707,8 +710,8 @@ stoobly_agent/test/mock_data/petstore.yaml,sha256=CCdliJky04Az4FIOkFA883uunwFDHL
 stoobly_agent/test/mock_data/request_show_response.py,sha256=K_a0fP0QT58T8sX9PaM6hqtX1A1depZsqg_GsNPf--k,707
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.0.5.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
-stoobly_agent-1.0.5.dist-info/METADATA,sha256=7Hn3-8EPo9N8ga1KnlMEpJGDs45MwJWS8NaJWe28rgE,3388
-stoobly_agent-1.0.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-stoobly_agent-1.0.5.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.0.5.dist-info/RECORD,,
+stoobly_agent-1.0.6.dist-info/LICENSE,sha256=8QKGyy45eN76Zk52h8gu1DKX2B_gbWgZ3nzDLofEbaE,548
+stoobly_agent-1.0.6.dist-info/METADATA,sha256=LLWexqmnANwAeXsSBtLhxepnsykianH5kVk8lmugnE8,3388
+stoobly_agent-1.0.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+stoobly_agent-1.0.6.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.0.6.dist-info/RECORD,,

{stoobly_agent-1.0.5.dist-info → stoobly_agent-1.0.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any

stoobly_agent/app/cli/ca_cert_installer.py

@@ -1,54 +0,0 @@
-import os
-import subprocess
-import sys
-
-class CACertInstaller():
-
-    def __init__(self):
-        home_dir = os.path.expanduser('~')
-        self.mitmproxy_certs_dir = os.path.join(home_dir, '.mitmproxy')
-        self.pem_file_name = 'mitmproxy-ca-cert.pem'
-        self.cer_file_name = 'mitmproxy-ca-cert.cer'
-        self.crt_file_name = 'mitmproxy-ca-cert.crt'
-
-    @property
-    def mitm_crt_absolute_path(self):
-        return os.path.join(self.mitmproxy_certs_dir, self.crt_file_name)
-
-    # https://askubuntu.com/a/94861
-    def handle_debian(self):
-        extra_ca_certs_dir = '/usr/local/share/ca-certificates/extra'
-
-        mitm_cer_absolute_path = os.path.join(self.mitmproxy_certs_dir, self.cer_file_name)
-        self.__ensure_exists(mitm_cer_absolute_path)
-
-        extra_crt_absolute_path = os.path.join(extra_ca_certs_dir, self.crt_file_name)
-
-        subprocess.run(f"sudo mkdir -p {extra_ca_certs_dir}".split(), check=True)
-        subprocess.run(f"sudo cp {mitm_cer_absolute_path} {extra_crt_absolute_path}".split(), check=True)
-        subprocess.run("sudo update-ca-certificates".split(), check=True)
-
-    # https://www.dssw.co.uk/reference/security.html
-    def handle_darwin(self):
-        system_keychain_path = '/Library/Keychains/System.keychain'
-
-        mitm_pem_absolute_path = os.path.join(self.mitmproxy_certs_dir, self.pem_file_name)
-        self.__ensure_exists(mitm_pem_absolute_path)
-
-        subprocess.run(f"sudo security add-trusted-cert -d -p ssl -p basic -k {system_keychain_path} {mitm_pem_absolute_path}".split(), check=True)
-
-    def handle_rhel(self):
-        ca_trust_dir = '/etc/pki/ca-trust/source/anchors'
-
-        mitm_cer_absolute_path = os.path.join(self.mitmproxy_certs_dir, self.cer_file_name)
-        self.__ensure_exists(mitm_cer_absolute_path)
-
-        ca_trust_crt_absolute_path = os.path.join(ca_trust_dir, self.crt_file_name)
-
-        subprocess.run(f"sudo cp {mitm_cer_absolute_path} {ca_trust_crt_absolute_path}".split(), check=True)
-        subprocess.run("sudo update-ca-trust extract".split(), check=True)
-
-    def __ensure_exists(self, file_path):
-        if not os.path.exists(file_path):
-            print("Error: Proxy has not been started", file=sys.stderr)
-            sys.exit(1)