mcp-proxy-adapter 6.9.7__py3-none-any.whl → 6.9.10__py3-none-any.whl

mcp_proxy_adapter/api/app.py

@@ -388,18 +388,19 @@ def create_app(
     try:
         from mcp_proxy_adapter.core.config_validator import ConfigValidator
 
-        try:
-            _validator = ConfigValidator()
-        except TypeError:
-            _validator = ConfigValidator(current_config)
-        _validation = _validator.validate(current_config)
-        if not _validation.is_valid:
+        _validator = ConfigValidator()
+        _validator.config_data = current_config
+        _validation_results = _validator.validate_config()
+        errors = [r for r in _validation_results if r.level == "error"]
+        warnings = [r for r in _validation_results if r.level == "warning"]
+        
+        if errors:
             logger.critical("CRITICAL CONFIG ERROR: Invalid configuration at startup:")
-            for _e in _validation.errors:
-                logger.critical(f"  - {_e}")
+            for _e in errors:
+                logger.critical(f"  - {_e.message}")
             raise SystemExit(1)
-        for _w in _validation.warnings:
-            logger.warning(f"Config warning: {_w}")
+        for _w in warnings:
+            logger.warning(f"Config warning: {_w.message}")
     except Exception as _ex:
         logger.error(f"Failed to run startup configuration validation: {_ex}")
 

mcp_proxy_adapter/core/config_validator.py

@@ -312,9 +312,15 @@ class ConfigValidator:
                             ))
         
         # Check conditional sections based on feature flags
+        protocol = self._get_nested_value_safe("server.protocol", "http")
+        
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
             
+            # Skip SSL validation for HTTP protocol
+            if feature_name in ["ssl", "transport_ssl"] and protocol not in ["https", "mtls"]:
+                continue
+            
             # Only check if the enabled key exists in the configuration
             if not self._has_nested_key(enabled_key):
                 continue
@@ -365,9 +371,15 @@ class ConfigValidator:
     
     def _validate_feature_flags(self) -> None:
         """Validate feature flags and their dependencies."""
+        protocol = self._get_nested_value_safe("server.protocol", "http")
+        
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
             
+            # Skip SSL validation for HTTP protocol
+            if feature_name in ["ssl", "transport_ssl"] and protocol not in ["https", "mtls"]:
+                continue
+            
             # Check if the enabled key exists in the configuration
             if not self._has_nested_key(enabled_key):
                 # Skip validation if the feature flag key doesn't exist
@@ -415,6 +427,26 @@ class ConfigValidator:
         """Validate protocol-specific requirements."""
         protocol = self._get_nested_value_safe("server.protocol", "http")
         
+        # Check mTLS protocol requirements
+        if protocol == "mtls":
+            # mTLS requires HTTPS protocol
+            if not self._has_nested_key("ssl.enabled"):
+                self.validation_results.append(ValidationResult(
+                    level="error",
+                    message="mTLS protocol requires SSL configuration",
+                    section="ssl",
+                    key="enabled"
+                ))
+            else:
+                ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
+                if not ssl_enabled:
+                    self.validation_results.append(ValidationResult(
+                        level="error",
+                        message="mTLS protocol requires SSL to be enabled",
+                        section="ssl",
+                        key="enabled"
+                    ))
+        
         if protocol not in self.protocol_requirements:
             self.validation_results.append(ValidationResult(
                 level="error",
@@ -471,23 +503,37 @@ class ConfigValidator:
     
     def _validate_file_existence(self) -> None:
         """Validate that all referenced files exist."""
+        protocol = self._get_nested_value_safe("server.protocol", "http")
+        
         file_keys = [
             "logging.log_dir",
             "commands.commands_directory",
             "commands.catalog_directory",
             "commands.custom_commands_path",
             "security.roles_file",
-            "roles.config_file",
-            "ssl.cert_file",
-            "ssl.key_file",
-            "ssl.ca_cert",
-            "transport.ssl.cert_file",
-            "transport.ssl.key_file",
-            "transport.ssl.ca_cert",
-            "proxy_registration.certificate.cert_file",
-            "proxy_registration.certificate.key_file"
+            "roles.config_file"
         ]
         
+        # Only add SSL-related files if protocol requires SSL
+        if protocol in ["https", "mtls"]:
+            file_keys.extend([
+                "ssl.cert_file",
+                "ssl.key_file",
+                "ssl.ca_cert",
+                "transport.ssl.cert_file",
+                "transport.ssl.key_file",
+                "transport.ssl.ca_cert"
+            ])
+        
+        # Only add proxy registration files if proxy registration is enabled
+        if self._has_nested_key("proxy_registration.enabled"):
+            proxy_enabled = self._get_nested_value_safe("proxy_registration.enabled", False)
+            if proxy_enabled:
+                file_keys.extend([
+                    "proxy_registration.certificate.cert_file",
+                    "proxy_registration.certificate.key_file"
+                ])
+        
         for file_key in file_keys:
             file_path = self._get_nested_value(file_key)
             if file_path and not os.path.exists(file_path):
@@ -539,40 +585,79 @@ 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 protocol requires it
+        protocol = self._get_nested_value_safe("server.protocol", "http")
+        if protocol not in ["https", "mtls"]:
+            return
+
         # Only validate SSL if the ssl section exists
         if not self._has_nested_key("ssl.enabled"):
             return
@@ -580,9 +665,35 @@ class ConfigValidator:
         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:
@@ -644,21 +755,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/config_builder.py

@@ -82,6 +82,12 @@ def generate_complete_config(host: str = "0.0.0.0", port: int = 8000) -> Dict[st
             "enabled": False,
             "level": "WARNING"
         },
+        "ssl": {
+            "enabled": False,
+            "cert_file": None,
+            "key_file": None,
+            "ca_cert": None
+        },
         "security": {
             "enabled": False,
             "tokens": {},

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.7"
+__version__ = "6.9.10"

{mcp_proxy_adapter-6.9.7.dist-info → mcp_proxy_adapter-6.9.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.7
+Version: 6.9.10
 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.7.dist-info → mcp_proxy_adapter-6.9.10.dist-info}/RECORD

@@ -4,9 +4,9 @@ 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=e_sPEsKJLZMvetzVlFPS_CvyEGxkD-vhanbfb-2ii1o,74
+mcp_proxy_adapter/version.py,sha256=sjeaOBDaenC5mbWV1ZBeLLxJEySM3gA0p4Tc6DWCGzU,75
 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/app.py,sha256=La7xt02j4Zbg4sSc1iL72DM3UNFVddPlN4_xpaRauVo,37214
 mcp_proxy_adapter/api/handlers.py,sha256=X-hcMNVeTAu4yVkKJEChEsj2bFptUS6sLNN-Wysjkow,10011
 mcp_proxy_adapter/api/schemas.py,sha256=mevUvQnYgWQfkJAs3-vq3HalBzh6-Saa-Au1VVf0peE,12377
 mcp_proxy_adapter/api/tool_integration.py,sha256=AeUyvJVN-c3FrX5fHdagHL51saRH5d1ZKqc2YEx0rTE,10147
@@ -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=Jiu3rJ9eJyEUBNsZ88jVQ-cj_Hd5BxhlBbWtyG6QAsA,49313
+mcp_proxy_adapter/core/config_validator.py,sha256=GmzXu7HfPerIwRHuTuELyavAwqUFD2ws_Km2Z2oNOfs,54875
 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
@@ -89,13 +89,13 @@ mcp_proxy_adapter/examples/__init__.py,sha256=k1F-EotAFbJ3JvK_rNgiH4bUztmxIWtYn0
 mcp_proxy_adapter/examples/bugfix_certificate_config.py,sha256=YGBE_SI6wYZUJLWl7-fP1OWXiSH4mHJAZHApgQWvG7s,10529
 mcp_proxy_adapter/examples/cert_manager_bugfix.py,sha256=UWUwItjqHqSnOMHocsz40_3deoZE8-vdROLW9y2fEns,7259
 mcp_proxy_adapter/examples/check_config.py,sha256=oDP3cymq76TqEpPztPihH-_sBktiEb2cG0MdVrY1Sj8,14104
-mcp_proxy_adapter/examples/config_builder.py,sha256=1Q84iq2JH6QTyHMUaykjTrdub6-P4jnMcLxfrVkbLSA,6831
+mcp_proxy_adapter/examples/config_builder.py,sha256=z0I5d83kdNVaR1ATaeT_P4jmxBiIcovlNu7-9I6zgcQ,6978
 mcp_proxy_adapter/examples/config_cli.py,sha256=ZhVG6XEpTFe5-MzELByVsUh0AD4bHPBZeoXnGWbqifs,11059
 mcp_proxy_adapter/examples/create_test_configs.py,sha256=9TrvLa4-bWLPu0SB1JXwWuCsjj-4Vz3yAdowcHtCSSA,8228
 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.7.dist-info/METADATA,sha256=jPv79sUiL5LIIc9uoDBw4i994eFASaTpiJXisdAGz0g,8510
-mcp_proxy_adapter-6.9.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.7.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.7.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.7.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.10.dist-info/METADATA,sha256=h4we7LJB-fUzy2mHfbzo0uJz0Ihc0O10dmVrmYcCxYQ,8511
+mcp_proxy_adapter-6.9.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.10.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.10.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.10.dist-info/RECORD,,