mcp-proxy-adapter 6.1.0__py3-none-any.whl → 6.2.0__py3-none-any.whl

mcp_proxy_adapter/main.py

@@ -1,185 +1,75 @@
 #!/usr/bin/env python3
 """
-Main entry point for MCP Proxy Adapter.
+MCP Proxy Adapter - Main Entry Point
 
-This module provides the main function for running the MCP Proxy Adapter server.
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
 """
 
-import argparse
-import asyncio
-import uvicorn
 import sys
-import os
+import hypercorn.asyncio
+import hypercorn.config
+import asyncio
 from pathlib import Path
 
-from mcp_proxy_adapter import create_app
-from mcp_proxy_adapter.core.logging import get_logger, setup_logging
-from mcp_proxy_adapter.core.settings import (
-    Settings, 
-    get_server_host, 
-    get_server_port, 
-    get_server_debug,
-    get_setting
-)
-from mcp_proxy_adapter.core.ssl_utils import SSLUtils
+# Add the project root to the path
+sys.path.insert(0, str(Path(__file__).parent.parent))
 
-
-def parse_args():
-    """Parse command line arguments."""
-    parser = argparse.ArgumentParser(description="MCP Proxy Adapter Server")
-    parser.add_argument(
-        "--config", 
-        type=str, 
-        default=None,
-        help="Path to configuration file"
-    )
-    parser.add_argument(
-        "--host",
-        type=str,
-        default=None,
-        help="Host to bind to (overrides config)"
-    )
-    parser.add_argument(
-        "--port",
-        type=int,
-        default=None,
-        help="Port to bind to (overrides config)"
-    )
-    parser.add_argument(
-        "--debug",
-        action="store_true",
-        help="Enable debug mode (overrides config)"
-    )
-    parser.add_argument(
-        "--log-level",
-        type=str,
-        default=None,
-        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
-        help="Log level (overrides config)"
-    )
-    return parser.parse_args()
+from mcp_proxy_adapter.api.app import create_app
+from mcp_proxy_adapter.config import Config
 
 
 def main():
-    """Run the MCP Proxy Adapter server."""
-    args = parse_args()
-    
-    # Load configuration if specified
-    if args.config:
-        config_path = Path(args.config)
-        if config_path.exists():
-            from mcp_proxy_adapter.config import config
-            config.load_from_file(str(config_path))
-            print(f"✅ Loaded configuration from: {config_path}")
-        else:
-            print(f"❌ Configuration file not found: {config_path}")
-            sys.exit(1)
-    else:
-        print("⚠️  No configuration file specified, using defaults")
-    
-    # Setup logging with configuration
-    setup_logging()
-    logger = get_logger("mcp_proxy_adapter")
-    
-    # Get settings from configuration
-    server_settings = Settings.get_server_settings()
-    logging_settings = Settings.get_logging_settings()
-    commands_settings = Settings.get_commands_settings()
-    ssl_settings = Settings.get_custom_setting("ssl", {})
-    security_settings = Settings.get_custom_setting("security", {})
+    """Main entry point for the MCP Proxy Adapter."""
+    # Load configuration
+    config = Config()
     
-    # STRICT CONFIGURATION VALIDATION
-    from mcp_proxy_adapter.core.config_validator import ConfigValidator
+    # Create application
+    app = create_app(app_config=config)
     
-    # Get full config for validation
-    full_config = {
-        "server": server_settings,
-        "logging": logging_settings,
-        "commands": commands_settings,
-        "ssl": ssl_settings,
-        "security": security_settings,
-        "auth_enabled": Settings.get_custom_setting("auth_enabled", False),
-        "roles": Settings.get_custom_setting("roles", {})
-    }
+    # Get server configuration
+    host = config.get("server.host", "0.0.0.0")
+    port = config.get("server.port", 8000)
     
-    # Validate configuration
-    validator = ConfigValidator(full_config)
-    if not validator.validate_all():
-        logger.critical("CRITICAL SECURITY ERROR: Configuration validation failed")
-        validator.print_validation_report()
-        logger.critical("Server startup blocked for security reasons.")
-        logger.critical("Please fix configuration errors or disable security features.")
-        sys.exit(1)
+    # Get SSL configuration
+    ssl_enabled = config.get("ssl.enabled", False)
+    ssl_cert_file = config.get("ssl.cert_file")
+    ssl_key_file = config.get("ssl.key_file")
+    ssl_ca_cert = config.get("ssl.ca_cert")
+    verify_client = config.get("ssl.verify_client", False)
     
-    logger.info("Configuration validation passed")
+    print(f"🚀 Starting MCP Proxy Adapter")
+    print(f"🌐 Server: {host}:{port}")
+    if ssl_enabled:
+        print(f"🔐 SSL: Enabled")
+        print(f"   Certificate: {ssl_cert_file}")
+        print(f"   Key: {ssl_key_file}")
+        if ssl_ca_cert:
+            print(f"   CA: {ssl_ca_cert}")
+        print(f"   Client verification: {verify_client}")
+    print("=" * 50)
     
-    # Load commands
-    from mcp_proxy_adapter.commands.command_registry import registry
-    import asyncio
+    # Configure hypercorn
+    config_hypercorn = hypercorn.config.Config()
+    config_hypercorn.bind = [f"{host}:{port}"]
     
-    # Reload system to load all commands
-    reload_result = asyncio.run(registry.reload_system())
-    logger.info(f"Commands loaded: {reload_result}")
-    
-    # Override settings with command line arguments
-    if args.host:
-        server_settings['host'] = args.host
-    if args.port:
-        server_settings['port'] = args.port
-    if args.debug:
-        server_settings['debug'] = True
-    if args.log_level:
-        logging_settings['level'] = args.log_level
-        server_settings['log_level'] = args.log_level
-    
-    # Print server header and description
-    print("=" * 80)
-    print("🚀 MCP PROXY ADAPTER SERVER")
-    print("=" * 80)
-    print("📋 Configuration:")
-    print(f"   • Server: {server_settings['host']}:{server_settings['port']}")
-    print(f"   • Debug: {server_settings['debug']}")
-    print(f"   • Log Level: {logging_settings['level']}")
-    print(f"   • Auto Discovery: {commands_settings['auto_discovery']}")
-    print(f"   • SSL Enabled: {ssl_settings.get('enabled', False)}")
-    print(f"   • Security Enabled: {security_settings.get('enabled', False)}")
-    if ssl_settings.get('enabled', False):
-        print(f"   • SSL Mode: {ssl_settings.get('mode', 'https_only')}")
-    if security_settings.get('enabled', False):
-        print(f"   • Security Framework: {security_settings.get('framework', 'built-in')}")
-    print("=" * 80)
-    print()
-    
-    logger.info("Starting MCP Proxy Adapter Server...")
-    logger.info(f"Server configuration: {server_settings}")
-    logger.info(f"Security configuration: {security_settings}")
-    
-    try:
-        # Create application
-        app = create_app(
-            title="MCP Proxy Adapter Server",
-            description="Model Context Protocol Proxy Adapter with Security Framework",
-            version="1.0.0"
-        )
+    if ssl_enabled and ssl_cert_file and ssl_key_file:
+        config_hypercorn.certfile = ssl_cert_file
+        config_hypercorn.keyfile = ssl_key_file
         
-        # Create unified server configuration
-        server_config = {
-            "host": server_settings['host'],
-            "port": server_settings['port'],
-            "log_level": server_settings.get('log_level', 'info'),
-            "ssl": ssl_settings
-        }
+        if ssl_ca_cert:
+            config_hypercorn.ca_certs = ssl_ca_cert
         
-        # Use unified server runner
-        from mcp_proxy_adapter.core.server_adapter import UnifiedServerRunner
-        server_runner = UnifiedServerRunner()
+        if verify_client:
+            import ssl
+            config_hypercorn.verify_mode = ssl.CERT_REQUIRED
         
-        # Run the server with optimal engine selection
-        server_runner.run_server(app, server_config)
-        
-    except Exception as e:
-        logger.error(f"Failed to start server: {e}")
-        sys.exit(1)
+        print(f"🔐 Starting HTTPS server with hypercorn...")
+    else:
+        print(f"🌐 Starting HTTP server with hypercorn...")
+    
+    # Run the server
+    asyncio.run(hypercorn.asyncio.serve(app, config_hypercorn))
 
 
 if __name__ == "__main__":

mcp_proxy_adapter/utils/config_generator.py

@@ -294,8 +294,12 @@ class ConfigGenerator:
             return self._get_https_config(base_config)
         elif config_type == "https_token":
             return self._get_https_token_config(base_config)
+        elif config_type == "https_no_protocol_middleware":
+            return self._get_https_no_protocol_middleware_config(base_config)
         elif config_type == "mtls":
             return self._get_mtls_config(base_config)
+        elif config_type == "mtls_no_protocol_middleware":
+            return self._get_mtls_no_protocol_middleware_config(base_config)
         else:  # full
             return base_config
     
@@ -329,6 +333,8 @@ class ConfigGenerator:
         config["security"]["auth"]["enabled"] = False
         config["security"]["permissions"]["enabled"] = False
         config["security"]["permissions"]["roles_file"] = None
+        config["protocols"]["enabled"] = True
+        config["protocols"]["allowed_protocols"] = ["http"]
         config["protocols"]["default_protocol"] = "http"
         
         return config
@@ -357,6 +363,8 @@ class ConfigGenerator:
         }
         config["security"]["permissions"]["enabled"] = True
         config["security"]["permissions"]["roles_file"] = "mcp_proxy_adapter/examples/server_configs/roles.json"
+        config["protocols"]["enabled"] = True
+        config["protocols"]["allowed_protocols"] = ["http"]
         config["protocols"]["default_protocol"] = "http"
         
         return config
@@ -380,6 +388,8 @@ class ConfigGenerator:
         config["security"]["auth"]["enabled"] = False
         config["security"]["permissions"]["enabled"] = False
         config["security"]["permissions"]["roles_file"] = None
+        config["protocols"]["enabled"] = True
+        config["protocols"]["allowed_protocols"] = ["http", "https"]
         config["protocols"]["default_protocol"] = "https"
         
         return config
@@ -416,6 +426,8 @@ class ConfigGenerator:
         }
         config["security"]["permissions"]["enabled"] = True
         config["security"]["permissions"]["roles_file"] = "mcp_proxy_adapter/examples/server_configs/roles.json"
+        config["protocols"]["enabled"] = True
+        config["protocols"]["allowed_protocols"] = ["http", "https"]
         config["protocols"]["default_protocol"] = "https"
         
         return config
@@ -446,10 +458,78 @@ class ConfigGenerator:
         config["security"]["auth"]["certificate_auth"] = True
         config["security"]["permissions"]["enabled"] = True
         config["security"]["permissions"]["roles_file"] = "mcp_proxy_adapter/examples/server_configs/roles.json"
+        config["protocols"]["enabled"] = True
+        config["protocols"]["allowed_protocols"] = ["https", "mtls"]
         config["protocols"]["default_protocol"] = "https"
         
         return config
     
+    def _get_https_no_protocol_middleware_config(self, base_config: Dict[str, Any]) -> Dict[str, Any]:
+        """Get HTTPS configuration without ProtocolMiddleware."""
+        config = base_config.copy()
+        
+        # HTTPS settings
+        config["server"]["port"] = 8445
+        config["ssl"]["enabled"] = True
+        config["ssl"]["cert_file"] = "mcp_proxy_adapter/examples/certs/server_cert.pem"
+        config["ssl"]["key_file"] = "mcp_proxy_adapter/examples/certs/server_key.pem"
+        config["ssl"]["ca_cert"] = "mcp_proxy_adapter/examples/certs/ca_cert.pem"
+        
+        config["security"]["ssl"]["enabled"] = True
+        config["security"]["ssl"]["cert_file"] = "mcp_proxy_adapter/examples/certs/server_cert.pem"
+        config["security"]["ssl"]["key_file"] = "mcp_proxy_adapter/examples/certs/server_key.pem"
+        config["security"]["ssl"]["ca_cert_file"] = "mcp_proxy_adapter/examples/certs/ca_cert.pem"
+        
+        config["security"]["auth"]["enabled"] = True
+        config["security"]["auth"]["methods"] = ["api_key"]
+        config["security"]["auth"]["api_keys"] = {
+            "test-token-123": {
+                "roles": ["admin"],
+                "permissions": ["*"],
+                "expires": None
+            },
+            "user-token-456": {
+                "roles": ["user"],
+                "permissions": ["read", "execute"],
+                "expires": None
+            }
+        }
+        config["security"]["permissions"]["enabled"] = True
+        config["security"]["permissions"]["roles_file"] = "mcp_proxy_adapter/examples/server_configs/roles.json"
+        config["protocols"]["enabled"] = False  # Disable ProtocolMiddleware
+        
+        return config
+    
+    def _get_mtls_no_protocol_middleware_config(self, base_config: Dict[str, Any]) -> Dict[str, Any]:
+        """Get mTLS configuration without ProtocolMiddleware."""
+        config = base_config.copy()
+        
+        # mTLS settings
+        config["server"]["port"] = 8447
+        config["ssl"]["enabled"] = True
+        config["ssl"]["cert_file"] = "mcp_proxy_adapter/examples/certs/server_cert.pem"
+        config["ssl"]["key_file"] = "mcp_proxy_adapter/examples/certs/server_key.pem"
+        config["ssl"]["ca_cert"] = "mcp_proxy_adapter/examples/certs/ca_cert.pem"
+        config["ssl"]["verify_client"] = True
+        config["ssl"]["client_cert_required"] = True
+        
+        config["security"]["ssl"]["enabled"] = True
+        config["security"]["ssl"]["cert_file"] = "mcp_proxy_adapter/examples/certs/server_cert.pem"
+        config["security"]["ssl"]["key_file"] = "mcp_proxy_adapter/examples/certs/server_key.pem"
+        config["security"]["ssl"]["ca_cert_file"] = "mcp_proxy_adapter/examples/certs/ca_cert.pem"
+        config["security"]["ssl"]["client_cert_file"] = "mcp_proxy_adapter/examples/certs/client_cert.pem"
+        config["security"]["ssl"]["client_key_file"] = "mcp_proxy_adapter/examples/certs/client_key.pem"
+        config["security"]["ssl"]["verify_mode"] = "CERT_REQUIRED"
+        
+        config["security"]["auth"]["enabled"] = True
+        config["security"]["auth"]["methods"] = ["certificate"]
+        config["security"]["auth"]["certificate_auth"] = True
+        config["security"]["permissions"]["enabled"] = True
+        config["security"]["permissions"]["roles_file"] = "mcp_proxy_adapter/examples/server_configs/roles.json"
+        config["protocols"]["enabled"] = False  # Disable ProtocolMiddleware
+        
+        return config
+    
     def _get_secure_config(self, base_config: Dict[str, Any]) -> Dict[str, Any]:
         """Get secure configuration with all security features enabled."""
         config = base_config.copy()
@@ -561,6 +641,12 @@ class ConfigGenerator:
         elif config_type == "mtls":
             base_comments["ssl"] = "SSL/TLS configuration (enabled for mTLS with client certificate verification)"
             base_comments["security"] = "Security framework configuration (mTLS mode with certificate authentication)"
+        elif config_type == "https_no_protocol_middleware":
+            base_comments["ssl"] = "SSL/TLS configuration (enabled for HTTPS without ProtocolMiddleware)"
+            base_comments["security"] = "Security framework configuration (HTTPS mode without ProtocolMiddleware)"
+        elif config_type == "mtls_no_protocol_middleware":
+            base_comments["ssl"] = "SSL/TLS configuration (enabled for mTLS without ProtocolMiddleware)"
+            base_comments["security"] = "Security framework configuration (mTLS mode without ProtocolMiddleware)"
         
         return base_comments
     
@@ -599,7 +685,8 @@ class ConfigGenerator:
         """
         config_types = [
             "minimal", "development", "secure", "full",
-            "basic_http", "http_token", "https", "https_token", "mtls"
+            "basic_http", "http_token", "https", "https_token", "mtls",
+            "https_no_protocol_middleware", "mtls_no_protocol_middleware"
         ]
         
         for config_type in config_types:
@@ -616,7 +703,8 @@ def main():
     parser = argparse.ArgumentParser(description="Generate MCP Proxy Adapter configuration files")
     parser.add_argument("--type", 
                        choices=["minimal", "development", "secure", "full", 
-                               "basic_http", "http_token", "https", "https_token", "mtls"], 
+                               "basic_http", "http_token", "https", "https_token", "mtls",
+                               "https_no_protocol_middleware", "mtls_no_protocol_middleware"], 
                        default="full", help="Configuration type to generate")
     parser.add_argument("--output", default="./config.json", 
                        help="Output file path")

mcp_proxy_adapter/version.py

@@ -1,4 +1,6 @@
-"""Version information for MCP Microservice."""
+"""
+Version information for MCP Proxy Adapter.
+"""
 
-__version__ = "6.1.0"
+__version__ = "6.2.0"