mcp-proxy-adapter 6.9.6__py3-none-any.whl → 6.9.8__py3-none-any.whl

mcp_proxy_adapter/core/config_validator.py

@@ -46,7 +46,7 @@ class ConfigValidator:
     def __init__(self, config_path: Optional[str] = None):
         """
         Initialize configuration validator.
-        
+
         Args:
             config_path: Path to configuration file for validation
         """
@@ -314,6 +314,11 @@ class ConfigValidator:
         # Check conditional sections based on feature flags
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
+            
+            # Only check if the enabled key exists in the configuration
+            if not self._has_nested_key(enabled_key):
+                continue
+                
             is_enabled = self._get_nested_value_safe(enabled_key, False)
             
             if is_enabled and feature_name in self.required_sections:
@@ -423,32 +428,35 @@ class ConfigValidator:
         
         # Check SSL requirements
         if requirements["ssl_enabled"]:
-            ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
-            if not ssl_enabled:
-                self.validation_results.append(ValidationResult(
-                    level="error",
-                    message=f"Protocol '{protocol}' requires SSL to be enabled",
-                    section="ssl",
-                    key="enabled"
+            # Only check SSL if ssl section exists
+            if self._has_nested_key("ssl.enabled"):
+                ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
+                if not ssl_enabled:
+                    self.validation_results.append(ValidationResult(
+                        level="error",
+                        message=f"Protocol '{protocol}' requires SSL to be enabled",
+                        section="ssl",
+                        key="enabled"
                 ))
             
             # Check required SSL files
             for file_key in requirements["required_files"]:
-                file_path = self._get_nested_value(file_key)
-                if not file_path:
-                    self.validation_results.append(ValidationResult(
-                        level="error",
-                        message=f"Protocol '{protocol}' requires {file_key} to be specified",
-                        section="ssl",
-                        key=file_key.split(".")[-1]
-                    ))
-                elif not os.path.exists(file_path):
-                    self.validation_results.append(ValidationResult(
-                        level="error",
-                        message=f"Protocol '{protocol}' requires file '{file_path}' to exist",
-                        section="ssl",
-                        key=file_key.split(".")[-1]
-                    ))
+                if self._has_nested_key(file_key):
+                    file_path = self._get_nested_value(file_key)
+                    if not file_path:
+                        self.validation_results.append(ValidationResult(
+                            level="error",
+                            message=f"Protocol '{protocol}' requires {file_key} to be specified",
+                            section="ssl",
+                            key=file_key.split(".")[-1]
+                        ))
+                    elif not os.path.exists(file_path):
+                        self.validation_results.append(ValidationResult(
+                            level="error",
+                            message=f"Protocol '{protocol}' requires file '{file_path}' to exist",
+                            section="ssl",
+                            key=file_key.split(".")[-1]
+                        ))
         
         # Check client verification requirements
         if requirements["client_verification"]:
@@ -531,46 +539,110 @@ class ConfigValidator:
         registration_enabled = self._get_nested_value_safe("proxy_registration.enabled", False)
         
         if registration_enabled:
-            proxy_url = self._get_nested_value("proxy_registration.proxy_url")
-            if not proxy_url:
+            if not self._has_nested_key("proxy_registration.proxy_url"):
                 self.validation_results.append(ValidationResult(
                     level="error",
                     message="Proxy registration is enabled but proxy_url is not specified",
                     section="proxy_registration",
                     key="proxy_url"
                 ))
+            else:
+                proxy_url = self._get_nested_value("proxy_registration.proxy_url")
+                if not proxy_url:
+                    self.validation_results.append(ValidationResult(
+                        level="error",
+                        message="Proxy registration is enabled but proxy_url is not specified",
+                        section="proxy_registration",
+                        key="proxy_url"
+                    ))
             
             # Check authentication method consistency
             auth_method = self._get_nested_value_safe("proxy_registration.auth_method", "none")
             if auth_method != "none":
                 if auth_method == "certificate":
-                    cert_file = self._get_nested_value("proxy_registration.certificate.cert_file")
-                    key_file = self._get_nested_value("proxy_registration.certificate.key_file")
-            if not cert_file or not key_file:
-                    self.validation_results.append(ValidationResult(
-                        level="error",
-                        message="Certificate authentication is enabled but certificate files are not specified",
-                        section="proxy_registration",
-                        key="certificate"
-                    ))
-            elif auth_method == "token":
-                    token = self._get_nested_value("proxy_registration.token.token")
-                    if not token:
+                    if not self._has_nested_key("proxy_registration.certificate.cert_file"):
+                        self.validation_results.append(ValidationResult(
+                            level="error",
+                            message="Certificate authentication requires cert_file",
+                            section="proxy_registration.certificate",
+                            key="cert_file"
+                        ))
+                    else:
+                        cert_file = self._get_nested_value("proxy_registration.certificate.cert_file")
+                    
+                    if not self._has_nested_key("proxy_registration.certificate.key_file"):
+                        self.validation_results.append(ValidationResult(
+                            level="error",
+                            message="Certificate authentication requires key_file",
+                            section="proxy_registration.certificate",
+                            key="key_file"
+                        ))
+                    else:
+                        key_file = self._get_nested_value("proxy_registration.certificate.key_file")
+                    
+                    if not cert_file or not key_file:
                         self.validation_results.append(ValidationResult(
                             level="error",
-                            message="Token authentication is enabled but token is not specified",
+                            message="Certificate authentication is enabled but certificate files are not specified",
                             section="proxy_registration",
+                            key="certificate"
+                        ))
+                elif auth_method == "token":
+                    if not self._has_nested_key("proxy_registration.token.token"):
+                        self.validation_results.append(ValidationResult(
+                            level="error",
+                            message="Token authentication requires token",
+                            section="proxy_registration.token",
                             key="token"
                         ))
+                    else:
+                        token = self._get_nested_value("proxy_registration.token.token")
+                        if not token:
+                            self.validation_results.append(ValidationResult(
+                                level="error",
+                                message="Token authentication is enabled but token is not specified",
+                                section="proxy_registration",
+                                key="token"
+                            ))
     
     def _validate_ssl_configuration(self) -> None:
         """Validate SSL configuration with detailed certificate validation."""
+        # Only validate SSL if the ssl section exists
+        if not self._has_nested_key("ssl.enabled"):
+            return
+
         ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
         
         if ssl_enabled:
-            cert_file = self._get_nested_value("ssl.cert_file")
-            key_file = self._get_nested_value("ssl.key_file")
-            ca_cert = self._get_nested_value("ssl.ca_cert")
+            if not self._has_nested_key("ssl.cert_file"):
+                self.validation_results.append(ValidationResult(
+                    level="error",
+                    message="SSL is enabled but cert_file is not specified",
+                    section="ssl",
+                    key="cert_file"
+                ))
+            else:
+                cert_file = self._get_nested_value("ssl.cert_file")
+            
+            if not self._has_nested_key("ssl.key_file"):
+                self.validation_results.append(ValidationResult(
+                    level="error",
+                    message="SSL is enabled but key_file is not specified",
+                    section="ssl",
+                    key="key_file"
+                ))
+            else:
+                key_file = self._get_nested_value("ssl.key_file")
+            
+            if not self._has_nested_key("ssl.ca_cert"):
+                self.validation_results.append(ValidationResult(
+                    level="error",
+                    message="SSL is enabled but ca_cert is not specified",
+                    section="ssl",
+                    key="ca_cert"
+                ))
+            else:
+                ca_cert = self._get_nested_value("ssl.ca_cert")
             
             # Check certificate file
             if not cert_file:
@@ -632,21 +704,29 @@ class ConfigValidator:
         roles_enabled = self._get_nested_value_safe("roles.enabled", False)
         
         if roles_enabled:
-            config_file = self._get_nested_value("roles.config_file")
-            if not config_file:
+            if not self._has_nested_key("roles.config_file"):
                 self.validation_results.append(ValidationResult(
                     level="error",
                     message="Roles are enabled but config_file is not specified",
                     section="roles",
                     key="config_file"
                 ))
-            elif not os.path.exists(config_file):
-                self.validation_results.append(ValidationResult(
-                    level="error",
-                    message=f"Roles config file '{config_file}' does not exist",
-                    section="roles",
-                    key="config_file"
-                ))
+            else:
+                config_file = self._get_nested_value("roles.config_file")
+                if not config_file:
+                    self.validation_results.append(ValidationResult(
+                        level="error",
+                        message="Roles are enabled but config_file is not specified",
+                        section="roles",
+                        key="config_file"
+                    ))
+                elif not os.path.exists(config_file):
+                    self.validation_results.append(ValidationResult(
+                        level="error",
+                        message=f"Roles config file '{config_file}' does not exist",
+                        section="roles",
+                        key="config_file"
+                    ))  
     
     def _get_nested_value(self, key: str) -> Any:
         """Get value from nested dictionary using dot notation. Raises exception if key not found."""

mcp_proxy_adapter/examples/generate_config.py

@@ -16,7 +16,7 @@ from typing import Dict, Any, Optional
 # Add the current directory to the path to import config_builder
 sys.path.insert(0, str(Path(__file__).parent))
 
-from config_builder import ConfigBuilder, ConfigFactory, Protocol, AuthMethod
+from config_builder import generate_complete_config
 
 # Import validation modules
 try:
@@ -57,10 +57,8 @@ def create_config_from_flags(
     Returns:
         Configuration dictionary
     """
-    # Use the enhanced config builder
-    from config_builder import create_config_from_flags as enhanced_create_config
-    
-    return enhanced_create_config(protocol, token, roles, port, proxy_registration, proxy_url, auto_registration, server_id)
+    # Use the simple config builder
+    return generate_complete_config(host, port)
 
 
 def save_config(config: Dict[str, Any], filename: str, output_dir: str, validate: bool = True) -> Path:

mcp_proxy_adapter/version.py

@@ -2,4 +2,4 @@
 Version information for MCP Proxy Adapter.
 """
 
-__version__ = "6.9.6"
+__version__ = "6.9.8"

{mcp_proxy_adapter-6.9.6.dist-info → mcp_proxy_adapter-6.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.6
+Version: 6.9.8
 Summary: Powerful JSON-RPC microservices framework with built-in security, authentication, and proxy registration
 Home-page: https://github.com/maverikod/mcp-proxy-adapter
 Author: Vasiliy Zdanovskiy

{mcp_proxy_adapter-6.9.6.dist-info → mcp_proxy_adapter-6.9.8.dist-info}/RECORD

@@ -4,7 +4,7 @@ mcp_proxy_adapter/config.py,sha256=1Ngxri2IPGoytYdCF5pXzbLUXsWcf6qYENkaDkAppg0,2
 mcp_proxy_adapter/custom_openapi.py,sha256=XRviX-C-ZkSKdBhORhDTdeN_1FWyEfXZADiASft3t9I,28149
 mcp_proxy_adapter/main.py,sha256=NFcSW7WaEnimRWe5zj28D0CH9otHlRZ92d2Um6XiGjE,10399
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=lXMkwylTh5HmOpFM0VlvfxrhAnukEZJPdC4EfjVHst4,74
+mcp_proxy_adapter/version.py,sha256=Z-uhPZ5DfWcxa-jqj9qDbTk56I3mm3z8leUL7bJdNmM,74
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=PQ1Ch5ydJIHp3Z6gcMCzKkTsXPQAuZ9weHtQ-EXnNGY,37134
 mcp_proxy_adapter/api/handlers.py,sha256=X-hcMNVeTAu4yVkKJEChEsj2bFptUS6sLNN-Wysjkow,10011
@@ -62,7 +62,7 @@ mcp_proxy_adapter/core/client.py,sha256=qIbPl8prEwK2U65kl-vGJW2_imo1E4i6HxG_VpPe
 mcp_proxy_adapter/core/client_manager.py,sha256=yD8HZJlOwmDbVU49YfzSbh1XZ-Vib8qfcLVAaH03Jdg,8832
 mcp_proxy_adapter/core/client_security.py,sha256=siUaYorcDbpZsEIKgLfg-jBKkp7z_Er8wsO63mDD3Is,13127
 mcp_proxy_adapter/core/config_converter.py,sha256=Wnnsrbw7DxtgDfLG-IyyzK-hkKu0_1yp7-7dW87tu_4,17422
-mcp_proxy_adapter/core/config_validator.py,sha256=AHEh5GZzx4rnZGHUo1ISn74W8-dChDIDB4T7BtDCyuQ,48772
+mcp_proxy_adapter/core/config_validator.py,sha256=Pu9xh1PZ8fkI_SNAQmB1XecU-9kO4lokEJr9iUhOIRw,52677
 mcp_proxy_adapter/core/crl_utils.py,sha256=Jnwq2UN52IoCDZCwByRP3XNMOJexftb-mVaH6zes6Fc,11706
 mcp_proxy_adapter/core/errors.py,sha256=CyhQgvMt0ooQjONa65XRBJ44y-l-E5_ES4KOuRvIpBk,8557
 mcp_proxy_adapter/core/logging.py,sha256=VIpiC6QTGLukRjiJoVpq3VEoLKhUeLNl8IdfljpW6ZU,9654
@@ -95,7 +95,7 @@ mcp_proxy_adapter/examples/create_test_configs.py,sha256=9TrvLa4-bWLPu0SB1JXwWuC
 mcp_proxy_adapter/examples/debug_request_state.py,sha256=Z3Gy2-fWtu7KIV9OkzGDLVz7TpL_h9V_99ica40uQBU,4489
 mcp_proxy_adapter/examples/debug_role_chain.py,sha256=GLVXC2fJUwP8UJnXHchd1t-H53cjWLJI3RqTPrKmaak,8750
 mcp_proxy_adapter/examples/demo_client.py,sha256=en2Rtb70B1sQmhL-vdQ4PDpKNNl_mfll2YCFT_jFCAg,10191
-mcp_proxy_adapter/examples/generate_config.py,sha256=45noGYcZbkFGJNf3Qq5T17bL-PDLh5f9o0UE-dNo0eM,15169
+mcp_proxy_adapter/examples/generate_config.py,sha256=h0_T9gi8ux6xf2nIF56VX1s2YBxLxQVIk3SbhmKsxEg,14977
 mcp_proxy_adapter/examples/proxy_registration_example.py,sha256=vemRhftnjbiOBCJkmtDGqlWQ8syTG0a8755GCOnaQsg,12503
 mcp_proxy_adapter/examples/required_certificates.py,sha256=YW9-V78oFiZ-FmHlGP-8FQFS569VdDVyq9hfvCv31pk,7133
 mcp_proxy_adapter/examples/run_example.py,sha256=yp-a6HIrSk3ddQmbn0KkuKwErId0aNfj028TE6U-zmY,2626
@@ -135,8 +135,8 @@ mcp_proxy_adapter/schemas/base_schema.json,sha256=v9G9cGMd4dRhCZsOQ_FMqOi5VFyVbI
 mcp_proxy_adapter/schemas/openapi_schema.json,sha256=C3yLkwmDsvnLW9B5gnKKdBGl4zxkeU-rEmjTrNVsQU0,8405
 mcp_proxy_adapter/schemas/roles.json,sha256=pgf_ZyqKyXbfGUxvobpiLiSJz9zzxrMuoVWEkEpz3N8,764
 mcp_proxy_adapter/schemas/roles_schema.json,sha256=deHgI7L6GwfBXacOlNtDgDJelDThppClC3Ti4Eh8rJY,5659
-mcp_proxy_adapter-6.9.6.dist-info/METADATA,sha256=_S16zV8mH7L1G5wJT_zhoA_jyxhB_-r0aX2JBpL_Cs8,8510
-mcp_proxy_adapter-6.9.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.6.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.6.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.6.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.8.dist-info/METADATA,sha256=309u-iZSLIck5tPqOQNJbrm2GI1BWBsZ6ZIRdwYz0ts,8510
+mcp_proxy_adapter-6.9.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.8.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.8.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.8.dist-info/RECORD,,