mcp-proxy-adapter 2.0.1__py3-none-any.whl → 6.9.50__py3-none-any.whl

mcp_proxy_adapter/cli/commands/config_generate.py

@@ -0,0 +1,105 @@
+"""
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
+
+CLI command: config generate (Simple configuration generator)
+"""
+
+from __future__ import annotations
+
+import argparse
+import sys
+from argparse import Namespace
+
+from mcp_proxy_adapter.core.config.simple_config_generator import SimpleConfigGenerator
+
+
+def config_generate_command(args: Namespace) -> int:
+    generator = SimpleConfigGenerator()
+    out = generator.generate(
+        protocol=args.protocol,
+        with_proxy=args.with_proxy,
+        out_path=args.out,
+        # Server parameters
+        server_host=getattr(args, "server_host", None),
+        server_port=getattr(args, "server_port", None),
+        server_cert_file=getattr(args, "server_cert_file", None),
+        server_key_file=getattr(args, "server_key_file", None),
+        server_ca_cert_file=getattr(args, "server_ca_cert_file", None),
+        server_crl_file=getattr(args, "server_crl_file", None),
+        # Client parameters
+        client_enabled=getattr(args, "client_enabled", False),
+        client_protocol=getattr(args, "client_protocol", None),
+        client_cert_file=getattr(args, "client_cert_file", None),
+        client_key_file=getattr(args, "client_key_file", None),
+        client_ca_cert_file=getattr(args, "client_ca_cert_file", None),
+        client_crl_file=getattr(args, "client_crl_file", None),
+        # Registration parameters
+        registration_host=getattr(args, "registration_host", None),
+        registration_port=getattr(args, "registration_port", None),
+        registration_protocol=getattr(args, "registration_protocol", None),
+        registration_cert_file=getattr(args, "registration_cert_file", None),
+        registration_key_file=getattr(args, "registration_key_file", None),
+        registration_ca_cert_file=getattr(args, "registration_ca_cert_file", None),
+        registration_crl_file=getattr(args, "registration_crl_file", None),
+    )
+    print(f"✅ Configuration generated: {out}")
+    return 0
+
+
+def main() -> int:
+    """Main entry point for adapter-cfg-gen CLI command."""
+    parser = argparse.ArgumentParser(
+        prog="adapter-cfg-gen",
+        description="Generate simple configuration file for MCP Proxy Adapter"
+    )
+    parser.add_argument(
+        '--protocol',
+        required=True,
+        choices=['http', 'https', 'mtls'],
+        help='Server/proxy protocol'
+    )
+    parser.add_argument(
+        '--with-proxy',
+        action='store_true',
+        help='Enable proxy registration (deprecated, use --registration-* parameters)'
+    )
+    parser.add_argument(
+        '--out',
+        default='config.json',
+        help='Output config path (default: config.json)'
+    )
+    
+    # Server parameters
+    parser.add_argument('--server-host', help='Server host (default: 0.0.0.0)')
+    parser.add_argument('--server-port', type=int, help='Server port (default: 8080)')
+    parser.add_argument('--server-cert-file', help='Server certificate file path')
+    parser.add_argument('--server-key-file', help='Server key file path')
+    parser.add_argument('--server-ca-cert-file', help='Server CA certificate file path')
+    parser.add_argument('--server-crl-file', help='Server CRL file path')
+    
+    # Client parameters
+    parser.add_argument('--client-enabled', action='store_true', help='Enable client configuration')
+    parser.add_argument('--client-protocol', choices=['http', 'https', 'mtls'], help='Client protocol')
+    parser.add_argument('--client-cert-file', help='Client certificate file path')
+    parser.add_argument('--client-key-file', help='Client key file path')
+    parser.add_argument('--client-ca-cert-file', help='Client CA certificate file path')
+    parser.add_argument('--client-crl-file', help='Client CRL file path')
+    
+    # Registration parameters
+    parser.add_argument('--registration-host', help='Registration proxy host (default: localhost)')
+    parser.add_argument('--registration-port', type=int, help='Registration proxy port (default: 3005)')
+    parser.add_argument('--registration-protocol', choices=['http', 'https', 'mtls'], help='Registration protocol')
+    parser.add_argument('--registration-cert-file', help='Registration certificate file path')
+    parser.add_argument('--registration-key-file', help='Registration key file path')
+    parser.add_argument('--registration-ca-cert-file', help='Registration CA certificate file path')
+    parser.add_argument('--registration-crl-file', help='Registration CRL file path')
+    
+    args = parser.parse_args()
+    return config_generate_command(args)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
+
+

mcp_proxy_adapter/cli/commands/config_validate.py

@@ -0,0 +1,94 @@
+"""
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
+
+CLI command: config validate (Configuration validation)
+Supports both SimpleConfig and full configuration formats.
+Uses the same ConfigValidator as server startup.
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import sys
+from argparse import Namespace
+from pathlib import Path
+
+from mcp_proxy_adapter.core.validation.config_validator import ConfigValidator
+
+
+def config_validate_command(args: Namespace) -> int:
+    """
+    Validate configuration file using ConfigValidator.
+    
+    This uses the same validator as server startup to ensure consistency.
+    """
+    config_file = Path(args.file)
+    
+    if not config_file.exists():
+        print(f"❌ Configuration file not found: {config_file}")
+        return 1
+    
+    try:
+        # Load configuration
+        with open(config_file, 'r', encoding='utf-8') as f:
+            config_data = json.load(f)
+    except json.JSONDecodeError as e:
+        print(f"❌ Invalid JSON in configuration file: {e}")
+        return 1
+    except Exception as e:
+        print(f"❌ Failed to load config: {e}")
+        return 1
+    
+    # Use the same ConfigValidator as server startup
+    validator = ConfigValidator(config_path=str(config_file))
+    validator.config_data = config_data
+    validation_results = validator.validate_config()
+    
+    # Separate errors and warnings
+    errors = [r for r in validation_results if r.level == "error"]
+    warnings = [r for r in validation_results if r.level == "warning"]
+    
+    if errors:
+        print("❌ Validation failed:")
+        for err in errors:
+            section_info = f" ({err.section}" + (f".{err.key}" if err.key else "") + ")" if err.section else ""
+            print(f"   - {err.message}{section_info}")
+        if warnings:
+            print("\n⚠️  Warnings:")
+            for warn in warnings:
+                section_info = f" ({warn.section}" + (f".{warn.key}" if warn.key else "") + ")" if warn.section else ""
+                print(f"   - {warn.message}{section_info}")
+        return 1
+    
+    if warnings:
+        print("✅ Validation passed with warnings:")
+        for warn in warnings:
+            section_info = f" ({warn.section}" + (f".{warn.key}" if warn.key else "") + ")" if warn.section else ""
+            print(f"   ⚠️  {warn.message}{section_info}")
+        return 0
+    
+    print("✅ Validation OK")
+    return 0
+
+
+def main() -> int:
+    """Main entry point for adapter-cfg-val CLI command."""
+    parser = argparse.ArgumentParser(
+        prog="adapter-cfg-val",
+        description="Validate configuration file for MCP Proxy Adapter"
+    )
+    parser.add_argument(
+        '--file',
+        required=True,
+        help='Path to configuration file'
+    )
+    
+    args = parser.parse_args()
+    return config_validate_command(args)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
+

mcp_proxy_adapter/cli/commands/generate.py

@@ -0,0 +1,259 @@
+"""
+Generate Command
+
+This module implements the generate command for creating configuration files.
+
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
+"""
+
+import json
+from pathlib import Path
+from typing import Dict, Any, Optional
+
+# Import the existing config generator
+try:
+    from mcp_proxy_adapter.examples.config_builder import generate_complete_config
+    from mcp_proxy_adapter.core.config_validator import ConfigValidator
+    VALIDATION_AVAILABLE = True
+except ImportError:
+    VALIDATION_AVAILABLE = False
+    print("Warning: Configuration validation not available. Install the package to enable validation.")
+
+
+class GenerateCommand:
+    """Command for generating configuration files."""
+    
+    def __init__(self):
+        """Initialize the generate command."""
+        pass
+    
+    def execute(self, args: Dict[str, Any]) -> int:
+        """
+        Execute the generate command.
+        
+        Args:
+            args: Parsed command arguments
+            
+        Returns:
+            Exit code (0 for success, 1 for error)
+        """
+        try:
+            # Handle special cases
+            if args.get('all'):
+                return self._generate_all_configs(args)
+            
+            # Generate single configuration
+            return self._generate_single_config(args)
+            
+        except Exception as e:
+            print(f"❌ Error generating configuration: {e}")
+            return 1
+    
+    def _generate_single_config(self, args: Dict[str, Any]) -> int:
+        """Generate a single configuration file."""
+        # Create configuration
+        config = self._create_config_from_args(args)
+        
+        # Save configuration
+        if args.get('stdout'):
+            # Output to stdout
+            print(json.dumps(config, indent=2, ensure_ascii=False))
+        else:
+            # Save to file
+            config_file = self._save_config(config, args)
+            print(f"✅ Configuration saved to: {config_file}")
+        
+        return 0
+    
+    def _generate_all_configs(self, args: Dict[str, Any]) -> int:
+        """Generate all standard configurations."""
+        print("🔧 Generating MCP Proxy Adapter configurations...")
+        print("=" * 60)
+        
+        # Define all standard configurations
+        configs = [
+            # HTTP configurations
+            ("http", False, False, 20000),
+            ("http", True, True, 20001),  # token + roles
+            ("http", True, False, 20002),  # token only
+            
+            # HTTPS configurations
+            ("https", False, False, 20003),
+            ("https", True, True, 20004),  # token + roles
+            ("https", True, False, 20005),  # token only
+            
+            # mTLS configurations
+            ("mtls", False, False, 20006),
+            ("mtls", False, True, 20007),  # roles only (from certificate)
+        ]
+        
+        generated_files = []
+        
+        for protocol, token, roles, port in configs:
+            # Create configuration name
+            name_parts = [protocol]
+            if token:
+                name_parts.append("token")
+            if roles:
+                name_parts.append("roles")
+            
+            config_name = "_".join(name_parts)
+            
+            # Create args for this configuration
+            config_args = args.copy()
+            config_args.update({
+                'protocol': protocol,
+                'token': token,
+                'roles': roles,
+                'port': port
+            })
+            
+            # Generate configuration
+            config = self._create_config_from_args(config_args)
+            
+            # Save configuration
+            config_file = self._save_config(config, config_args, config_name)
+            generated_files.append(config_file)
+            
+            print(f"✅ Created {config_name}.json (port {port})")
+        
+        # Create roles.json file if any role-based configs were generated
+        self._create_roles_file(args.get('output_dir', './configs'))
+        
+        print(f"\n🎉 Generated {len(generated_files)} configurations in {args.get('output_dir', './configs')}/")
+        print("\n📋 Generated configurations:")
+        for config_file in generated_files:
+            print(f"  - {config_file.name}")
+        
+        return 0
+    
+    def _create_config_from_args(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """Create configuration dictionary from arguments."""
+        # Start with basic configuration
+        config = generate_complete_config(
+            args.get('host', '127.0.0.1'),
+            args.get('port', 8000)
+        )
+        
+        # Set protocol
+        config["server"]["protocol"] = args.get('protocol', 'http')
+        
+        # Configure SSL based on protocol
+        if args.get('protocol') == 'https':
+            config["ssl"]["enabled"] = True
+            config["ssl"]["cert_file"] = f"{args.get('cert_dir', './certs')}/server.crt"
+            config["ssl"]["key_file"] = f"{args.get('key_dir', './keys')}/server.key"
+        elif args.get('protocol') == 'mtls':
+            config["ssl"]["enabled"] = True
+            config["ssl"]["cert_file"] = f"{args.get('cert_dir', './certs')}/server.crt"
+            config["ssl"]["key_file"] = f"{args.get('key_dir', './keys')}/server.key"
+            config["ssl"]["ca_cert"] = f"{args.get('cert_dir', './certs')}/ca.crt"
+            config["transport"]["verify_client"] = True
+        
+        # Configure security if token authentication is enabled
+        if args.get('token'):
+            config["security"]["enabled"] = True
+            config["security"]["tokens"] = {
+                "admin": "admin-secret-key",
+                "user": "user-secret-key",
+                "readonly": "readonly-secret-key"
+            }
+            
+            if args.get('roles'):
+                config["security"]["roles"] = {
+                    "admin": ["read", "write", "delete", "admin"],
+                    "user": ["read", "write"],
+                    "readonly": ["read"]
+                }
+                config["security"]["roles_file"] = f"{args.get('output_dir', './configs')}/roles.json"
+                config["roles"]["enabled"] = True
+                config["roles"]["config_file"] = f"{args.get('output_dir', './configs')}/roles.json"
+        elif args.get('roles') and args.get('protocol') == 'mtls':
+            # For mTLS, roles can be enabled without tokens (from certificate)
+            config["roles"]["enabled"] = True
+            config["roles"]["config_file"] = f"{args.get('output_dir', './configs')}/roles.json"
+        
+        # Configure proxy registration if enabled
+        if args.get('proxy_url'):
+            config["proxy_registration"]["enabled"] = True
+            config["proxy_registration"]["proxy_url"] = args['proxy_url']
+            config["proxy_registration"]["server_id"] = args.get('server_id', 'mcp-proxy-adapter')
+        
+        return config
+    
+    def _save_config(self, config: Dict[str, Any], args: Dict[str, Any], filename: Optional[str] = None) -> Path:
+        """Save configuration to file with optional validation."""
+        output_dir = Path(args.get('output_dir', './configs'))
+        output_dir.mkdir(parents=True, exist_ok=True)
+        
+        # Determine filename
+        if filename:
+            config_name = filename
+        elif args.get('output'):
+            config_name = args['output']
+        else:
+            # Generate filename from arguments
+            name_parts = [args.get('protocol', 'http')]
+            if args.get('token'):
+                name_parts.append("token")
+            if args.get('roles'):
+                name_parts.append("roles")
+            config_name = "_".join(name_parts)
+        
+        config_file = output_dir / f"{config_name}.json"
+        
+        # Save configuration
+        with open(config_file, 'w', encoding='utf-8') as f:
+            json.dump(config, f, indent=2, ensure_ascii=False)
+        
+        # Validate configuration if requested and validation is available
+        if not args.get('no_validate') and VALIDATION_AVAILABLE:
+            print(f"🔍 Validating configuration: {config_file}")
+            validator = ConfigValidator()
+            validator.config_data = config
+            results = validator.validate_config()
+            
+            if results:
+                print("⚠️  Validation issues found:")
+                for result in results:
+                    level_symbol = "❌" if result.level == "error" else "⚠️" if result.level == "warning" else "ℹ️"
+                    print(f"  {level_symbol} {result.message}")
+                    if hasattr(result, 'suggestion') and result.suggestion:
+                        print(f"     Suggestion: {result.suggestion}")
+            else:
+                print("✅ Configuration validation passed!")
+        
+        return config_file
+    
+    def _create_roles_file(self, output_dir: str) -> None:
+        """Create roles.json file for role-based configurations."""
+        roles_config = {
+            "enabled": True,
+            "default_policy": {
+                "deny_by_default": False,
+                "require_role_match": False,
+                "case_sensitive": False,
+                "allow_wildcard": False
+            },
+            "roles": {
+                "admin": ["read", "write", "delete", "admin"],
+                "user": ["read", "write"],
+                "readonly": ["read"],
+                "guest": ["read"],
+                "proxy": ["read", "write"]
+            },
+            "permissions": {
+                "read": ["GET"],
+                "write": ["POST", "PUT", "PATCH"],
+                "delete": ["DELETE"],
+                "admin": ["*"]
+            }
+        }
+        
+        roles_file = Path(output_dir) / "roles.json"
+        with open(roles_file, 'w', encoding='utf-8') as f:
+            json.dump(roles_config, f, indent=2, ensure_ascii=False)
+        print(f"✅ Created roles.json")
+
+

mcp_proxy_adapter/cli/commands/server.py

@@ -0,0 +1,174 @@
+"""
+Server Command
+
+This module implements the server command for starting MCP Proxy Adapter server.
+
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
+"""
+
+import json
+from pathlib import Path
+from typing import Dict, Any
+
+try:
+    from mcp_proxy_adapter.core.validation.config_validator import ConfigValidator
+    from mcp_proxy_adapter.core.server_adapter import UnifiedServerRunner
+    from mcp_proxy_adapter.api.app import create_app
+    VALIDATION_AVAILABLE = True
+except ImportError:
+    VALIDATION_AVAILABLE = False
+
+
+class ServerCommand:
+    """Command for starting the MCP Proxy Adapter server."""
+    
+    def __init__(self):
+        """Initialize the server command."""
+        pass
+    
+    def execute(self, args: Dict[str, Any]) -> int:
+        """
+        Execute the server command.
+        
+        Args:
+            args: Parsed command arguments
+            
+        Returns:
+            Exit code (0 for success, 1 for error)
+        """
+        config_file = args['config']
+        no_validate = args.get('no_validate', False)
+        
+        try:
+            # Load configuration
+            print(f"🔍 Loading configuration from: {config_file}")
+            with open(config_file, 'r', encoding='utf-8') as f:
+                config = json.load(f)
+            
+            # Validate configuration if not disabled
+            if not no_validate and VALIDATION_AVAILABLE:
+                print("🔍 Validating configuration...")
+                if not self._validate_config(config, config_file):
+                    print("❌ Configuration validation failed. Server not started.")
+                    return 1
+                print("✅ Configuration validation passed!")
+            elif no_validate:
+                print("⚠️  Configuration validation skipped (--no-validate)")
+            else:
+                print("⚠️  Configuration validation not available")
+            
+            # Override configuration with command line arguments
+            if args.get('port'):
+                config['server']['port'] = args['port']
+                print(f"🔧 Overriding port to: {args['port']}")
+            
+            if args.get('host'):
+                config['server']['host'] = args['host']
+                print(f"🔧 Overriding host to: {args['host']}")
+            
+            # Create and start server
+            print("🚀 Starting MCP Proxy Adapter server...")
+            self._start_server(config, args)
+            
+        except FileNotFoundError:
+            print(f"❌ Configuration file not found: {config_file}")
+            return 1
+        except json.JSONDecodeError as e:
+            print(f"❌ Invalid JSON in configuration file: {e}")
+            return 1
+        except Exception as e:
+            print(f"❌ Error starting server: {e}")
+            return 1
+    
+    def _validate_config(self, config: Dict[str, Any], config_file: str) -> bool:
+        """
+        Validate configuration using ConfigValidator.
+        
+        Args:
+            config: Configuration dictionary
+            config_file: Path to configuration file
+            
+        Returns:
+            True if configuration is valid, False otherwise
+        """
+        try:
+            validator = ConfigValidator()
+            validator.config_data = config
+            results = validator.validate_config()
+            
+            # Check for errors
+            errors = [r for r in results if r.level == "error"]
+            warnings = [r for r in results if r.level == "warning"]
+            
+            if errors:
+                print("❌ Configuration validation errors:")
+                for error in errors:
+                    print(f"  • {error.message}")
+                    if hasattr(error, 'suggestion') and error.suggestion:
+                        print(f"    → {error.suggestion}")
+                return False
+            
+            if warnings:
+                print("⚠️  Configuration validation warnings:")
+                for warning in warnings:
+                    print(f"  • {warning.message}")
+                    if hasattr(warning, 'suggestion') and warning.suggestion:
+                        print(f"    → {warning.suggestion}")
+            
+            return True
+            
+        except Exception as e:
+            print(f"❌ Error during configuration validation: {e}")
+            return False
+    
+    def _start_server(self, config: Dict[str, Any], args: Dict[str, Any]) -> None:
+        """
+        Start the MCP Proxy Adapter server.
+        
+        Args:
+            config: Server configuration
+            args: Command line arguments
+        """
+        try:
+            # Create ASGI application
+            app = create_app(config)
+            
+            # Prepare server configuration
+            server_config = {
+                'host': config['server']['host'],
+                'port': config['server']['port'],
+                'log_level': config['server'].get('log_level', 'INFO'),
+                'reload': args.get('reload', False)
+            }
+            
+            # Add SSL configuration if present
+            if 'ssl' in config and config['ssl'].get('enabled'):
+                server_config.update({
+                    'certfile': config['ssl'].get('cert_file'),
+                    'keyfile': config['ssl'].get('key_file'),
+                    'ca_certs': config['ssl'].get('ca_cert'),
+                    'verify_mode': 'CERT_REQUIRED' if config.get('transport', {}).get('verify_client') else 'CERT_NONE'
+                })
+            
+            # Start server
+            print(f"🌐 Server starting on {server_config['host']}:{server_config['port']}")
+            print(f"📋 Protocol: {config['server']['protocol']}")
+            print(f"🔐 Security: {'Enabled' if config.get('security', {}).get('enabled') else 'Disabled'}")
+            print(f"🔑 Authentication: {'Token-based' if config.get('security', {}).get('tokens') else 'Certificate-based' if config['server']['protocol'] == 'mtls' else 'None'}")
+            print(f"👥 Roles: {'Enabled' if config.get('roles', {}).get('enabled') else 'Disabled'}")
+            print("=" * 60)
+            
+            # Use UnifiedServerRunner to start the server
+            runner = UnifiedServerRunner()
+            runner.run_server(app, server_config)
+            
+        except ImportError as e:
+            print(f"❌ Missing required dependencies: {e}")
+            print("💡 Install required packages: pip install hypercorn")
+            raise
+        except Exception as e:
+            print(f"❌ Failed to start server: {e}")
+            raise
+
+