mcp-proxy-adapter 6.9.8__py3-none-any.whl → 6.9.11__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):
@@ -607,6 +653,11 @@ class ConfigValidator:
     
     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
@@ -800,7 +851,7 @@ class ConfigValidator:
             
             # Check certificate expiration
             now = datetime.now(timezone.utc)
-            not_after = cert.not_valid_after.replace(tzinfo=timezone.utc)
+            not_after = cert.not_valid_after_utc
             
             if now > not_after:
                 self.validation_results.append(ValidationResult(
@@ -1062,7 +1113,7 @@ class ConfigValidator:
                 level="error",
                 message=f"Error validating certificate-key pair: {e}",
                 section=section,
-                key=key
+                key="cert_file"
             ))
     
     def _validate_certificate_chain(self, cert_file: str, ca_cert_file: str, section: str) -> None:

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/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.8
+Version: 6.9.11
 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.8.dist-info → mcp_proxy_adapter-6.9.11.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=Z-uhPZ5DfWcxa-jqj9qDbTk56I3mm3z8leUL7bJdNmM,74
+mcp_proxy_adapter/version.py,sha256=Wf-SxC1SZTUNwNpQ8kiOi8cpyG0lkn-RnVMho_BiR7w,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=Pu9xh1PZ8fkI_SNAQmB1XecU-9kO4lokEJr9iUhOIRw,52677
+mcp_proxy_adapter/core/config_validator.py,sha256=B5Tu8nE_iSvB1jFJ6qseOZrUpd0QoK7phU9Sznv1HDI,54858
 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,7 +89,7 @@ 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
@@ -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.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,,
+mcp_proxy_adapter-6.9.11.dist-info/METADATA,sha256=x3eD4b9tIDjDfCFD04NRgBITZ9czwOMV2OEh8JTCW_s,8511
+mcp_proxy_adapter-6.9.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.11.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.11.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.11.dist-info/RECORD,,