mcp-proxy-adapter 6.9.12__tar.gz → 6.9.14__tar.gz

{mcp_proxy_adapter-6.9.12 → mcp_proxy_adapter-6.9.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.12
+Version: 6.9.14
 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.12 → mcp_proxy_adapter-6.9.14}/mcp_proxy_adapter/core/app_factory.py

@@ -85,10 +85,13 @@ async def create_and_run_server(
             # Validate UUID configuration (mandatory)
             from mcp_proxy_adapter.core.config_validator import ConfigValidator
 
-            validator = ConfigValidator(app_config)
-            if not validator.validate_all():
+            validator = ConfigValidator()
+            validator.config_data = app_config
+            validation_results = validator.validate_config()
+            errors = [r for r in validation_results if r.level == "error"]
+            if errors:
                 print("❌ Configuration validation failed:")
-                for error in validator.get_errors():
+                for error in errors:
                     print(f"   - {error}")
                 sys.exit(1)
             print("✅ Configuration validation passed")
@@ -118,8 +121,8 @@ async def create_and_run_server(
                 print(f"🔍 Debug: No root SSL section after loading")
 
             # Debug: Check app_config immediately after get_all()
-            if app_config and "security" in app_config:
-                ssl_config = app_config["security"].get("ssl", {})
+            if app_config and "ssl" in app_config:
+                ssl_config = app_config["ssl"]
                 print(
                     f"🔍 Debug: app_config after get_all(): SSL enabled={ssl_config.get('enabled', False)}"
                 )
@@ -130,35 +133,56 @@ async def create_and_run_server(
                     f"🔍 Debug: app_config after get_all(): SSL key_file={ssl_config.get('key_file')}"
                 )
 
-            # Debug: Check SSL configuration after loading
-            if app_config and "security" in app_config:
-                ssl_config = app_config["security"].get("ssl", {})
-                print(
-                    f"🔍 Debug: SSL config after loading: enabled={ssl_config.get('enabled', False)}"
-                )
-                print(
-                    f"🔍 Debug: SSL config after loading: cert_file={ssl_config.get('cert_file')}"
-                )
-                print(
-                    f"🔍 Debug: SSL config after loading: key_file={ssl_config.get('key_file')}"
-                )
-
-                # Debug: Check if SSL config is correct
-                if ssl_config.get("enabled", False):
-                    print(f"🔍 Debug: SSL config is enabled and correct")
-                else:
-                    print(f"🔍 Debug: SSL config is disabled or incorrect")
-                    # Try to get SSL config from root level
-                    root_ssl = app_config.get("ssl", {})
-                    print(
-                        f"🔍 Debug: Root SSL config: enabled={root_ssl.get('enabled', False)}"
-                    )
-                    print(
-                        f"🔍 Debug: Root SSL config: cert_file={root_ssl.get('cert_file')}"
+            # CRITICAL: Validate SSL configuration - NO FALLBACKS!
+            if app_config and "ssl" in app_config:
+                ssl_config = app_config["ssl"]
+                ssl_enabled = ssl_config.get('enabled', False)
+                protocol = app_config.get("server", {}).get("protocol", "http")
+                
+                print(f"🔍 Debug: SSL enabled={ssl_enabled}, protocol={protocol}")
+                
+                # CRITICAL CHECK: If SSL is enabled, protocol MUST be https or mtls
+                if ssl_enabled and protocol not in ["https", "mtls"]:
+                    raise ValueError(
+                        f"CRITICAL CONFIG ERROR: SSL is enabled but protocol is '{protocol}'. "
+                        f"Protocol MUST be 'https' or 'mtls' when SSL is enabled. "
+                        f"Fix your configuration file."
                     )
-                    print(
-                        f"🔍 Debug: Root SSL config: key_file={root_ssl.get('key_file')}"
+                
+                # CRITICAL CHECK: If protocol is https/mtls, SSL MUST be enabled
+                if protocol in ["https", "mtls"] and not ssl_enabled:
+                    raise ValueError(
+                        f"CRITICAL CONFIG ERROR: Protocol is '{protocol}' but SSL is disabled. "
+                        f"SSL MUST be enabled when protocol is 'https' or 'mtls'. "
+                        f"Fix your configuration file."
                     )
+                
+                # CRITICAL CHECK: If SSL is enabled, cert and key files MUST exist
+                if ssl_enabled:
+                    cert_file = ssl_config.get('cert_file')
+                    key_file = ssl_config.get('key_file')
+                    
+                    if not cert_file or not key_file:
+                        raise ValueError(
+                            f"CRITICAL CONFIG ERROR: SSL is enabled but cert_file or key_file is missing. "
+                            f"cert_file={cert_file}, key_file={key_file}. "
+                            f"Fix your configuration file."
+                        )
+                    
+                    from pathlib import Path
+                    if not Path(cert_file).exists():
+                        raise ValueError(
+                            f"CRITICAL CONFIG ERROR: SSL certificate file does not exist: {cert_file}. "
+                            f"Fix your configuration file or create the certificate."
+                        )
+                    
+                    if not Path(key_file).exists():
+                        raise ValueError(
+                            f"CRITICAL CONFIG ERROR: SSL key file does not exist: {key_file}. "
+                            f"Fix your configuration file or create the key."
+                        )
+                    
+                    print(f"✅ SSL configuration validated: cert={cert_file}, key={key_file}")
 
             # Validate security framework configuration only if enabled
             security_config = app_config.get("security", {})
@@ -169,7 +193,7 @@ async def create_and_run_server(
                 print(f"🔒 Security framework: {framework}")
 
                 # Debug: Check SSL config before validation
-                ssl_config = security_config.get("ssl", {})
+                ssl_config = app_config.get("ssl", {})
                 print(
                     f"🔍 Debug: SSL config before validation: enabled={ssl_config.get('enabled', False)}"
                 )
@@ -183,7 +207,7 @@ async def create_and_run_server(
                 validation_result = adapter.validate_configuration(app_config)
 
                 # Debug: Check SSL config after validation
-                ssl_config = app_config.get("security", {}).get("ssl", {})
+                ssl_config = app_config.get("ssl", {})
                 print(
                     f"🔍 Debug: SSL config after validation: enabled={ssl_config.get('enabled', False)}"
                 )
@@ -283,6 +307,30 @@ async def create_and_run_server(
         f"🔍 Debug: app_config keys: {list(app_config.keys()) if app_config else 'None'}"
     )
 
+    # Check for SSL config in root ssl section first (new format)
+    if app_config and "ssl" in app_config:
+        ssl_config = app_config["ssl"]
+        print(f"🔍 Debug: SSL config found in root: {ssl_config}")
+        print(f"🔍 Debug: SSL enabled: {ssl_config.get('enabled', False)}")
+        if ssl_config.get("enabled", False):
+            # Add SSL config directly to server_config for Hypercorn
+            server_config["certfile"] = ssl_config.get("cert_file")
+            server_config["keyfile"] = ssl_config.get("key_file")
+            server_config["ca_certs"] = ssl_config.get(
+                "ca_cert_file", ssl_config.get("ca_cert")
+            )
+            # Set verify_mode based on verify_client setting
+            if ssl_config.get("verify_client", False):
+                server_config["verify_mode"] = "CERT_REQUIRED"
+            else:
+                server_config["verify_mode"] = ssl_config.get("verify_mode")
+            print(f"🔒 SSL enabled: {ssl_config.get('cert_file', 'N/A')}")
+            print(
+                f"🔒 SSL enabled: cert={ssl_config.get('cert_file')}, key={ssl_config.get('key_file')}"
+            )
+            print(
+                f"🔒 Server config SSL: certfile={server_config.get('certfile')}, keyfile={server_config.get('keyfile')}, ca_certs={server_config.get('ca_certs')}, verify_mode={server_config.get('verify_mode')}"
+            )
 
     # Check for SSL config in security section (fallback)
     if app_config and "security" in app_config:

{mcp_proxy_adapter-6.9.12 → mcp_proxy_adapter-6.9.14}/mcp_proxy_adapter/core/proxy_registration.py

@@ -335,14 +335,19 @@ class ProxyRegistrationManager:
                 if ssl_config:
                     ca_cert_file = ssl_config.get("ca_cert")
                     verify_mode = ssl_config.get("verify_mode", "CERT_REQUIRED")
+                    verify_ssl = ssl_config.get("verify_ssl", True)
 
                     # Load CA certificate if provided
                     if ca_cert_file:
                         context.load_verify_locations(ca_cert_file)
                         logger.debug(f"Loaded CA certificate: {ca_cert_file}")
 
-                    # Set verification mode based on ssl_config verify_mode
-                    if verify_mode == "CERT_NONE":
+                    # Check if verify_ssl is disabled in ssl_config
+                    if verify_ssl == False:
+                        context.check_hostname = False
+                        context.verify_mode = ssl.CERT_NONE
+                        logger.debug("SSL verification disabled (verify_ssl=False)")
+                    elif verify_mode == "CERT_NONE":
                         context.check_hostname = False
                         context.verify_mode = ssl.CERT_NONE
                         logger.debug("SSL verification disabled (CERT_NONE)")

{mcp_proxy_adapter-6.9.12 → mcp_proxy_adapter-6.9.14}/mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.9.12 → mcp_proxy_adapter-6.9.14}/mcp_proxy_adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.12
+Version: 6.9.14
 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.12 → mcp_proxy_adapter-6.9.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mcp-proxy-adapter"
-version = "6.9.12"
+version = "6.9.14"
 description = "Powerful JSON-RPC microservices framework with built-in security, authentication, and proxy registration"
 readme = "README.md"
 license = {text = "MIT"}