mcp-proxy-adapter 6.3.11__py3-none-any.whl → 6.3.13__py3-none-any.whl

mcp_proxy_adapter/__main__.py

@@ -18,6 +18,7 @@ def main():
     """Main CLI entry point."""
     # Import and run the actual main function from main.py
     from mcp_proxy_adapter.main import main as run_server
+
     run_server()
 
 

mcp_proxy_adapter/core/app_factory.py

@@ -275,7 +275,12 @@ async def create_and_run_server(
             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")
-            server_config["verify_mode"] = ssl_config.get("verify_mode")
+            # Set verify_mode based on verify_client setting
+            verify_client = ssl_config.get("verify_client", False)
+            if verify_client:
+                server_config["verify_mode"] = "CERT_REQUIRED"
+            else:
+                server_config["verify_mode"] = "CERT_NONE"
             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')}"
@@ -315,7 +320,12 @@ async def create_and_run_server(
             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")
-            server_config["verify_mode"] = ssl_config.get("verify_mode")
+            # Set verify_mode based on verify_client setting
+            verify_client = ssl_config.get("verify_client", False)
+            if verify_client:
+                server_config["verify_mode"] = "CERT_REQUIRED"
+            else:
+                server_config["verify_mode"] = "CERT_NONE"
             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')}"
@@ -349,8 +359,14 @@ async def create_and_run_server(
             config_hypercorn.ca_certs = server_config["ca_certs"]
         if "verify_mode" in server_config:
             import ssl
-
-            config_hypercorn.verify_mode = ssl.CERT_REQUIRED
+            # Use the verify_mode from configuration, default to CERT_NONE for simple HTTPS
+            verify_mode = server_config.get("verify_mode", ssl.CERT_NONE)
+            if verify_mode == "CERT_REQUIRED":
+                config_hypercorn.verify_mode = ssl.CERT_REQUIRED
+            elif verify_mode == "CERT_OPTIONAL":
+                config_hypercorn.verify_mode = ssl.CERT_OPTIONAL
+            else:
+                config_hypercorn.verify_mode = ssl.CERT_NONE
 
         # Determine if SSL is enabled
         ssl_enabled = any(key in server_config for key in ["certfile", "keyfile"])

mcp_proxy_adapter/core/client_security.py

@@ -74,7 +74,7 @@ class ClientSecurityManager:
     def _create_ssl_config(self) -> SSLConfig:
         """Create SSL configuration for client connections."""
         ssl_section = self.security_config.get("ssl", {})
-        
+
         # Determine verify_mode based on verify_server setting
         verify_server = ssl_section.get("verify_server", True)
         if verify_server:

mcp_proxy_adapter/core/proxy_registration.py

@@ -147,19 +147,84 @@ class ProxyRegistrationManager:
 
     def _create_ssl_context(self) -> Optional[ssl.SSLContext]:
         """
-        Create SSL context for secure connections.
+        Create SSL context for secure connections using registration SSL configuration.
 
         Returns:
             SSL context or None if SSL not needed
         """
+        logger.debug("_create_ssl_context called")
         if not self.client_security:
+            logger.debug("SSL context creation failed: client_security is None")
             return None
 
         try:
             # Check if SSL is enabled for registration
             cert_config = self.registration_config.get("certificate", {})
-            if cert_config.get("enabled", False):
-                return self.client_security.create_client_ssl_context()
+            ssl_config = self.registration_config.get("ssl", {})
+
+            logger.debug(
+                f"SSL context creation: cert_config={cert_config}, ssl_config={ssl_config}"
+            )
+
+            # SSL is enabled if certificate config exists or SSL config exists
+            if cert_config or ssl_config:
+                # Create a custom SSL context based on registration configuration
+                context = ssl.create_default_context()
+
+                # Load client certificates if provided
+                if cert_config:
+                    cert_file = cert_config.get("cert_file")
+                    key_file = cert_config.get("key_file")
+
+                    if cert_file and key_file:
+                        context.load_cert_chain(cert_file, key_file)
+                        logger.debug(
+                            f"Loaded client certificates: {cert_file}, {key_file}"
+                        )
+
+                # Configure SSL verification based on registration settings
+                if ssl_config:
+                    ca_cert_file = ssl_config.get("ca_cert")
+                    verify_mode = ssl_config.get("verify_mode", "CERT_REQUIRED")
+
+                    # 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":
+                        context.check_hostname = False
+                        context.verify_mode = ssl.CERT_NONE
+                        logger.debug("SSL verification disabled (CERT_NONE)")
+                    elif verify_mode == "CERT_REQUIRED":
+                        context.check_hostname = True
+                        context.verify_mode = ssl.CERT_REQUIRED
+                        logger.debug("SSL verification enabled (CERT_REQUIRED)")
+                    else:
+                        # Default to CERT_REQUIRED
+                        context.check_hostname = True
+                        context.verify_mode = ssl.CERT_REQUIRED
+                        logger.debug("SSL verification enabled (default)")
+                else:
+                    # Check certificate config for verify_server setting
+                    verify_server = cert_config.get("verify_server", True)
+                    if not verify_server:
+                        context.check_hostname = False
+                        context.verify_mode = ssl.CERT_NONE
+                        logger.debug("SSL verification disabled (verify_server: false)")
+                    else:
+                        # Default SSL context if no specific SSL config
+                        context.check_hostname = True
+                        context.verify_mode = ssl.CERT_REQUIRED
+                        logger.debug("Using default SSL verification")
+
+                logger.info("Created custom SSL context for proxy registration")
+                return context
+            else:
+                logger.debug(
+                    "SSL context creation skipped: no cert_config or ssl_config"
+                )
 
             return None
         except Exception as e:

mcp_proxy_adapter/examples/basic_framework/main.py

@@ -11,7 +11,7 @@ import argparse
 from pathlib import Path
 
 # Add the framework to the path
-sys.path.insert(0, str(Path(__file__).parent.parent.parent))
+sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent))
 from mcp_proxy_adapter.core.app_factory import create_and_run_server
 
 
@@ -37,14 +37,15 @@ def main():
     print(f"📋 Configuration: {args.config}")
     print("=" * 50)
     # Use the factory method to create and run the server
-    create_and_run_server(
+    import asyncio
+    asyncio.run(create_and_run_server(
         config_path=args.config,
         title="Basic Framework Example",
         description="Basic MCP Proxy Adapter with minimal configuration",
         version="1.0.0",
         host=config_overrides.get("host", "0.0.0.0"),
         log_level="debug" if config_overrides.get("debug", False) else "info",
-    )
+    ))
 
 
 if __name__ == "__main__":

mcp_proxy_adapter/examples/full_application/main.py

@@ -16,7 +16,7 @@ import logging
 from pathlib import Path
 
 # Add the framework to the path
-sys.path.insert(0, str(Path(__file__).parent.parent.parent))
+sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent))
 from mcp_proxy_adapter.core.app_factory import create_and_run_server
 from mcp_proxy_adapter.api.app import create_app
 from mcp_proxy_adapter.config import Config