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

stoobly_agent/__init__.py

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

stoobly_agent/app/cli/helpers/openapi_endpoint_adapter.py

@@ -27,8 +27,14 @@ class OpenApiEndpointAdapter():
 
     with open(file_path, "r") as stream:
       file_data: Dict = yaml.safe_load(stream)
+
       if 'info' not in file_data:
         self.__add_info(file_data)
+
+      missing_oauth2_scopes = self.__is_missing_oauth2_scopes(file_data)
+      if missing_oauth2_scopes:
+        self.__add_oauth2_default_scopes(file_data)
+
       spec = Spec.from_dict(file_data)
 
     return self.adapt(spec)
@@ -36,7 +42,7 @@ class OpenApiEndpointAdapter():
   def adapt(self, spec: Spec) -> List[EndpointShowResponse]:
     endpoints = []
     endpoint_counter = 0
-    components = spec.get("components")
+    components = spec.get("components", {})
     schemas = components.get("schemas", {})
     paths = spec.getkey('paths')
 
@@ -184,12 +190,12 @@ class OpenApiEndpointAdapter():
           request_body = operation.get("requestBody", {})
           required_request_body = request_body.get("required")
           required_body_params = []
-          param_properties = {}
           literal_body_params = {}
           request_body_array = False
 
           content = request_body.get("content", {})
           for mimetype, media_type in content.items():
+            param_properties = {}
             schema = media_type['schema']
 
             # If Spec Component reference, look it up in components
@@ -202,12 +208,10 @@ class OpenApiEndpointAdapter():
               schema_type = schema.get('type')
               if schema_type:
                 if schema_type == 'object':
-                  param_properties = schema['properties']
+                  param_properties = schema.get('properties', {})
                 elif schema_type == 'array':
                   request_body_array = True
                   param_properties = {'tmp': schema['items']}
-              else:
-                param_properties = {}
 
             for property_key, property_value in param_properties.items():
               if property_key in required_body_params:
@@ -247,6 +251,57 @@ class OpenApiEndpointAdapter():
       'title': ''
     }
 
+  def __is_missing_oauth2_scopes(self, file_data: Dict):
+    is_missing = False
+    if 'components' in file_data:
+      components = file_data['components']
+
+      if 'securitySchemes' in components:
+        security_schemes = components['securitySchemes']
+
+        for scheme_name, scheme in security_schemes.items():
+          if scheme.get('type') == 'oauth2':
+            flows = scheme.get('flows')
+
+            if flows and flows.get('clientCredentials'):
+              scopes = flows.get('clientCredentials').get('scopes')
+
+              if scopes is None:
+                return True
+
+            break
+
+    return is_missing
+
+  def __add_oauth2_default_scopes(self, file_data: Dict):
+    if 'components' not in file_data:
+      return
+    components = file_data['components']
+
+    if 'securitySchemes' not in components:
+      return
+    security_schemes = components['securitySchemes']
+
+    oauth_security_scheme = {}
+    for scheme_name, scheme in security_schemes.items():
+      if scheme.get('type') == 'oauth2':
+        oauth_security_scheme = scheme
+        break
+
+    # If empty dict or None
+    if not oauth_security_scheme:
+      return
+
+    flows = oauth_security_scheme['flows']
+    if not flows:
+      return
+
+    client_credentials = flows['clientCredentials']
+    if not client_credentials:
+      return
+
+    client_credentials['scopes'] = {}
+
   def __get_most_recent_param(self, literal_params: dict):
     return list(literal_params)[-1] if literal_params else None
 

stoobly_agent/app/proxy/handle_mock_service.py

@@ -41,7 +41,7 @@ def handle_request_mock_generic(context: MockContext, **options: MockOptions):
         # Rewrite request with paramter rules for mock
         request: MitmproxyRequest = context.flow.request
         request_facade = MitmproxyRequestFacade(request)
-        request_facade.with_parameter_rules(rewrite_rules).rewrite()
+        request_facade.with_parameter_rules(rewrite_rules).with_url_rules(rewrite_rules).rewrite()
 
     __mock_hook(lifecycle_hooks.BEFORE_MOCK, context)
 

stoobly_agent/app/proxy/mitmproxy/request_facade.py

@@ -185,7 +185,7 @@ class MitmproxyRequestFacade(Request):
                 self.request.host = rewrite.host
             
             if rewrite.port:
-                self.request.port = rewrite.port
+                self.request.port = int(rewrite.port)
 
     def __rewrite_headers(self, rewrites: List[ParameterRule]):
         self.__apply_headers(rewrites, self.__rewrite_handler)

stoobly_agent/app/proxy/record/join_request_service.py

@@ -26,7 +26,7 @@ def join_rewritten_request(flow: MitmproxyHTTPFlow, intercept_settings: Intercep
     response = MitmproxyResponseFacade(flow.response)
     rewrite_rules = intercept_settings.record_rewrite_rules
 
-    request.with_parameter_rules(rewrite_rules).rewrite()
+    request.with_parameter_rules(rewrite_rules).with_url_rules(rewrite_rules).rewrite()
     response.with_rewrite_rules(rewrite_rules).rewrite()
 
     return join_request(request, response, intercept_settings)

{stoobly_agent-0.30.0.dist-info → stoobly_agent-0.30.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stoobly-agent
-Version: 0.30.0
+Version: 0.30.1
 Summary: Client agent for Stoobly
 Home-page: https://github.com/Stoobly/stoobly-agent
 Author: Michael Yen

{stoobly_agent-0.30.0.dist-info → stoobly_agent-0.30.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=oRS5sVm-ReZZRfzauK-Zo_6QLdKp4io3Ss5jkgMqd4A,45
+stoobly_agent/__init__.py,sha256=ERtaDwMrq3L1TiLsgj7017T43LEdDMO9MX7tpGaf4AA,45
 stoobly_agent/cli.py,sha256=4ZAnhcjY1a9RA3YZy-RkkUFx4DKw6KpGZq1ZoJZ7akM,7439
 stoobly_agent/mock.py,sha256=P9cr9yW8PF1XolPfNSftcJVn1xEqcD-SEyIROsFxY20,2549
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,7 @@ stoobly_agent/app/cli/helpers/handle_mock_service.py,sha256=OkOaTgCd9ZqYle4_F8jv
 stoobly_agent/app/cli/helpers/handle_replay_service.py,sha256=EmFNISE-e-NzdlCCS_Nx89B2NHjxUXJtUXDe4Caxc7Y,3886
 stoobly_agent/app/cli/helpers/handle_test_service.py,sha256=4g94uexoAvMPis-fB027TmkZNp4qpj0AO7DZtcHSm5E,6007
 stoobly_agent/app/cli/helpers/iterate_group_by.py,sha256=oN9JC58LHLiElQC0M6JdjBAVlqIEwoBmNJuSJyIs-cI,3099
-stoobly_agent/app/cli/helpers/openapi_endpoint_adapter.py,sha256=RcF3F_9KWTHexNkrsN0RBW-eWPo6uP7yYGBuBZsIxS0,18261
+stoobly_agent/app/cli/helpers/openapi_endpoint_adapter.py,sha256=7p0hlvXie7DYVMgnSMA28p4KBWxLY1qpXSr8TFvR1Jk,19744
 stoobly_agent/app/cli/helpers/print_service.py,sha256=SQ5vt5DrGbm7syQNCXy6UzHCelMdGBtzEDZllpQ-1zk,1612
 stoobly_agent/app/cli/helpers/project_facade.py,sha256=rThwVur2clCCBcHa-U4_vGynj0miKv78B3uF6ZRmBSQ,1905
 stoobly_agent/app/cli/helpers/replay_facade.py,sha256=e-g1gidt6-1zdFYQOJEtz8BHAv0tYHgMFz52DPVgspk,3441
@@ -150,7 +150,7 @@ stoobly_agent/app/models/types/response.py,sha256=OQNvHnyLvRSJF3E4A1GaROlZekKvfl
 stoobly_agent/app/models/types/scenario.py,sha256=fcO2rhrFNNDsEd02Mt4TXlVrdAvtkF7I5tIpoR_dkN0,172
 stoobly_agent/app/proxy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/proxy/context.py,sha256=XLteUEP8T8aT0hHI_jHDaL2382OaC7QyVwlni5_FS9U,456
-stoobly_agent/app/proxy/handle_mock_service.py,sha256=fBOoIbW7zk1X9fyiLzBOknNbCw9WiEn36HN8oMbG4yo,6013
+stoobly_agent/app/proxy/handle_mock_service.py,sha256=4q0brrNcgiClS02Hx6HKbRzO1glvQUUXrEwsslwZQQE,6043
 stoobly_agent/app/proxy/handle_record_service.py,sha256=n43FJKGvwgS25QexhfRKBtl3OBMbBN3Trb-R4hqQ3Yc,3362
 stoobly_agent/app/proxy/handle_replay_service.py,sha256=tJlzRZxu50QGd49MKXoXMiX4UT6GudZbonK7sNFWHHQ,1797
 stoobly_agent/app/proxy/handle_test_service.py,sha256=F4in8KNyLL8nA30dbmYdRJMCkFV9hc3xJPPYgCUKA0E,3806
@@ -166,7 +166,7 @@ stoobly_agent/app/proxy/mitmproxy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 stoobly_agent/app/proxy/mitmproxy/flow_mock.py,sha256=YxQV3pXIzicvLOCFn7zmnSoAstAmR8fzONYOXAkYbT4,1153
 stoobly_agent/app/proxy/mitmproxy/request.py,sha256=niy38718CAe4Li4k40GXnWDDmUTCPkXesDZTaC8BeLc,878
 stoobly_agent/app/proxy/mitmproxy/request_body_facade.py,sha256=kMJ8YH2FKW9qV68QcUbOCLfiGgKrFV5krzt7usGf0as,649
-stoobly_agent/app/proxy/mitmproxy/request_facade.py,sha256=1IzcECCtrmAKE2qIeWw8IAnaEU7t-a2lhGdW6PBAR7w,7598
+stoobly_agent/app/proxy/mitmproxy/request_facade.py,sha256=Hq7l6JNDZll3DWqFzAAlkXvLyqGM7jOK7GjcXUIwgLQ,7603
 stoobly_agent/app/proxy/mitmproxy/response.py,sha256=BFaJlB1D98EOjrc-kUmunUCTUuiZsPDqq2QgAHDocQI,339
 stoobly_agent/app/proxy/mitmproxy/response_facade.py,sha256=NsNH0aW-mMfLcUXB-Wt9wH5cDyw_4ezdddtCWPHr5hQ,1209
 stoobly_agent/app/proxy/mock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -177,7 +177,7 @@ stoobly_agent/app/proxy/mock/hashed_request_decorator.py,sha256=8SnIplrK7VocpvAF
 stoobly_agent/app/proxy/mock/request_hasher.py,sha256=91RLNk163digRaMd1Kg88RLzXrXkpvoNKDQxB_NeiNo,3723
 stoobly_agent/app/proxy/record/__init__.py,sha256=lbW-G6DZ8IrRpRzvgt-1tn2cRuyLT744u9ERIrZ2dFI,233
 stoobly_agent/app/proxy/record/context.py,sha256=L9tykwoB35hOPHft3IHSPjuJ2v3TSj9SQAJ9E1q-U_4,343
-stoobly_agent/app/proxy/record/join_request_service.py,sha256=JhuRAC5eyawz12hb4EJeONBk0_vBXhfbl67IaX3Gy3Q,1277
+stoobly_agent/app/proxy/record/join_request_service.py,sha256=Cz34NWBHBIRhHGtfdgnuhTYLPfWPWx6R_mSqljPGr7k,1307
 stoobly_agent/app/proxy/record/joined_request.py,sha256=va79Pkz5RWACJn07ipV_FtVmGUzjSlqhfUu_amw9bX8,1553
 stoobly_agent/app/proxy/record/overwrite_scenario_service.py,sha256=3em2a2ry4MrE30XlAukat-l3L9cu4o13Cxhi6BBUgkc,940
 stoobly_agent/app/proxy/record/proxy_request.py,sha256=6DqQ2KH7AtfvXg5HNDWwvwgjO7x1QrWDYgJOBMWPKqs,418
@@ -480,9 +480,9 @@ stoobly_agent/test/app/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 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/request_show_response.py,sha256=K_a0fP0QT58T8sX9PaM6hqtX1A1depZsqg_GsNPf--k,707
-stoobly_agent-0.30.0.dist-info/LICENSE,sha256=8WuxPI7sA6w_Yhwqn6v6Ch2Kvu6fo0cwMNIgxSE7oq8,548
-stoobly_agent-0.30.0.dist-info/METADATA,sha256=ggSlLoBos8KXIZEHi1RkTbYGGOYrXPvYY3M0hBHrgls,807
-stoobly_agent-0.30.0.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-stoobly_agent-0.30.0.dist-info/entry_points.txt,sha256=4fpF9D1sN3q8Z6d0MmNAKUy0dz-ZxoH9mqfYMhErRCg,57
-stoobly_agent-0.30.0.dist-info/top_level.txt,sha256=fTxn372sBnUMXVSJxpaVAMBWB3HU3_Mq-WXJCM6mMj8,14
-stoobly_agent-0.30.0.dist-info/RECORD,,
+stoobly_agent-0.30.1.dist-info/LICENSE,sha256=8WuxPI7sA6w_Yhwqn6v6Ch2Kvu6fo0cwMNIgxSE7oq8,548
+stoobly_agent-0.30.1.dist-info/METADATA,sha256=wnM9LNhjZn2xLx-iKYvYj-8_2IcjaNiUIP4ohAbsmoo,807
+stoobly_agent-0.30.1.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+stoobly_agent-0.30.1.dist-info/entry_points.txt,sha256=4fpF9D1sN3q8Z6d0MmNAKUy0dz-ZxoH9mqfYMhErRCg,57
+stoobly_agent-0.30.1.dist-info/top_level.txt,sha256=fTxn372sBnUMXVSJxpaVAMBWB3HU3_Mq-WXJCM6mMj8,14
+stoobly_agent-0.30.1.dist-info/RECORD,,