stoobly-agent 1.5.4__tar.gz → 1.5.5__tar.gz

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/PKG-INFO

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

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/pyproject.toml

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

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.4'
+VERSION = '1.5.5'

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/ca_cert_cli.py

@@ -15,13 +15,13 @@ 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('--ca-certs-dir-path', default=DataDir.instance().ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
 @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']
+    ca_certs_dir_path = kwargs['ca_certs_dir_path']
 
-    installer = CertificateAuthority(mitmproxy_ca_certs_dir)
+    installer = CertificateAuthority(ca_certs_dir_path)
 
     try:
         installer.sign(kwargs['hostname'], kwargs['certs_dir_path'])
@@ -30,10 +30,11 @@ def mkcert(**kwargs):
         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.')
+@click.option('--ca-certs-dir-path', default=DataDir.instance().ca_certs_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)
+    pdb.set_trace()
+    ca_certs_dir_path = kwargs['ca_certs_dir_path']
+    installer = CertificateAuthority(ca_certs_dir_path)
 
     try:
         installer.install()

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/helpers/certificate_authority.py

@@ -21,7 +21,7 @@ MITMPROXY_CN = 'mitmproxy'
 
 class CertificateAuthority():
 
-    def __init__(self, certs_dir = DataDir.instance().mitmproxy_conf_dir_path, cn = MITMPROXY_CN):
+    def __init__(self, certs_dir = DataDir.instance().ca_certs_dir_path, cn = MITMPROXY_CN):
         self.certs_dir = certs_dir
         self.cn = cn
         self.key_size = 2048

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold/app.py

@@ -10,7 +10,7 @@ class App():
     data_dir: DataDir = DataDir.instance(path) 
 
     self.__data_dir_path = data_dir.path
-    self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or data_dir.mitmproxy_conf_dir_path
+    self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or data_dir.ca_certs_dir_path
     self.__certs_dir_path = kwargs.get('certs_dir_path') or data_dir.certs_dir_path
     self.__context_dir_path = kwargs.get('context_dir_path') or data_dir.context_dir_path
     self.__data_dir = data_dir

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold/docker/builder.py

@@ -3,7 +3,7 @@ import pathlib
 import pdb
 import yaml
 
-from .constants import APP_NETWORK, DOCKER_COMPOSE_CUSTOM, GATEWAY_NETWORK
+from .constants import APP_NETWORK, APP_NETWORK_NAME, DOCKER_COMPOSE_CUSTOM 
 
 class Builder():
 
@@ -36,11 +36,11 @@ class Builder():
 
   @property
   def public_network(self):
-    return self.__networks.get(GATEWAY_NETWORK)
+    return self.__networks.get(APP_NETWORK_NAME)
 
   @property
   def public_network_name(self):
-    return GATEWAY_NETWORK
+    return APP_NETWORK_NAME
 
   @property
   def networks(self):
@@ -91,7 +91,7 @@ class Builder():
     return self
 
   def with_public_network(self, network = APP_NETWORK):
-    self.__networks[GATEWAY_NETWORK] = {
+    self.__networks[APP_NETWORK_NAME] = {
       'external': True,
       'name': network,
     }

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold/docker/constants.py

@@ -1,10 +1,10 @@
+APP_NETWORK_NAME = 'app'
 APP_NETWORK = '${APP_NETWORK}'
 DOCKER_COMPOSE_BASE = '.docker-compose.base.yml'
 DOCKER_COMPOSE_BASE_TEMPLATE = '.docker-compose.base.template.yml'
 DOCKER_COMPOSE_CUSTOM = 'docker-compose.yml'
 DOCKERFILE_CONTEXT = '.Dockerfile.context'
 DOCKERFILE_SERVICE = 'Dockerfile.source'
-GATEWAY_NETWORK = 'gateway'
 
 # TODO: add scaffold container name templates here
 

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -16,14 +16,14 @@ 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}")
+ca_certs_dir=$$(realpath "$${STOOBLY_CA_CERTS_DIR:-$(app_data_dir)/ca_certs}")
 certs_dir=$$(realpath "$${STOOBLY_CERTS_DIR:-$(app_data_dir)/certs}")
 context_dir=$$(realpath "$${STOOBLY_CONTEXT_DIR:-$(CONTEXT_DIR_DEFAULT)}")
+workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
 
 user_id_option=--user-id $(USER_ID)
 stoobly_exec_options=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME)
-workflow_down_options=$(user_id_option)
-workflow_service_options=$(shell echo $$STOOBLY_WORKFLOW_SERVICE_OPTIONS)
+workflow_down_options=--from-make $(user_id_option)
 workflow_up_options=--app-dir-path $(app_dir) --context-dir-path $(context_dir) --ca-certs-dir-path $(ca_certs_dir) --certs-dir-path $(certs_dir) --from-make $(user_id_option)
 
 app_data_dir=$(app_dir)/.stoobly
@@ -58,11 +58,11 @@ stoobly_exec_run_env=$(source_env) && $(exec_env) CONTEXT_DIR="$(app_dir)"
 workflow_run=$(source_env) && bash "$(workflow_run_script)"
 
 ca-cert/install: stoobly/install
-	@if [ ! -d "$$HOME/.mitmproxy" ]; then \
+	@if [ -z "$$(ls $(ca_certs_dir) 2> /dev/null)" ]; then \
 		read -p "Installing CA certificate is required for $(WORKFLOW)ing requests, continue? (y/N) " confirm && \
 		if [ "$$confirm" = "y" ] || [ "$$confirm" = "Y" ]; then \
 			echo "Running stoobly-agent ca-cert install..."; \
-			stoobly-agent ca-cert install; \
+			stoobly-agent ca-cert install --ca-certs-dir-path $(ca_certs_dir); \
 		else \
 			echo "You can install the CA certificate later by running: stoobly-agent ca-cert install"; \
 		fi \

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml

@@ -6,9 +6,4 @@ services:
       - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly
       - ${APP_DIR}/.stoobly/docker:/home/stoobly/.stoobly/docker
   stoobly_base:
-    image: stoobly.${USER_ID}
-  ui_base:
-    extends:
-      service: context_base 
-    volumes:
-      - ${CA_CERTS_DIR}:/home/stoobly/.mitmproxy
+    image: stoobly.${USER_ID}

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.yml

@@ -4,10 +4,10 @@ services:
       file: ../.docker-compose.base.yml
       service: gateway_base
     networks:
-      - gateway
+      - app
     profiles:
       - mock
 networks:
-  gateway:
+  app:
     name: ${APP_NETWORK}
     external: true

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml

@@ -4,10 +4,10 @@ services:
       file: ../.docker-compose.base.yml
       service: gateway_base
     networks:
-      - gateway
+      - app
     profiles:
       - record
 networks:
-  gateway:
+  app:
     name: ${APP_NETWORK}
     external: true

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/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: ui_base 
+      service: context_base 

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/cli/scaffold_cli.py

@@ -104,7 +104,7 @@ def create(**kwargs):
   help="Scaffold app service certs"
 )
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
-@click.option('--ca-certs-dir-path', default=data_dir.mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
+@click.option('--ca-certs-dir-path', default=data_dir.ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--service', multiple=True, help='Select which services to run. Defaults to all.')
@@ -292,6 +292,7 @@ def copy(**kwargs):
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--dry-run', default=False, is_flag=True)
 @click.option('--extra-entrypoint-compose-path', help='Path to extra entrypoint compose file.')
+@click.option('--from-make', is_flag=True, help='Set if run from scaffolded Makefile.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
@@ -365,6 +366,10 @@ def down(**kwargs):
     else:
       print(remove_network_command)
 
+  # Options are no longer valid
+  if kwargs['from_make'] and os.path.exists(data_dir.mitmproxy_options_json_path):
+    os.remove(data_dir.mitmproxy_options_json_path)
+
 @workflow.command()
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option(
@@ -425,7 +430,7 @@ def logs(**kwargs):
 @workflow.command()
 @click.option('--app-dir-path', default=current_working_dir, help='Path to application directory.')
 @click.option('--build', is_flag=True, help='Build images before starting containers.')
-@click.option('--ca-certs-dir-path', default=data_dir.mitmproxy_conf_dir_path, help='Path to ca certs directory used to sign SSL certs. Defaults to ~/.mitmproxy')
+@click.option('--ca-certs-dir-path', default=data_dir.ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--context-dir-path', default=data_dir.context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--detached', is_flag=True, help='If set, will not run the highest priority service in the foreground.')

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/app/proxy/run.py

@@ -101,6 +101,7 @@ def __filter_options(options):
     Filter out non-mitmproxy options
     '''
 
+    options['confdir'] = options['ca_certs_dir_path']
     options['listen_host'] = options['proxy_host']
     options['listen_port'] = options['proxy_port']
     options['mode'] = options['proxy_mode']
@@ -108,6 +109,9 @@ def __filter_options(options):
     if 'api_url' in options:
         del options['api_url']
 
+    if 'ca_certs_dir_path' in options:
+        del options['ca_certs_dir_path']
+
     if 'certs' in options and not options['certs']:
         del options['certs']
 

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/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, mitmproxy, mode
+from stoobly_agent.config.constants import env_vars, mode
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.utils.conditional_decorator import ConditionalDecorator
 
@@ -79,6 +79,7 @@ def init(**kwargs):
     help="Run proxy and/or UI",
 )
 @ConditionalDecorator(lambda f: click.option('--api-url', help='API URL.')(f), is_remote)
+@click.option('--ca-certs-dir-path', default=DataDir.instance().ca_certs_dir_path, help='Path to ca certs directory used to sign SSL certs.')
 @click.option('--certs', help='''
   SSL certificates of the form "[domain=]path". The domain may include a wildcard, and is equal to "*" if not specified. The file at path is a certificate in PEM format. If a private key is included in the
   PEM, it is used, else the default key in the conf dir is used. The PEM file should contain the full certificate chain, with the leaf certificate as the first entry. May be passed multiple times.
@@ -87,7 +88,6 @@ 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=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-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/config/data_dir.py

@@ -24,17 +24,7 @@ class DataDir:
                 self.__data_dir_path = os.path.join(path, DATA_DIR_NAME)
             else:
                 cwd = os.getcwd()
-                self.__data_dir_path = os.path.join(cwd, DATA_DIR_NAME)
-
-                # If the current working directory does not contain a .stoobly folder,
-                # then search in the parent directories until the home directory.
-                if not os.path.exists(self.__data_dir_path):
-                    data_dir = self.find_data_dir(cwd)
-
-                    if not data_dir:
-                        self.__data_dir_path = os.path.join(os.path.expanduser('~'), DATA_DIR_NAME)
-                    else:
-                        self.__data_dir_path = data_dir
+                self.__data_dir_path = self.find_data_dir(cwd)
 
             if not os.path.exists(self.__data_dir_path):
                 self.create(os.path.dirname(self.__data_dir_path))
@@ -115,29 +105,13 @@ class DataDir:
         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 and os.path.exists(_conf_dir):
-                        conf_dir = _conf_dir
-            except Exception:
-                pass
-        else:
-            if not os.path.exists(conf_dir):
-                os.makedirs(conf_dir)
+    def ca_certs_dir_path(self):
+        path = os.path.join(self.path, 'ca_certs')
+
+        if not os.path.exists(path):
+            os.makedirs(path)
 
-        return conf_dir
+        return path
 
     @property
     def settings_file_path(self):
@@ -227,6 +201,7 @@ class DataDir:
             with open(os.path.join(self.__data_dir_path, '.gitignore'), 'w') as fp:
                 fp.write(
                     "\n".join([
+                        'ca_certs',
                         'certs',
                         'db',
                         'settings.yml',
@@ -236,28 +211,21 @@ class DataDir:
                     ])
                 )
 
-
+    # If the current working directory does not contain a .stoobly folder,
+    # then search in the parent directories until the home directory.
     def find_data_dir(self, start_path: str) -> str:
-        # Note: these paths won't work for Windows
         root_dir = os.path.abspath(os.sep)
-        home_dir = os.path.expanduser("~")
-        root_reached = False
 
-        while start_path != home_dir:
+        while True:
             data_dir_path = os.path.join(start_path, DATA_DIR_NAME)
-
-            if os.path.exists(data_dir_path):
+            if os.path.exists(data_dir_path) and os.stat(data_dir_path).st_uid == os.getuid():
                 return data_dir_path
 
-            if root_reached:
-              break
-
+            # Root reached
             if start_path == root_dir:
-                root_reached = True
-                start_path = home_dir
+                break
 
             # Move up one directory
             start_path = os.path.dirname(start_path)
 
-        return ""
-
+        return os.path.join(os.path.expanduser('~'), DATA_DIR_NAME)

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/config/mitmproxy.py

@@ -1,12 +1,9 @@
 import json
-import os
 import pdb
 
 from stoobly_agent.config.data_dir import DataDir
 
 class MitmproxyConfig():
-  MITMPROXY_DIR_NAME = '.mitmproxy'
-
   __instance = None
   __master = None
 
@@ -16,11 +13,6 @@ class MitmproxyConfig():
     else:
         self.__master = master 
 
-        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)
-
   @classmethod
   def instance(cls, master = None):
       if cls.__instance is None:
@@ -28,15 +20,6 @@ class MitmproxyConfig():
 
       return cls.__instance
 
-  @property
-  def ca_cert_pem_path(self):
-      path = os.path.join(self.__mitmproxy_dir_path, 'mitmproxy-ca-cert.pem')
-
-      if not os.path.exists(path):
-          return ''
-
-      return path
-
   def with_master(self, master):
     from mitmproxy.tools.dump import DumpMaster
     self.__master: DumpMaster = master

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/test/app/cli/helpers/certificate_authority_test.py

@@ -3,7 +3,6 @@ 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
 
@@ -33,7 +32,7 @@ class TestCertificateAuthority():
       return CertificateAuthority()
 
     def test_defaults_to_mitmproxy_confdir(self, certificate_authority: CertificateAuthority):
-      assert certificate_authority.certs_dir == DEFAULT_CONF_DIR_PATH
+      assert certificate_authority.certs_dir == DataDir.instance().ca_certs_dir_path
 
   class TestSign():
 

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

@@ -0,0 +1 @@
+1.5.5

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/test/config/data_dir_test.py

@@ -5,7 +5,6 @@ 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
 
@@ -83,12 +82,4 @@ class TestDataDir():
 
     finally:
       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
+      os.chdir(original_cwd)

{stoobly_agent-1.5.4 → stoobly_agent-1.5.5}/stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml

@@ -1,7 +1,7 @@
 # Define services here
 
 networks:
-  gateway:
+  app:
     external: true
     name: ${APP_NETWORK}
 
@@ -10,7 +10,7 @@ services:
     image: kennethreitz/httpbin:latest
     hostname: my-httpbin.com
     networks:
-      - gateway
+      - app
     profiles: &id001
       - record
 

stoobly_agent-1.5.4/stoobly_agent/config/constants/mitmproxy.py

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

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

@@ -1 +0,0 @@
-1.5.0