stoobly-agent 1.0.4__tar.gz → 1.0.6__tar.gz

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.0.4
+Version: 1.0.6
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: click (>=7.0.0,<8.0.0)
+Requires-Dist: click (>=8.1.0,<9.0.0)
 Requires-Dist: diff-match-patch (>=20230430,<20230431)
 Requires-Dist: distro (>=1.6.0,<1.7.0)
 Requires-Dist: dnspython (>=2.6.1,<2.7.0)

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/pyproject.toml

@@ -10,12 +10,12 @@ 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.0.4"
+version = "1.0.6"
 
 [tool.poetry.dependencies]
 python = "^3.10"
 
-click = ">=7.0.0,<8.0.0"
+click = "^8.1.0"
 diff-match-patch = "^20230430"
 distro = ">=1.6.0,<1.7.0"
 dnspython = ">=2.6.1,<2.7.0"

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/stoobly_agent/__init__.py

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

stoobly_agent-1.0.6/stoobly_agent/app/cli/ca_cert_cli.py

@@ -0,0 +1,46 @@
+import click
+import pdb
+import sys
+
+from stoobly_agent.config.data_dir import DataDir
+
+from .helpers.certificate_authority import CertificateAuthority
+
+@click.group(
+    epilog="Run 'stoobly-agent COMMAND --help' for more information on a command.",
+    help="Manage CA certificate"
+)
+@click.pass_context
+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):
+    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():
+    print("Not yet implemented. Stay tuned!")

stoobly_agent-1.0.6/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-1.0.4 → stoobly_agent-1.0.6}/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-1.0.4 → stoobly_agent-1.0.6}/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-1.0.4 → stoobly_agent-1.0.6}/stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -2,7 +2,7 @@ import os
 import pdb
 
 from ...app_config import AppConfig
-from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV
+from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, STOOBLY_HOME_DIR
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -52,6 +52,10 @@ class ServiceBuilder(Builder):
   def proxy_base_service(self):
     return self.services.get(self.proxy_base)
 
+  @property
+  def service_mount(self):
+    return f"{self.dir_path}:{STOOBLY_HOME_DIR}"
+
   @property
   def service_name(self):
     return self.__service_name
@@ -77,7 +81,8 @@ class ServiceBuilder(Builder):
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.app_builder.proxy_base
-      }
+      },
+      'volumes': [self.service_mount]
     })
 
     args[SERVICE_HOSTNAME_ENV] = f"{SERVICE_HOSTNAME}"
@@ -90,7 +95,8 @@ class ServiceBuilder(Builder):
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
         'service': self.app_builder.context_base
-      }
+      },
+      'volumes': [self.service_mount]
     })
 
   def build_configure_base(self):

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/stoobly_agent/app/cli/scaffold/docker/workflow/builder.py

@@ -124,7 +124,7 @@ class WorkflowBuilder(Builder):
 
   def build_init(self):
     environment = { **self.env_dict() }
-    volumes = [f"{self.service_path}:{STOOBLY_HOME_DIR}"]
+    volumes = []
 
     service = {
       'build': self.context_build,

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py

@@ -20,7 +20,7 @@ class MockDecorator():
     config = self.service_builder.config
 
     command = [
-      '--certs', f"../{SERVICE_HOSTNAME}-joined.pem",
+      '--certs', f"/etc/ssl/certs/{SERVICE_HOSTNAME}-joined.pem",
       '--headless',
       '--intercept',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py

@@ -22,7 +22,7 @@ class ReverseProxyDecorator():
     config = self.service_builder.config
 
     command = [
-      '--certs', f"../{SERVICE_HOSTNAME}-joined.pem",
+      '--certs', f"/etc/ssl/certs/{SERVICE_HOSTNAME}-joined.pem",
       '--headless',
       '--lifecycle-hooks-path', 'lifecycle_hooks.py',
       '--proxy-mode', config.proxy_mode,

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.proxy

@@ -31,5 +31,4 @@ RUN setcap 'cap_net_bind_service=+ep' /usr/local/bin/python3.12
 # Change user id of stoobly user to that of host's user id
 RUN if [ -n "$USER_ID" ]; then groupmod -g $USER_ID stoobly; usermod -u $USER_ID stoobly; fi
 
-COPY --chown=stoobly:stoobly . .
-COPY --chown=stoobly:stoobly --from=cert /home/mkcert/$SERVICE_HOSTNAME-joined.pem .
+COPY --chown=stoobly:stoobly --from=cert /home/mkcert/$SERVICE_HOSTNAME-joined.pem /etc/ssl/certs

{stoobly_agent-1.0.4 → stoobly_agent-1.0.6}/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-1.0.4 → stoobly_agent-1.0.6}/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-1.0.4 → stoobly_agent-1.0.6}/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-1.0.6/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-1.0.4 → stoobly_agent-1.0.6}/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-1.0.4 → stoobly_agent-1.0.6}/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