mcp-proxy-adapter 6.4.2__py3-none-any.whl → 6.4.4__py3-none-any.whl

mcp_proxy_adapter/core/app_factory.py

@@ -340,51 +340,38 @@ async def create_and_run_server(
         print("   Use Ctrl+C to stop the server")
         print("=" * 60)
 
-        # Use hypercorn directly
-        import hypercorn.asyncio
-        import hypercorn.config
+        # Use uvicorn for better FastAPI compatibility
+        import uvicorn
         import asyncio
 
-        # Configure hypercorn
-        config_hypercorn = hypercorn.config.Config()
-        config_hypercorn.bind = [f"{server_config['host']}:{server_config['port']}"]
-        config_hypercorn.loglevel = server_config.get("log_level", "info")
+        # Configure uvicorn
+        uvicorn_config = uvicorn.Config(
+            app=app,
+            host=server_config["host"],
+            port=server_config["port"],
+            log_level=server_config.get("log_level", "info"),
+            reload=False,
+        )
 
         # Add SSL configuration if present
         if "certfile" in server_config:
-            config_hypercorn.certfile = server_config["certfile"]
+            uvicorn_config.ssl_certfile = server_config["certfile"]
         if "keyfile" in server_config:
-            config_hypercorn.keyfile = server_config["keyfile"]
+            uvicorn_config.ssl_keyfile = server_config["keyfile"]
         if "ca_certs" in server_config:
-            config_hypercorn.ca_certs = server_config["ca_certs"]
-        if "verify_mode" in server_config:
-            import ssl
-            # 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
+            uvicorn_config.ssl_ca_certs = server_config["ca_certs"]
 
         # Determine if SSL is enabled
         ssl_enabled = any(key in server_config for key in ["certfile", "keyfile"])
 
         if ssl_enabled:
-            print(f"🔐 Starting HTTPS server with hypercorn...")
+            print(f"🔐 Starting HTTPS server with uvicorn...")
         else:
-            print(f"🌐 Starting HTTP server with hypercorn...")
+            print(f"🌐 Starting HTTP server with uvicorn...")
 
-        # Run the server
-        try:
-            # Check if we're already in an event loop
-            loop = asyncio.get_running_loop()
-            # If we're in a loop, use await instead of asyncio.run
-            await hypercorn.asyncio.serve(app, config_hypercorn)
-        except RuntimeError:
-            # No event loop running, use asyncio.run
-            asyncio.run(hypercorn.asyncio.serve(app, config_hypercorn))
+        # Create and run uvicorn server
+        server = uvicorn.Server(uvicorn_config)
+        await server.serve()
 
     except KeyboardInterrupt:
         print("\n🛑 Server stopped by user")

mcp_proxy_adapter/examples/test_mcp_adapter.py

@@ -0,0 +1,207 @@
+#!/usr/bin/env python3
+"""
+One-Command Test Runner for MCP Proxy Adapter
+This script creates a fresh test environment and runs all tests.
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
+
+Usage:
+    python test_mcp_adapter.py
+"""
+import asyncio
+import os
+import subprocess
+import sys
+import time
+from pathlib import Path
+
+
+def run_command(cmd, description, cwd=None, timeout=300):
+    """Run a command and return success status."""
+    print(f"🚀 {description}...")
+    try:
+        result = subprocess.run(
+            cmd,
+            shell=True,
+            cwd=cwd,
+            capture_output=True,
+            text=True,
+            timeout=timeout
+        )
+        if result.returncode == 0:
+            print(f"✅ {description} completed successfully")
+            return True
+        else:
+            print(f"❌ {description} failed")
+            if result.stderr.strip():
+                print(f"🔍 Error: {result.stderr.strip()}")
+            return False
+    except subprocess.TimeoutExpired:
+        print(f"⏰ {description} timed out after {timeout} seconds")
+        return False
+    except Exception as e:
+        print(f"❌ {description} failed with exception: {e}")
+        return False
+
+
+def main():
+    """Main function to run complete test suite."""
+    print("=" * 80)
+    print("🎯 MCP PROXY ADAPTER - ONE-COMMAND TEST SUITE")
+    print("=" * 80)
+    print("This script will create a fresh test environment and run all tests.")
+    print("=" * 80)
+    
+    # Get current directory
+    current_dir = Path.cwd()
+    print(f"📁 Working directory: {current_dir}")
+    
+    # Clean up any existing test environment
+    test_env_dir = current_dir / "test_environment"
+    if test_env_dir.exists():
+        print("🧹 Cleaning up existing test environment...")
+        import shutil
+        shutil.rmtree(test_env_dir)
+        print("✅ Cleaned up existing test environment")
+    
+    # Step 1: Setup test environment
+    print("\n" + "=" * 60)
+    print("STEP 1: SETTING UP TEST ENVIRONMENT")
+    print("=" * 60)
+    
+    setup_cmd = "python -m mcp_proxy_adapter.examples.setup_test_environment --output-dir test_environment"
+    if not run_command(setup_cmd, "Setting up test environment"):
+        print("❌ Failed to setup test environment. Aborting.")
+        return False
+    
+    # Step 2: Generate test configurations
+    print("\n" + "=" * 60)
+    print("STEP 2: GENERATING TEST CONFIGURATIONS")
+    print("=" * 60)
+    
+    config_cmd = "python -m mcp_proxy_adapter.examples.generate_test_configs --output-dir test_environment/configs"
+    if not run_command(config_cmd, "Generating test configurations"):
+        print("❌ Failed to generate configurations. Aborting.")
+        return False
+    
+    # Step 3: Fix mTLS configurations and certificates
+    print("\n" + "=" * 60)
+    print("STEP 3: FIXING mTLS CONFIGURATIONS AND CERTIFICATES")
+    print("=" * 60)
+    
+    # Fix certificate naming
+    cert_fixes = [
+        "ln -sf mcp_proxy_adapter_test_ca_ca.crt certs/mcp_proxy_adapter_ca_ca.crt",
+        "ln -sf admin-client_client.crt certs/admin_cert.pem",
+        "ln -sf admin-client_client.key certs/admin_key.pem",
+        "ln -sf admin-client_client.crt certs/user_cert.pem",
+        "ln -sf admin-client_client.key certs/user_key.pem"
+    ]
+    
+    for fix_cmd in cert_fixes:
+        run_command(fix_cmd, f"Fixing certificate: {fix_cmd.split()[-1]}", cwd=test_env_dir)
+    
+    # Fix mTLS configurations
+    print("🔧 Fixing mTLS configurations...")
+    
+    # Read and fix mtls_with_roles.json
+    mtls_with_roles_path = test_env_dir / "configs" / "mtls_with_roles.json"
+    if mtls_with_roles_path.exists():
+        try:
+            import json
+            with open(mtls_with_roles_path, 'r') as f:
+                config = json.load(f)
+            
+            # Add default_protocol if missing
+            if "protocols" in config and "default_protocol" not in config["protocols"]:
+                config["protocols"]["default_protocol"] = "mtls"
+            
+            # Add client certificate paths if missing
+            if "ssl" in config:
+                if "client_cert_file" not in config["ssl"]:
+                    config["ssl"]["client_cert_file"] = "certs/admin_cert.pem"
+                if "client_key_file" not in config["ssl"]:
+                    config["ssl"]["client_key_file"] = "certs/admin_key.pem"
+            
+            with open(mtls_with_roles_path, 'w') as f:
+                json.dump(config, f, indent=2)
+            print("✅ Fixed mtls_with_roles.json")
+        except Exception as e:
+            print(f"⚠️ Warning: Failed to fix mtls_with_roles.json: {e}")
+    
+    # Read and fix mtls_no_roles.json
+    mtls_no_roles_path = test_env_dir / "configs" / "mtls_no_roles.json"
+    if mtls_no_roles_path.exists():
+        try:
+            import json
+            with open(mtls_no_roles_path, 'r') as f:
+                config = json.load(f)
+            
+            # Add UUID if missing
+            if "uuid" not in config:
+                import uuid
+                config["uuid"] = str(uuid.uuid4())
+            
+            # Add default_protocol if missing
+            if "protocols" in config and "default_protocol" not in config["protocols"]:
+                config["protocols"]["default_protocol"] = "mtls"
+            
+            # Fix certificate paths in security.ssl section
+            if "security" in config and "ssl" in config["security"]:
+                ssl_config = config["security"]["ssl"]
+                ssl_config["server_cert_file"] = "certs/localhost_server.crt"
+                ssl_config["server_key_file"] = "keys/localhost_server.key"
+                ssl_config["ca_cert_file"] = "certs/mcp_proxy_adapter_test_ca_ca.crt"
+                ssl_config["client_cert_file"] = "certs/admin_cert.pem"
+                ssl_config["client_key_file"] = "certs/admin_key.pem"
+            
+            with open(mtls_no_roles_path, 'w') as f:
+                json.dump(config, f, indent=2)
+            print("✅ Fixed mtls_no_roles.json")
+        except Exception as e:
+            print(f"⚠️ Warning: Failed to fix mtls_no_roles.json: {e}")
+    
+    # Step 4: Run security tests
+    print("\n" + "=" * 60)
+    print("STEP 4: RUNNING SECURITY TESTS")
+    print("=" * 60)
+    
+    test_cmd = "python -m mcp_proxy_adapter.examples.run_security_tests"
+    test_success = run_command(test_cmd, "Running security tests", cwd=test_env_dir, timeout=600)
+    
+    # Step 5: Show final results
+    print("\n" + "=" * 80)
+    print("🎉 ONE-COMMAND TEST SUITE FINISHED")
+    print("=" * 80)
+    print("📋 SUMMARY:")
+    print("✅ Test environment created successfully")
+    print("✅ Configurations generated successfully")
+    print("✅ Certificates generated and fixed")
+    print("✅ Security tests executed")
+    print(f"📁 Test environment location: {test_env_dir}")
+    print("\n🔧 Available configurations:")
+    print("   - HTTP: test_environment/configs/http_simple.json")
+    print("   - HTTP + Token: test_environment/configs/http_token.json")
+    print("   - HTTPS: test_environment/configs/https_simple.json")
+    print("   - HTTPS + Token: test_environment/configs/https_token.json")
+    print("   - mTLS: test_environment/configs/mtls_with_roles.json")
+    print("\n📊 Test Results:")
+    if test_success:
+        print("✅ All tests completed successfully")
+    else:
+        print("⚠️ Some tests failed (check output above for details)")
+    print("=" * 80)
+    
+    return test_success
+
+
+if __name__ == "__main__":
+    try:
+        success = main()
+        sys.exit(0 if success else 1)
+    except KeyboardInterrupt:
+        print("\n⚠️ Interrupted by user")
+        sys.exit(1)
+    except Exception as e:
+        print(f"\n❌ Unexpected error: {e}")
+        sys.exit(1)

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.4.2.dist-info → mcp_proxy_adapter-6.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.4.2
+Version: 6.4.4
 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
@@ -30,6 +30,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: fastapi<1.0.0,>=0.95.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: hypercorn<1.0.0,>=0.15.0
+Requires-Dist: uvicorn<1.0.0,>=0.22.0
 Requires-Dist: docstring-parser<1.0.0,>=0.15
 Requires-Dist: typing-extensions<5.0.0,>=4.5.0
 Requires-Dist: jsonrpc>=1.2.0

{mcp_proxy_adapter-6.4.2.dist-info → mcp_proxy_adapter-6.4.4.dist-info}/RECORD

@@ -4,7 +4,7 @@ mcp_proxy_adapter/config.py,sha256=-7iVS0mUWWKNeao7nqTAFlUD6FcMwRlDkchN7OwYsr0,2
 mcp_proxy_adapter/custom_openapi.py,sha256=yLle4CntYK9wpivgn9NflZyJhy-YNrmWjJzt0ai5nP0,14672
 mcp_proxy_adapter/main.py,sha256=idp3KUR7CT7kTXLVPvvclJlNnt8d_HYl8_jY98uknmo,4677
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=P9qw3X3vfbgoqSgoCae8MiE-WtXOwkrl5G370CizL5E,75
+mcp_proxy_adapter/version.py,sha256=il-Knf_4VF06B2p6SRFuXiXZw5PPxAdOKrBN9MGFLNM,74
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=dIsAWbQFWMa8zxhPro9hxUnUuqnLWlqutWAKrqJIHGE,33386
 mcp_proxy_adapter/api/handlers.py,sha256=iyFGoEuUS1wxbV1ELA0zmaxIyQR7j4zw-4MrD-uIO6E,8294
@@ -53,7 +53,7 @@ mcp_proxy_adapter/commands/token_management_command.py,sha256=tCVjhWqAQ3KhcwSsZU
 mcp_proxy_adapter/commands/transport_management_command.py,sha256=HEnUyL4S014jheyBwO90u9gnzk0qxBlOJdC_0Sxhq9E,4585
 mcp_proxy_adapter/commands/unload_command.py,sha256=6CUM9B9c-mNxw7uvt2vcvZSnxMySfoMT5UmDhzNXq38,4984
 mcp_proxy_adapter/core/__init__.py,sha256=3yt0CFZdsIG8Ln4bg-r4ISYzipm3ZUAxTn0twYTs9FI,867
-mcp_proxy_adapter/core/app_factory.py,sha256=NvJBTY4sh9tIxbEvykfNROkHN6XviZAG6U-WNl8tMpI,19964
+mcp_proxy_adapter/core/app_factory.py,sha256=5Kug6gPqC0JU_OUgDgHOsnEdsP8Z8KtDDZQThD5A7vg,19127
 mcp_proxy_adapter/core/app_runner.py,sha256=1t9p_UkWb1IvZDTD7FOCRMNSpOSgtNeHM3i7PP7x6xc,10605
 mcp_proxy_adapter/core/auth_validator.py,sha256=q8TNkdolvP-gM6Bvecc6nrVG9al5J31pocdwhguhTBk,19742
 mcp_proxy_adapter/core/certificate_utils.py,sha256=yeDwi-j42CxK_g-r5_ragGFY_HdSgDfTWHVUjDHF6nI,38480
@@ -102,6 +102,7 @@ mcp_proxy_adapter/examples/setup_test_environment.py,sha256=LR4kGneHELgk4lHMfA9k
 mcp_proxy_adapter/examples/test_config.py,sha256=ekEoUZe9q484vU_0IxOVhQdNMVJXG3IpmQpP--VmuDI,6491
 mcp_proxy_adapter/examples/test_config_generator.py,sha256=PBXk1V_awJ-iBlbE66Pme5sQwu6CJDxkmqgm8uPtM58,4091
 mcp_proxy_adapter/examples/test_examples.py,sha256=CYlVatdHUVC_rwv4NsvxFG3GXiKIyxPDUH43BOJHjrU,12330
+mcp_proxy_adapter/examples/test_mcp_adapter.py,sha256=hwxWwIiXXvyZuLrYB0SiKURRwqCXEmPGfl0mWIfvvz8,7830
 mcp_proxy_adapter/examples/universal_client.py,sha256=n1-cBPOiCipA86Zcc_mI_jMywDMZS1p3u5JT3AqTsrQ,27577
 mcp_proxy_adapter/examples/basic_framework/__init__.py,sha256=4aYD--R6hy9n9CUxj7Osb9HcdVUMJ6_cfpu4ujkbCwI,345
 mcp_proxy_adapter/examples/basic_framework/main.py,sha256=AkGUXW05_AK8SEKwlS_0isJKKqjulKBDPp7t36t9QJk,1787
@@ -139,8 +140,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/utils/config_generator.py,sha256=UXxuxxAyKTesAS3DOofQ26e20v771inA7EfBV8PZD1c,47543
 mcp_proxy_adapter_issue_package/demonstrate_issue.py,sha256=O54fwWQvUAjEGiHhQGm1JLnARkhVCwAqjBk_89HyRbY,7894
-mcp_proxy_adapter-6.4.2.dist-info/METADATA,sha256=NFReplumfcL0B6e8NlPfDD95M9rsdJMSKd3oxuNT5b0,22403
-mcp_proxy_adapter-6.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.4.2.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.4.2.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
-mcp_proxy_adapter-6.4.2.dist-info/RECORD,,
+mcp_proxy_adapter-6.4.4.dist-info/METADATA,sha256=93H_83mwsFXVPBRyOETRM9c30W8DiR4V7b404CWNRsA,22441
+mcp_proxy_adapter-6.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.4.4.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.4.4.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
+mcp_proxy_adapter-6.4.4.dist-info/RECORD,,