stoobly-agent 0.30.1__py3-none-any.whl → 0.30.7__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '0.30.1'
+VERSION = '0.30.7'

stoobly_agent/app/cli/config_cli.py

@@ -146,7 +146,7 @@ def rewrite(ctx):
 @rewrite.command(
     help="Set rewrite rule."
 )
-@click.option('--host', help='Request URL host.')
+@click.option('--hostname', help='Request URL hostname.')
 @click.option(
     '--method', 
     multiple=True, 
@@ -169,6 +169,7 @@ def rewrite(ctx):
     type=click.Choice([request_component.BODY_PARAM, request_component.HEADER, request_component.QUERY_PARAM]), 
     help='Request component type.'
 )
+@click.option('--scheme', help='Request URL scheme.')
 @click.option('--value', help='Rewrite value.')
 def set(**kwargs):
     if kwargs['name'] or kwargs['value'] or kwargs['type']:
@@ -209,7 +210,7 @@ def set(**kwargs):
         settings.proxy.rewrite.set_rewrite_rules(project_key.id, rewrite_rules)
     else:
         parameter_rule_filter = lambda rule: rule.name == kwargs['name'] and rule.type == kwargs['type'] and rule.modes == modes
-        url_rule_filter = lambda rule: rule.host == kwargs['host'] and rule.modes == modes
+        url_rule_filter = lambda rule: rule.modes == modes
 
         for rewrite_rule in filtered_rewrite_rules:
             # Parameter rules
@@ -485,13 +486,14 @@ def __select_parameter_rule(kwargs):
     }
 
 def __select_url_rule(kwargs):
-    if kwargs['host'] == None or kwargs['port'] == None:
+    if kwargs['hostname'] == None or kwargs['port'] == None:
         return
 
     return {
-        'host': kwargs['host'],
+        'hostname': kwargs['hostname'],
         'modes': list(kwargs['mode']),
         'port': kwargs['port'],
+        'scheme': kwargs['scheme'],
     }
 
 def __project_key(settings):

stoobly_agent/app/cli/helpers/handle_mock_service.py

@@ -11,4 +11,4 @@ def print_raw_response(response: requests.Response):
   facade = MitmproxyResponseFacade(mitmproxy_response)
   response_string = ResponseString(facade, None)
 
-  print(response_string.get().decode())
+  print(response_string.get().decode(), end="")

stoobly_agent/app/proxy/handle_mock_service.py

@@ -32,10 +32,14 @@ class MockOptions(TypedDict):
 # @param settings [Dict]
 #
 def handle_request_mock_generic(context: MockContext, **options: MockOptions):
+    __mock_hook(lifecycle_hooks.BEFORE_MOCK, context)
+
     intercept_settings = context.intercept_settings
     request: MitmproxyRequest = context.flow.request
     request_model = RequestModel(intercept_settings.settings)
 
+    policy = get_active_mode_policy(request, intercept_settings)
+
     rewrite_rules = intercept_settings.mock_rewrite_rules
     if len(rewrite_rules) > 0:
         # Rewrite request with paramter rules for mock
@@ -43,8 +47,6 @@ def handle_request_mock_generic(context: MockContext, **options: MockOptions):
         request_facade = MitmproxyRequestFacade(request)
         request_facade.with_parameter_rules(rewrite_rules).with_url_rules(rewrite_rules).rewrite()
 
-    __mock_hook(lifecycle_hooks.BEFORE_MOCK, context)
-
     # If ignore rules are set, then ignore specified request parameters
     ignore_rules = intercept_settings.ignore_rules
     if len(ignore_rules) > 0:
@@ -57,7 +59,6 @@ def handle_request_mock_generic(context: MockContext, **options: MockOptions):
     handle_failure = options['failure'] if 'failure' in options and callable(options['failure']) else None
     
     eval_request = inject_eval_request(request_model, intercept_settings)
-    policy = get_active_mode_policy(request, intercept_settings)
  
     if policy == mock_policy.NONE:
         if handle_failure:
@@ -83,8 +84,8 @@ def handle_request_mock_generic(context: MockContext, **options: MockOptions):
     else:
         return bad_request(
             context.flow,
-            "Valid env MOCK_POLICY: %s, %s, %s, Got: %s" %
-            [mock_policy.ALL, mock_policy.FOUND, policy]
+            "Valid env MOCK_POLICY: %s, Got: %s" %
+            ([mock_policy.ALL, mock_policy.FOUND, mock_policy.NONE], policy)
         )
 
     __mock_hook(lifecycle_hooks.AFTER_MOCK, context)

stoobly_agent/app/proxy/handle_record_service.py

@@ -23,18 +23,17 @@ LOG_ID = 'HandleRecord'
 
 def handle_response_record(context: RecordContext):
     flow = context.flow
-    intercept_settings = context.intercept_settings
-    request: MitmproxyRequest = flow.request
-
     disable_transfer_encoding(flow.response)
 
+    __record_hook(lifecycle_hooks.BEFORE_RECORD, context)
+
+    intercept_settings = context.intercept_settings
+    request: MitmproxyRequest = flow.request
     request_model = RequestModel(intercept_settings.settings)
 
     active_record_policy = get_active_mode_policy(request, intercept_settings)
     Logger.instance().debug(f"{LOG_ID}:RecordPolicy: {active_record_policy}")
 
-    __record_hook(lifecycle_hooks.BEFORE_RECORD, context)
-
     if active_record_policy == record_policy.ALL:
         __record_request(context, request_model)
     elif active_record_policy == record_policy.FOUND:
@@ -55,8 +54,8 @@ def handle_response_record(context: RecordContext):
         if active_record_policy != record_policy.NONE:
             return bad_request(
                 flow,
-                "Valid env RECORD_POLICY: %s, %s, %s, Got: %s" %
-                [record_policy.ALL, record_policy.FOUND, record_policy.NOT_FOUND, active_record_policy]
+                "Valid env RECORD_POLICY: %s, Got: %s" %
+                ([record_policy.ALL, record_policy.FOUND, record_policy.NOT_FOUND], active_record_policy)
             )
 
 def __record_handler(context: RecordContext, request_model: RequestModel):

stoobly_agent/app/proxy/handle_replay_service.py

@@ -12,6 +12,8 @@ from .utils.allowed_request_service import get_active_mode_policy
 LOG_ID = 'HandleReplay'
 
 def handle_request_replay(replay_context: ReplayContext):
+  __replay_hook(lifecycle_hooks.BEFORE_REPLAY, replay_context)
+
   request: MitmproxyRequest = replay_context.flow.request
   intercept_settings: InterceptSettings = replay_context.intercept_settings
 
@@ -34,8 +36,6 @@ def __replay_request(replay_context: ReplayContext):
         request_facade = MitmproxyRequestFacade(request)
         request_facade.with_parameter_rules(rewrite_rules).with_url_rules(rewrite_rules).rewrite()
 
-    __replay_hook(lifecycle_hooks.BEFORE_REPLAY, replay_context)
-
 def __replay_hook(hook: str, replay_context: ReplayContext):
     intercept_settings: InterceptSettings = replay_context.intercept_settings
 

stoobly_agent/app/proxy/intercept_handler.py

@@ -30,6 +30,9 @@ def request(flow: MitmproxyHTTPFlow):
 
     intercept_settings = InterceptSettings(Settings.instance(), request)
 
+    if not intercept_settings.active:
+        return
+
     __intercept_hook(lifecycle_hooks.BEFORE_REQUEST, flow, intercept_settings)
 
     active_mode = intercept_settings.mode
@@ -59,6 +62,9 @@ def response(flow: MitmproxyHTTPFlow):
     intercept_settings = InterceptSettings(Settings.instance(), request)
     intercept_settings.for_response()
 
+    if not intercept_settings.active:
+        return
+
     __intercept_hook(lifecycle_hooks.BEFORE_RESPONSE, flow, intercept_settings)
 
     active_mode = intercept_settings.mode

stoobly_agent/app/proxy/mitmproxy/request_facade.py

@@ -106,6 +106,10 @@ class MitmproxyRequestFacade(Request):
     def parameter_rules(self) -> List[ParameterRule]:
         return self.__parameter_rules
 
+    @property
+    def scheme(self):
+        return self.request.scheme
+
     def with_parameter_rules(self, rules: List[RewriteRule]):
         if type(rules) == list:
             self.__parameter_rules = self.select_parameter_rules(rules)
@@ -181,12 +185,15 @@ class MitmproxyRequestFacade(Request):
 
     def __rewrite_url(self, rewrites: List[UrlRule]):
         for rewrite in rewrites:
-            if rewrite.host:
-                self.request.host = rewrite.host
+            if rewrite.hostname:
+                self.request.host = rewrite.hostname
             
             if rewrite.port:
                 self.request.port = int(rewrite.port)
 
+            if rewrite.scheme:
+                self.request.scheme = rewrite.scheme
+
     def __rewrite_headers(self, rewrites: List[ParameterRule]):
         self.__apply_headers(rewrites, self.__rewrite_handler)
 

stoobly_agent/app/proxy/utils/allowed_request_service.py

@@ -13,7 +13,7 @@ def get_active_mode_policy(request: MitmproxyRequest, intercept_settings: Interc
     if intercept_settings.request_origin == request_origin.CLI:
         return intercept_settings.policy 
 
-    if intercept_settings.active and allowed_request(request, intercept_settings):
+    if allowed_request(request, intercept_settings):
         return intercept_settings.policy
     else:
         # If the request path does not match accepted paths, do not mock
@@ -27,7 +27,7 @@ def allowed_request(request: MitmproxyRequest, intercept_settings: InterceptSett
 
     # If an include rule(s) exists, then only requests matching these pattern(s) are allowed
     include_rules = intercept_settings.include_rules
-    if not __request_included(request, include_rules) :
+    if not __request_included(request, include_rules):
         return False
 
     # If there are no exclude or include patterns, request is allowed

stoobly_agent/app/settings/types/proxy_settings.py

@@ -16,9 +16,10 @@ class ParameterRule(TypedDict):
   value: str
 
 class UrlRule(TypedDict):
-  host: str
+  hostname: str
   modes: List[Mode]
   port: str
+  scheme: str
 
 class DataRules(TypedDict):
   mock_policy: MockPolicy

stoobly_agent/app/settings/url_rule.py

@@ -8,8 +8,8 @@ class UrlRule:
     self.update(url_rule)
 
   @property
-  def host(self):
-    return self.__host
+  def hostname(self):
+    return self.__hostname
 
   @property 
   def modes(self):
@@ -19,15 +19,21 @@ class UrlRule:
   def port(self):
     return self.__port
 
+  @property
+  def scheme(self):
+    return self.__scheme
+
   def update(self, url_rule: IUrlRule):
     self.__url_rule = url_rule
-    self.__host = self.__url_rule.get('host')
+    self.__hostname = self.__url_rule.get('hostname')
     self.__modes = self.__url_rule.get('modes')
     self.__port = self.__url_rule.get('port')
+    self.__scheme = self.__url_rule.get('scheme')
 
   def to_dict(self):
     return {
-      'host': self.__host,
+      'hostname': self.__hostname,
       'modes': self.__modes,
       'port': self.__port,
+      'scheme': self.__scheme,
     }

stoobly_agent/db/migrations/2022_03_17_060144_create_requests.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class CreateRequests(Migration):
 

stoobly_agent/db/migrations/2022_03_17_074916_create_responses.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class CreateResponses(Migration):
 

stoobly_agent/db/migrations/2022_05_10_003705_create_traces.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 
 class CreateTraces(Migration):

stoobly_agent/db/migrations/2022_05_10_003840_create_trace_aliases.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class CreateTraceAliases(Migration):
 

stoobly_agent/db/migrations/2022_06_29_234516_create_trace_requests.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class CreateTraceRequests(Migration):
 

stoobly_agent/db/migrations/2022_06_29_235155_add_trace_request_reference_to_trace_aliases.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class AddTraceRequestReferenceToTraceAliases(Migration):
 

stoobly_agent/db/migrations/2022_12_12_092437_align_requests.py

@@ -1,7 +1,7 @@
 import pdb
 import requests
 
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 from urllib.parse import urlparse
 
 from stoobly_agent.app.models.adapters.raw_http_request_adapter import RawHttpRequestAdapter

stoobly_agent/db/migrations/2022_12_28_092917_add_filter_columns_to_requests.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class AddFilterColumnsToRequests(Migration):
 

stoobly_agent/db/migrations/2023_01_21_055426_create_scenarios.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class CreateScenarios(Migration):
 

stoobly_agent/db/migrations/2023_01_21_060225_add_scenario_id_reference_to_requests.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 class AddScenarioIdReferenceToRequests(Migration):
 

stoobly_agent/db/migrations/2023_02_02_022229_create_replayed_responses.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 
 class CreateReplayedResponses(Migration):

stoobly_agent/db/migrations/2023_03_20_192909_add_http_version_column_to_requests.py

@@ -1,6 +1,6 @@
 import pdb
 
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 from stoobly_agent.lib.orm.request import Request
 

stoobly_agent/db/migrations/2023_03_20_220448_add_http_version_column_to_responses.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 from stoobly_agent.lib.orm.response import Response
 

stoobly_agent/db/migrations/2023_04_18_071327_align_requests.py

@@ -1,7 +1,7 @@
 import requests
 import pdb
 
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 from stoobly_agent.app.models.adapters.raw_http_response_adapter import RawHttpResponseAdapter
 from stoobly_agent.lib.orm.request import Request

stoobly_agent/db/migrations/2023_05_15_212505_add_uuid_column_to_requests.py

@@ -1,7 +1,7 @@
 import pdb
 import uuid
 
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 from stoobly_agent.app.proxy.record.request_string_control import RequestStringControl
 from stoobly_agent.lib.orm.request import Request

stoobly_agent/db/migrations/2023_05_15_213119_add_uuid_column_to_scenarios.py

@@ -1,6 +1,6 @@
 import uuid
 
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 from stoobly_agent.lib.orm.scenario import Scenario
 

stoobly_agent/db/migrations/2023_05_29_053649_add_overwritable_column_to_scenarios.py

@@ -1,4 +1,4 @@
-from orator.migrations import Migration
+from stoobly_orator.migrations import Migration
 
 
 class AddOverwritableColumnToScenarios(Migration):

stoobly_agent/lib/orm/__init__.py

@@ -1,7 +1,7 @@
 import os
 import pdb
 
-from orator import DatabaseManager, Model
+from stoobly_orator import DatabaseManager, Model
 
 from stoobly_agent.config.constants.env_vars import ENV
 from stoobly_agent.config.data_dir import DataDir

stoobly_agent/lib/orm/migrate_service.py

@@ -1,7 +1,7 @@
 import os
 import pdb
 
-from orator.migrations import Migrator, DatabaseMigrationRepository
+from stoobly_orator.migrations import Migrator, DatabaseMigrationRepository
 
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.config.source_dir import SourceDir

stoobly_agent/lib/orm/replayed_response.py

@@ -1,7 +1,7 @@
 import pdb
 import requests
 
-from orator.orm import belongs_to
+from stoobly_orator.orm import belongs_to
 
 from stoobly_agent.app.proxy.mitmproxy.response_facade import MitmproxyResponseFacade
 from stoobly_agent.app.proxy.record.response_string import ResponseString

stoobly_agent/lib/orm/request.py

@@ -1,7 +1,7 @@
 import pdb
 import uuid
 
-from orator.orm import belongs_to, has_many, has_one 
+from stoobly_orator.orm import belongs_to, has_many, has_one 
 
 from stoobly_agent.lib.api.keys.project_key import LOCAL_PROJECT_ID
 from stoobly_agent.lib.api.keys.request_key import RequestKey

stoobly_agent/lib/orm/response.py

@@ -1,4 +1,4 @@
-from orator.orm import belongs_to
+from stoobly_orator.orm import belongs_to
 
 from stoobly_agent.app.models.schemas.request import Request
 

stoobly_agent/lib/orm/scenario.py

@@ -1,7 +1,7 @@
 import pdb
 import uuid
 
-from orator.orm import has_many
+from stoobly_orator.orm import has_many
 
 from stoobly_agent.lib import orm
 from stoobly_agent.lib.api.keys.project_key import LOCAL_PROJECT_ID

stoobly_agent/lib/orm/trace.py

@@ -1,4 +1,4 @@
-from orator.orm import has_many
+from stoobly_orator.orm import has_many
 
 from .base import Base
 from .trace_alias import TraceAlias

stoobly_agent/lib/orm/trace_alias.py

@@ -1,6 +1,6 @@
 import json
 
-from orator.orm import accessor, belongs_to
+from stoobly_orator.orm import accessor, belongs_to
 
 from .base import Base
 

stoobly_agent/lib/orm/trace_request.py

@@ -1,4 +1,4 @@
-from orator.orm import belongs_to, has_many
+from stoobly_orator.orm import belongs_to, has_many
 
 from .base import Base
 from .trace_alias import TraceAlias