mcp-proxy-adapter 6.2.22__py3-none-any.whl → 6.2.23__py3-none-any.whl

mcp_proxy_adapter/examples/create_certificates_simple.py

@@ -22,17 +22,18 @@ except ImportError:
 class SimpleCertificateCreator:
     """Create certificates using OpenSSL directly."""
     def __init__(self, certs_dir: str = None, keys_dir: str = None):
+        # Use current working directory as base
+        cwd = Path.cwd()
+
         if certs_dir:
             self.certs_dir = Path(certs_dir).resolve()
         else:
-            self.project_root = Path(__file__).parent.parent.parent
-            self.certs_dir = self.project_root / "mcp_proxy_adapter" / "examples" / "certs"
+            self.certs_dir = cwd / "certs"
+
         if keys_dir:
             self.keys_dir = Path(keys_dir).resolve()
         else:
-            if not certs_dir:
-                self.project_root = Path(__file__).parent.parent.parent
-            self.keys_dir = self.project_root / "mcp_proxy_adapter" / "examples" / "keys"
+            self.keys_dir = cwd / "keys"
         # Create directories
         self.certs_dir.mkdir(parents=True, exist_ok=True)
         self.keys_dir.mkdir(parents=True, exist_ok=True)
@@ -450,6 +451,56 @@ class SimpleCertificateCreator:
         # 5. Validate certificates
         if not self.validate_certificates():
             success = False
+        # Create compatibility symlinks
+        if success:
+            # CA certificate symlink
+            ca_cert = self.certs_dir / "ca_cert.pem"
+            expected_ca_cert = self.certs_dir / "mcp_proxy_adapter_ca_ca.crt"
+            if ca_cert.exists() and not expected_ca_cert.exists():
+                try:
+                    expected_ca_cert.symlink_to(ca_cert)
+                    print(f"✅ Created CA certificate symlink: {expected_ca_cert}")
+                except OSError:
+                    # On Windows, symlink might require admin privileges, copy instead
+                    import shutil
+                    shutil.copy2(ca_cert, expected_ca_cert)
+                    print(f"✅ Created CA certificate copy: {expected_ca_cert}")
+
+            # Server certificate symlink
+            server_cert = self.certs_dir / "server_cert.pem"
+            expected_server_cert = self.certs_dir / "localhost_server.crt"
+            if server_cert.exists() and not expected_server_cert.exists():
+                try:
+                    expected_server_cert.symlink_to(server_cert)
+                    print(f"✅ Created server certificate symlink: {expected_server_cert}")
+                except OSError:
+                    # On Windows, symlink might require admin privileges, copy instead
+                    import shutil
+                    shutil.copy2(server_cert, expected_server_cert)
+                    print(f"✅ Created server certificate copy: {expected_server_cert}")
+
+            # Server key symlink - check if it's in certs or keys directory
+            server_key_certs = self.certs_dir / "server_key.pem"
+            server_key_keys = self.keys_dir / "server_key.pem"
+
+            if server_key_certs.exists():
+                # Server key is in certs directory, move it to keys directory
+                import shutil
+                shutil.move(str(server_key_certs), str(server_key_keys))
+                print(f"✅ Moved server key to keys directory: {server_key_keys}")
+
+            if server_key_keys.exists():
+                expected_server_key = self.keys_dir / "localhost_server.key"
+                if not expected_server_key.exists():
+                    try:
+                        expected_server_key.symlink_to(server_key_keys)
+                        print(f"✅ Created server key symlink: {expected_server_key}")
+                    except OSError:
+                        # On Windows, symlink might require admin privileges, copy instead
+                        import shutil
+                        shutil.copy2(server_key_keys, expected_server_key)
+                        print(f"✅ Created server key copy: {expected_server_key}")
+
         # Print summary
         print("\n" + "=" * 60)
         print("📊 CERTIFICATE CREATION SUMMARY")
@@ -472,12 +523,29 @@ class SimpleCertificateCreator:
 def main():
     """Main function."""
     parser = argparse.ArgumentParser(description="Create certificates for testing")
-    parser.add_argument("--certs-dir", help="Directory for certificates")
-    parser.add_argument("--keys-dir", help="Directory for keys")
+    parser.add_argument("--certs-dir", help="Directory for certificates (default: ./certs)")
+    parser.add_argument("--keys-dir", help="Directory for keys (default: ./keys)")
     args = parser.parse_args()
+
+    # If no directories specified, check if we're in a test environment
+    if not args.certs_dir and not args.keys_dir:
+        cwd = Path.cwd()
+        # Check if we're in a test environment by looking for typical directories
+        if (cwd / "configs").exists() and (cwd / "examples").exists():
+            # We're in a test environment, use current directory
+            certs_dir = cwd / "certs"
+            keys_dir = cwd / "keys"
+        else:
+            # Use default project structure
+            certs_dir = None
+            keys_dir = None
+    else:
+        certs_dir = args.certs_dir
+        keys_dir = args.keys_dir
+
     creator = SimpleCertificateCreator(
-        certs_dir=args.certs_dir,
-        keys_dir=args.keys_dir
+        certs_dir=certs_dir,
+        keys_dir=keys_dir
     )
     try:
         success = creator.create_all()

mcp_proxy_adapter/examples/generate_test_configs.py

@@ -9,14 +9,14 @@ import json
 import os
 import argparse
 from typing import Dict, Any
-def generate_http_simple_config(port: int = 8000) -> Dict[str, Any]:
+def generate_http_simple_config(port: int = 20000, certs_dir: str = "./certs", keys_dir: str = "./keys") -> Dict[str, Any]:
     """Generate HTTP configuration without authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
         "ssl": {"enabled": False},
         "security": {"enabled": False},
         "registration": {
-            "enabled": True,
+            "enabled": False,
             "auth_method": "token",
             "server_url": "http://127.0.0.1:3004/proxy",
             "token": {"enabled": True, "token": "proxy_registration_token_123"},
@@ -29,7 +29,7 @@ def generate_http_simple_config(port: int = 8000) -> Dict[str, Any]:
         },
         "protocols": {"enabled": True, "allowed_protocols": ["http"]}
     }
-def generate_http_token_config(port: int = 8001) -> Dict[str, Any]:
+def generate_http_token_config(port: int = 20001, certs_dir: str = "./certs", keys_dir: str = "./keys") -> Dict[str, Any]:
     """Generate HTTP configuration with token authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -61,7 +61,7 @@ def generate_http_token_config(port: int = 8001) -> Dict[str, Any]:
         },
         "protocols": {"enabled": True, "allowed_protocols": ["http"]}
     }
-def generate_https_simple_config(port: int = 8002) -> Dict[str, Any]:
+def generate_https_simple_config(port: int = 20002, certs_dir: str = "./certs", keys_dir: str = "./keys") -> Dict[str, Any]:
     """Generate HTTPS configuration without client certificate verification and authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -82,7 +82,7 @@ def generate_https_simple_config(port: int = 8002) -> Dict[str, Any]:
         },
         "protocols": {"enabled": True, "allowed_protocols": ["http", "https"]}
     }
-def generate_https_token_config(port: int = 8003) -> Dict[str, Any]:
+def generate_https_token_config(port: int = 20003, certs_dir: str = "./certs", keys_dir: str = "./keys") -> Dict[str, Any]:
     """Generate HTTPS configuration without client certificate verification with token authorization."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -117,7 +117,7 @@ def generate_https_token_config(port: int = 8003) -> Dict[str, Any]:
         },
         "protocols": {"enabled": True, "allowed_protocols": ["http", "https"]}
     }
-def generate_mtls_no_roles_config(port: int = 8004) -> Dict[str, Any]:
+def generate_mtls_no_roles_config(port: int = 20004, certs_dir: str = "./certs", keys_dir: str = "./keys") -> Dict[str, Any]:
     """Generate mTLS configuration without roles."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -135,7 +135,7 @@ def generate_mtls_no_roles_config(port: int = 8004) -> Dict[str, Any]:
         },
         "protocols": {"enabled": True, "allowed_protocols": ["https", "mtls"]}
     }
-def generate_mtls_with_roles_config(port: int = 8005) -> Dict[str, Any]:
+def generate_mtls_with_roles_config(port: int = 20005, certs_dir: str = "./certs", keys_dir: str = "./keys") -> Dict[str, Any]:
     """Generate mTLS configuration with roles."""
     return {
         "server": {"host": "127.0.0.1", "port": port},
@@ -222,15 +222,15 @@ def generate_roles_config() -> Dict[str, Any]:
             "tokens": ["proxy-token-123"]
         }
     }
-def generate_all_configs(output_dir: str) -> None:
+def generate_all_configs(output_dir: str, certs_dir: str = "./certs", keys_dir: str = "./keys") -> None:
     """Generate all 6 configuration types and save them to files."""
     configs = {
-        "http_simple": generate_http_simple_config(8000),
-        "http_token": generate_http_token_config(8001),
-        "https_simple": generate_https_simple_config(8002),
-        "https_token": generate_https_token_config(8003),
-        "mtls_no_roles": generate_mtls_no_roles_config(8004),
-        "mtls_with_roles": generate_mtls_with_roles_config(8005)
+        "http_simple": generate_http_simple_config(20000, certs_dir, keys_dir),
+        "http_token": generate_http_token_config(20001, certs_dir, keys_dir),
+        "https_simple": generate_https_simple_config(20002, certs_dir, keys_dir),
+        "https_token": generate_https_token_config(20003, certs_dir, keys_dir),
+        "mtls_no_roles": generate_mtls_no_roles_config(20004, certs_dir, keys_dir),
+        "mtls_with_roles": generate_mtls_with_roles_config(20005, certs_dir, keys_dir)
     }
     # Ensure output directory exists
     os.makedirs(output_dir, exist_ok=True)

mcp_proxy_adapter/examples/run_full_test_suite.py

@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+"""
+Full Test Suite Runner for MCP Proxy Adapter
+This script automatically runs the complete test suite:
+1. Setup test environment
+2. Generate configurations
+3. Create certificates
+4. Run security tests
+
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
+"""
+import sys
+import subprocess
+import os
+from pathlib import Path
+
+
+def run_command(cmd: list, description: str) -> bool:
+    """Run a command and return success status."""
+    try:
+        print(f"\n🚀 {description}")
+        print("=" * 60)
+
+        # Change to script directory if running from package
+        script_dir = Path(__file__).parent
+        if script_dir.name == "examples":
+            os.chdir(script_dir)
+
+        result = subprocess.run(
+            cmd,
+            capture_output=False,
+            text=True,
+            check=True,
+            cwd=script_dir
+        )
+        print(f"✅ {description} completed successfully")
+        return True
+    except subprocess.CalledProcessError as e:
+        print(f"❌ {description} failed:")
+        print(f"   Command: {' '.join(cmd)}")
+        print(f"   Error: {e.stderr}")
+        return False
+    except Exception as e:
+        print(f"❌ {description} failed: {e}")
+        return False
+
+
+def main():
+    """Run the complete test suite."""
+    print("🧪 MCP Proxy Adapter - Full Test Suite")
+    print("=" * 60)
+
+    # Check if we're in the right directory
+    current_dir = Path.cwd()
+    if not (current_dir / "setup_test_environment.py").exists():
+        print("❌ Please run this script from the examples directory")
+        return 1
+
+    success = True
+
+    # 1. Setup test environment
+    if not run_command([
+        sys.executable, "-m", "mcp_proxy_adapter.examples.setup_test_environment",
+        "--output-dir", "."
+    ], "Setting up test environment"):
+        success = False
+
+    # 2. Generate configurations
+    if success and not run_command([
+        sys.executable, "-m", "mcp_proxy_adapter.examples.generate_test_configs",
+        "--output-dir", "configs"
+    ], "Generating test configurations"):
+        success = False
+
+    # 3. Create certificates
+    if success and not run_command([
+        sys.executable, "-m", "mcp_proxy_adapter.examples.create_certificates_simple"
+    ], "Creating certificates"):
+        success = False
+
+    # 4. Copy roles.json to root directory
+    if success:
+        import shutil
+        from pathlib import Path
+        roles_file = Path("configs/roles.json")
+        if roles_file.exists():
+            shutil.copy2(roles_file, "roles.json")
+            print("✅ Copied roles.json to root directory")
+        else:
+            success = False
+            print("❌ roles.json not found in configs directory")
+
+    # 5. Run security tests
+    if success and not run_command([
+        sys.executable, "-m", "mcp_proxy_adapter.examples.run_security_tests"
+    ], "Running security tests"):
+        success = False
+
+    # Final result
+    print("\n" + "=" * 60)
+    if success:
+        print("🎉 FULL TEST SUITE COMPLETED SUCCESSFULLY!")
+        print("=" * 60)
+        print("\n📋 SUMMARY:")
+        print("✅ Test environment setup")
+        print("✅ Configuration generation")
+        print("✅ Certificate creation")
+        print("✅ Roles configuration")
+        print("✅ Security testing")
+        print("\n🚀 All systems are working correctly!")
+        return 0
+    else:
+        print("❌ FULL TEST SUITE FAILED!")
+        print("=" * 60)
+        print("\n🔧 TROUBLESHOOTING:")
+        print("1. Check the error messages above")
+        print("2. Ensure you have write permissions")
+        print("3. Make sure ports 20000-20010 are free")
+        print("4. Check if mcp_security_framework is installed")
+        return 1
+
+
+if __name__ == "__main__":
+    exit(main())

mcp_proxy_adapter/examples/setup_test_environment.py

@@ -99,6 +99,18 @@ def setup_test_environment(output_dir: Path) -> None:
     if cert_tokens_src.exists():
         shutil.copy2(cert_tokens_src, output_dir / "scripts/")
         print("✅ Copied generate_certificates_and_tokens.py")
+
+    # Copy roles.json to the root directory for compatibility
+    roles_src = examples_src_root / "roles.json"
+    if roles_src.exists():
+        shutil.copy2(roles_src, output_dir)
+        print("✅ Copied roles.json to root directory")
+
+    # Also copy from configs directory if it exists
+    roles_configs_src = output_dir / "configs" / "roles.json"
+    if roles_configs_src.exists():
+        shutil.copy2(roles_configs_src, output_dir / "roles.json")
+        print("✅ Updated roles.json from configs directory")
     print(
         "🎉 Test environment setup completed successfully at: {}".format(
             output_dir

mcp_proxy_adapter/version.py

@@ -2,5 +2,5 @@
 Version information for MCP Proxy Adapter.
 """
 
-__version__ = "6.2.22"
+__version__ = "6.2.23"
 

{mcp_proxy_adapter-6.2.22.dist-info → mcp_proxy_adapter-6.2.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.2.22
+Version: 6.2.23
 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.2.22.dist-info → mcp_proxy_adapter-6.2.23.dist-info}/RECORD

@@ -4,7 +4,7 @@ mcp_proxy_adapter/config.py,sha256=syjTmiWh66rXcmgK6X2KSzbUkwTQC2W5FfMUpO5bjmo,1
 mcp_proxy_adapter/custom_openapi.py,sha256=jYUrCy8C1mShh3sjKj-JkzSMLAvxDLTvtzSJFj5HUNg,15023
 mcp_proxy_adapter/main.py,sha256=cm67W6RU-rL1-zEcTLz_yT7AyoZeqhMbQ4_2qMHlueE,2975
 mcp_proxy_adapter/openapi.py,sha256=36vOEbJjGnVZR6hUhl6mHCD29HYOEFKo2bL0JdGSm-4,13952
-mcp_proxy_adapter/version.py,sha256=UTgOwFKQ1KSDWuh3LP3uzJxRtoxqBjlUV_gnnZfhWCM,76
+mcp_proxy_adapter/version.py,sha256=cmdFAb5y49RrvFwJN1h125k9acpNWpgNHiIP-UyOdVA,76
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=g0zHST8xY7xTjMxkCIJEFPck5lD5LyhNzO1hM4S9FhU,29136
 mcp_proxy_adapter/api/handlers.py,sha256=DcZT7MVBV33q-0EJ0iFqxE0VgBkFt6d_SqoRkntwyvc,8477
@@ -81,21 +81,22 @@ mcp_proxy_adapter/core/transport_manager.py,sha256=ppcgjO-7Ulrk1ovlzlXVM89Iw4VOG
 mcp_proxy_adapter/core/unified_config_adapter.py,sha256=cpN_VrliIFGDH3JsfRkTlFdQvLcmuMYYedq0QEzlb0Y,22857
 mcp_proxy_adapter/core/utils.py,sha256=ly8Ttg2v1OBukThJLxudRvmttU1hxJFLJUfat4b2dOI,3268
 mcp_proxy_adapter/examples/__init__.py,sha256=k1F-EotAFbJ3JvK_rNgiH4bUztmxIWtYn0AfbAZ1ZGs,450
-mcp_proxy_adapter/examples/create_certificates_simple.py,sha256=2KS-s3amvAqasvdh-cxY7ARuFAHVjtbtr_EJF2SKVQ0,23221
+mcp_proxy_adapter/examples/create_certificates_simple.py,sha256=xkIvUYl6hbKlWImQmenG0k_CvIsOsc9ZHICiKY3rtI8,26380
 mcp_proxy_adapter/examples/debug_request_state.py,sha256=x_H3NIlkmIS6lZimvEM6kCXxGdpgFw99Sdui8qa_qeU,4347
 mcp_proxy_adapter/examples/debug_role_chain.py,sha256=33l2Tk5mrcnwPFwqm2NTHcrWaJrXUU2wxW2I6Y4uIg4,8344
 mcp_proxy_adapter/examples/demo_client.py,sha256=inic-FP5qG8oQXUaCrtEhmhac_PDZ1pcxp-M1cxSzwA,10240
 mcp_proxy_adapter/examples/generate_all_certificates.py,sha256=rgcwqIkQ1eDfEIRFRXGIOz-jOSS1w0GPBRhYvMl6Vjc,16948
 mcp_proxy_adapter/examples/generate_certificates.py,sha256=A34OHUEiFvINOHrm3_JiDSbp-WG-eQXIvKCsE8JAeXQ,6616
 mcp_proxy_adapter/examples/generate_certificates_and_tokens.py,sha256=J0qHm_BMY8RYqfuwf7V7xKsHcsRJx8E7x-8JxmW5sPw,15988
-mcp_proxy_adapter/examples/generate_test_configs.py,sha256=DZmG2ogGPxierbl-KgdiTu8f7WCiIHobwEckVq0QI0Y,11518
+mcp_proxy_adapter/examples/generate_test_configs.py,sha256=EnwhtadwcAWs3dtkVSWUG2Xhw7VHb9i0WQbVCvxGR14,12035
 mcp_proxy_adapter/examples/proxy_registration_example.py,sha256=g59_QG2D1CCqhIXEvgy2XmgXI3toLmLyH7hL3uHZwC8,12647
 mcp_proxy_adapter/examples/run_example.py,sha256=o8rcy9Xo0UuZG4MpKdex3pFWYdtAi6uW8dEBQE6Yzbw,2539
+mcp_proxy_adapter/examples/run_full_test_suite.py,sha256=hREBb4vzT3dWEU0G5rh6XSMykmQ5xeIxb-01i4BMEQQ,3815
 mcp_proxy_adapter/examples/run_proxy_server.py,sha256=vkEjqREcOSw2elH_VOBLa0cFjL8gCZp9nkRa8YLsndI,5119
 mcp_proxy_adapter/examples/run_security_tests.py,sha256=wxt3gbcJbg34QtAB2RNXsZsE69O0hK9IsfyOlx0qjUU,22277
 mcp_proxy_adapter/examples/run_security_tests_fixed.py,sha256=fNQsbALf9548xJ0OGPKYx5Crzg1GbcL8CSh1x_oKu_A,10540
 mcp_proxy_adapter/examples/security_test_client.py,sha256=0j0-RGg9kppt_IAuYeT8cbXr3N5gqBdzEyPd3RW0bs8,35558
-mcp_proxy_adapter/examples/setup_test_environment.py,sha256=Y6oNaR95Rmn2csupYoGV-_mMF6AtqJ31vwLhY0TQtMk,11319
+mcp_proxy_adapter/examples/setup_test_environment.py,sha256=fAfz1U7qERY-Z9ly15Wld8Zci-5_e9zSrvYJ56Rjowo,11839
 mcp_proxy_adapter/examples/test_config.py,sha256=1X9X8lNlWOcM1ZbIzteeMvLdgxnJEK_ev1BYTZiA9ws,6451
 mcp_proxy_adapter/examples/test_config_generator.py,sha256=SBKL0bv-kUwUUbwrFVbxuA_6pDvK2573Jxm9wPiyI8s,3927
 mcp_proxy_adapter/examples/test_examples.py,sha256=KH095FFEQDMKYZglclr5qy3cW__t3H8VX1l8dvCkQos,12132
@@ -115,9 +116,9 @@ mcp_proxy_adapter/examples/full_application/hooks/__init__.py,sha256=ORG4cL8cSXE
 mcp_proxy_adapter/examples/full_application/hooks/application_hooks.py,sha256=TYXuHI-KW_mH5r8mSKgNMJCr3moeEKrqC4Eex0U298k,3457
 mcp_proxy_adapter/examples/full_application/hooks/builtin_command_hooks.py,sha256=IaskSrckZS6bE3aGxSBL8aTj-iJTSI2ysfsFjhjncyM,2975
 mcp_proxy_adapter/utils/config_generator.py,sha256=4qruYxQ2kGLVOukLX2JOW5kslJ06RhkNqTobAgh4rfw,32801
-mcp_proxy_adapter-6.2.22.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
-mcp_proxy_adapter-6.2.22.dist-info/METADATA,sha256=rRvRZpdQy86OOIGS9DsmHB1QSLf75daNW5b5MCfsXh0,22348
-mcp_proxy_adapter-6.2.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.2.22.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.2.22.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.2.22.dist-info/RECORD,,
+mcp_proxy_adapter-6.2.23.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
+mcp_proxy_adapter-6.2.23.dist-info/METADATA,sha256=1KBslv8eqB60f-PpYQwoASk5quYTPdn4VSxRLdB0OL4,22348
+mcp_proxy_adapter-6.2.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.2.23.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.2.23.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.2.23.dist-info/RECORD,,