mcp-proxy-adapter 6.4.32__py3-none-any.whl → 6.4.35__py3-none-any.whl

mcp_proxy_adapter/examples/create_test_configs.py

@@ -74,16 +74,17 @@ class TestConfigGenerator:
         
         # 1. HTTP Simple
         self.create_config("http_simple", {
-            "server.port": 8001,
+            "server.port": 20020,  # Dedicated port for basic_http
             "ssl.enabled": False,
             "security.enabled": False,
             "proxy_registration.enabled": False,
-            "protocols.allowed_protocols": ["http"]
+            "protocols.allowed_protocols": ["http"],
+            "protocols.default_protocol": "http"
         })
         
-        # 2. HTTP with Auth
-        self.create_config("http_auth", {
-            "server.port": 8002,
+        # 2. HTTP with Auth (renamed to http_token for security tests)
+        self.create_config("http_token", {
+            "server.port": 20021,  # Dedicated port for http_token
             "ssl.enabled": False,
             "security.enabled": True,
             "security.auth.enabled": True,
@@ -93,26 +94,28 @@ class TestConfigGenerator:
                 "user": "user-secret-key"
             },
             "proxy_registration.enabled": False,
-            "protocols.allowed_protocols": ["http"]
+            "protocols.allowed_protocols": ["http"],
+            "protocols.default_protocol": "http"
         })
         
         # 3. HTTPS Simple
         self.create_config("https_simple", {
-            "server.port": 8003,
+            "server.port": 20022,  # Dedicated port for https
             "ssl.enabled": True,
             "ssl.cert_file": "certs/localhost_server.crt",
-            "ssl.key_file": "keys/localhost_server.key",
+            "ssl.key_file": "keys/server_key.pem",
             "security.enabled": False,
             "proxy_registration.enabled": False,
-            "protocols.allowed_protocols": ["https"]
+            "protocols.allowed_protocols": ["https"],
+            "protocols.default_protocol": "https"
         })
         
-        # 4. HTTPS with Auth
-        self.create_config("https_auth", {
-            "server.port": 8004,
+        # 4. HTTPS with Auth (renamed to https_token for security tests)
+        self.create_config("https_token", {
+            "server.port": 20023,  # Dedicated port for https_token
             "ssl.enabled": True,
             "ssl.cert_file": "certs/localhost_server.crt",
-            "ssl.key_file": "keys/localhost_server.key",
+            "ssl.key_file": "keys/server_key.pem",
             "security.enabled": True,
             "security.auth.enabled": True,
             "security.auth.methods": ["api_key"],
@@ -121,30 +124,32 @@ class TestConfigGenerator:
                 "user": "user-secret-key"
             },
             "proxy_registration.enabled": False,
-            "protocols.allowed_protocols": ["https"]
+            "protocols.allowed_protocols": ["https"],
+            "protocols.default_protocol": "https"
         })
         
         # 5. mTLS Simple
         self.create_config("mtls_simple", {
-            "server.port": 8005,
+            "server.port": 20025,  # Different port for mtls_simple
             "ssl.enabled": True,
             "ssl.cert_file": "certs/localhost_server.crt",
-            "ssl.key_file": "keys/localhost_server.key",
+            "ssl.key_file": "keys/server_key.pem",
             "ssl.ca_cert": "certs/mcp_proxy_adapter_ca_ca.crt",
             "ssl.verify_client": True,
             "security.enabled": True,
             "security.auth.enabled": True,
             "security.auth.methods": ["certificate"],
             "proxy_registration.enabled": False,
-            "protocols.allowed_protocols": ["https", "mtls"]
+            "protocols.allowed_protocols": ["https", "mtls"],
+            "protocols.default_protocol": "mtls"
         })
         
         # 6. mTLS with Roles
         self.create_config("mtls_with_roles", {
-            "server.port": 8006,
+            "server.port": 20026,  # Different port for mtls_with_roles
             "ssl.enabled": True,
             "ssl.cert_file": "certs/localhost_server.crt",
-            "ssl.key_file": "keys/localhost_server.key",
+            "ssl.key_file": "keys/server_key.pem",
             "ssl.ca_cert": "certs/mcp_proxy_adapter_ca_ca.crt",
             "ssl.verify_client": True,
             "security.enabled": True,
@@ -153,15 +158,16 @@ class TestConfigGenerator:
             "security.permissions.enabled": True,
             "security.permissions.roles_file": "configs/roles.json",
             "proxy_registration.enabled": False,
-            "protocols.allowed_protocols": ["https", "mtls"]
+            "protocols.allowed_protocols": ["https", "mtls"],
+            "protocols.default_protocol": "mtls"
         })
         
         # 6a. mTLS without Roles (for security tests)
         self.create_config("mtls_no_roles", {
-            "server.port": 8009,
+            "server.port": 20024,  # Dedicated port for mtls
             "ssl.enabled": True,
             "ssl.cert_file": "certs/localhost_server.crt",
-            "ssl.key_file": "keys/localhost_server.key",
+            "ssl.key_file": "keys/server_key.pem",
             "ssl.ca_cert": "certs/mcp_proxy_adapter_ca_ca.crt",
             "ssl.verify_client": True,
             "security.enabled": True,

mcp_proxy_adapter/examples/run_security_tests.py

@@ -41,39 +41,39 @@ class SecurityTestRunner:
         self.server_logs = {}
         self.proxy_log = None
         self.test_results = {}
-        # Base and proxy ports
-        self.base_port = 20000
+        # Base and proxy ports - each test gets its own port range
+        self.base_port = 20020
         self.proxy_port = 20010
-        # Server configurations with ports starting from 20000
+        # Server configurations with SEPARATE ports for each test
         self.configs = {
             "basic_http": {
                 "config": "configs/http_simple.json",
-                "port": self.base_port + 0,
-                "url": f"http://localhost:{self.base_port + 0}",
+                "port": 20020,  # Dedicated port
+                "url": f"http://127.0.0.1:20020",
                 "auth": "none",
             },
             "http_token": {
                 "config": "configs/http_token.json",
-                "port": self.base_port + 1,
-                "url": f"http://localhost:{self.base_port + 1}",
+                "port": 20021,  # Dedicated port
+                "url": f"http://127.0.0.1:20021",
                 "auth": "api_key",
             },
             "https": {
                 "config": "configs/https_simple.json",
-                "port": self.base_port + 2,
-                "url": f"https://localhost:{self.base_port + 2}",
+                "port": 20022,  # Dedicated port
+                "url": f"https://127.0.0.1:20022",
                 "auth": "none",
             },
             "https_token": {
                 "config": "configs/https_token.json",
-                "port": self.base_port + 3,
-                "url": f"https://localhost:{self.base_port + 3}",
+                "port": 20023,  # Dedicated port
+                "url": f"https://127.0.0.1:20023",
                 "auth": "api_key",
             },
             "mtls": {
                 "config": "configs/mtls_no_roles.json",
-                "port": self.base_port + 4,
-                "url": f"https://localhost:{self.base_port + 4}",
+                "port": 20024,  # Dedicated port
+                "url": f"https://127.0.0.1:20024",
                 "auth": "certificate",
             },
         }
@@ -229,17 +229,13 @@ class SecurityTestRunner:
         """Start a server in background."""
         try:
             print(f"🚀 Starting {name} server on port {port}...")
-            # Ensure the port is free just before starting
-            self.ensure_ports_free([port])
+            
+            # Check if port is still available (should be, since we checked at start)
             if self._port_in_use(port):
-                print(f"⚠️ Port {port} still busy, waiting...")
-                if not self.wait_for_port(port, timeout_sec=1.5):
-                    # After wait_for_port True means busy; we invert logic here
-                    pass
-            # If still busy after attempts, abort this server start
-            if self._port_in_use(port):
-                print(f"❌ Port {port} is in use, cannot start {name}")
+                print(f"❌ Port {port} is unexpectedly in use, cannot start {name}")
+                print("💡 This should not happen - ports were checked at startup")
                 return None
+                
             # Start server in background
             logs_dir = Path("logs")
             logs_dir.mkdir(exist_ok=True)
@@ -521,14 +517,34 @@ class SecurityTestRunner:
         signal.signal(signal.SIGINT, self.signal_handler)
         signal.signal(signal.SIGTERM, self.signal_handler)
         try:
+            # FIRST: Check ALL ports at the very beginning
+            print("\n🔍 STEP 1: Complete Port Availability Check")
+            all_ports = self.get_all_ports()
+            print(f"📋 Required ports: {all_ports}")
+            
+            # Check if ALL ports are available
+            ports_available, occupied_ports = self.check_ports_available(all_ports)
+            if not ports_available:
+                print(f"❌ CRITICAL: Ports are occupied: {occupied_ports}")
+                print("🧹 Attempting to free occupied ports...")
+                
+                if not self.ensure_ports_free(all_ports):
+                    print("❌ FAILED: Could not free occupied ports. Aborting tests.")
+                    print("💡 Manual cleanup required:")
+                    for port in occupied_ports:
+                        pids = self._pids_on_port(port)
+                        if pids:
+                            print(f"   Port {port}: PIDs {pids}")
+                    return False
+                else:
+                    print("✅ Ports freed successfully")
+            else:
+                print("✅ All required ports are available")
+
             # Check prerequisites
             if not self.check_prerequisites():
                 return False
 
-            # Free ports before run
-            print("\n🧹 Freeing ports before startup...")
-            self.ensure_ports_free(self.get_all_ports())
-
             # Validate config file paths
             if not self.validate_config_files():
                 return False

mcp_proxy_adapter/examples/setup_test_environment.py

@@ -1220,6 +1220,58 @@ def validate_output_directory(output_dir: Path) -> bool:
     return True
 
 
+def check_ports_available() -> bool:
+    """
+    Check if all required test ports are available.
+    Returns True if all ports are free, False otherwise.
+    """
+    import socket
+    
+           # Ports used by the test suite - UPDATED with dedicated ports
+           test_ports = [
+               20010,  # proxy_port
+               20020,  # basic_http (http_simple)
+               20021,  # http_token
+               20022,  # https_simple
+               20023,  # https_token
+               20024,  # mtls_no_roles
+               20025,  # mtls_simple
+               20026,  # mtls_with_roles
+               20005,  # test_proxy_server
+               3006,   # proxy registration
+           ]
+    
+    occupied_ports = []
+    
+    print("🔍 Checking port availability...")
+    for port in test_ports:
+        try:
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
+                sock.settimeout(1)
+                result = sock.connect_ex(('127.0.0.1', port))
+                if result == 0:
+                    occupied_ports.append(port)
+                    print(f"   ❌ Port {port} is occupied")
+                else:
+                    print(f"   ✅ Port {port} is available")
+        except Exception as e:
+            print(f"   ⚠️ Could not check port {port}: {e}")
+            occupied_ports.append(port)
+    
+    if occupied_ports:
+        print(f"\n❌ CRITICAL: {len(occupied_ports)} ports are occupied: {occupied_ports}")
+        print("💡 Please free these ports before running the test suite:")
+        for port in occupied_ports:
+            print(f"   - Port {port}: kill processes using this port")
+        print("\n🔧 You can use these commands to free ports:")
+        for port in occupied_ports:
+            print(f"   fuser -k {port}/tcp")
+        return False
+    
+    print(f"✅ All {len(test_ports)} required ports are available")
+    return True
+
+
 def main() -> int:
     """Main function for command line execution."""
     parser = argparse.ArgumentParser(
@@ -1243,6 +1295,13 @@ def main() -> int:
     )
     args = parser.parse_args()
     
+    # FIRST: Check port availability - if this fails, don't proceed
+    print("🔍 STEP 1: Port Availability Check")
+    if not check_ports_available():
+        print("\n❌ FAILED: Required ports are occupied. Aborting setup.")
+        print("💡 Please free the occupied ports and try again.")
+        return 1
+    
     try:
         # Determine target directory
         if args.output_dir is None:

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.4.32.dist-info → mcp_proxy_adapter-6.4.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.4.32
+Version: 6.4.35
 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
@@ -35,7 +35,7 @@ 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
 Requires-Dist: psutil>=5.9.0
-Requires-Dist: mcp_security_framework>=1.1.2
+Requires-Dist: mcp_security_framework>=1.2.1
 Requires-Dist: packaging>=20.0
 Requires-Dist: aiohttp<4.0.0,>=3.8.0
 Requires-Dist: requests<3.0.0,>=2.28.0

{mcp_proxy_adapter-6.4.32.dist-info → mcp_proxy_adapter-6.4.35.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=G8Mkv1ON69SwlRpVikxEDT03qz6aIVBcCRYSeHSyiik,75
+mcp_proxy_adapter/version.py,sha256=LFDbVSqlv2GQEWrW78mO5mZZoLvzaZLrXBXPzmBBZSs,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=UQ7_m-LbUzKuuPJPxS_69ahANUQ5rnPwoddQ2MMXNkg,33941
 mcp_proxy_adapter/api/handlers.py,sha256=iyFGoEuUS1wxbV1ELA0zmaxIyQR7j4zw-4MrD-uIO6E,8294
@@ -84,7 +84,7 @@ mcp_proxy_adapter/core/unified_config_adapter.py,sha256=zBGYdLDZ3G8f3Y9tmtm0Ne0U
 mcp_proxy_adapter/core/utils.py,sha256=wBdDYBDWQ6zbwrnl9tykHjo0FjJVsLT_x8Bjk1lZX60,3270
 mcp_proxy_adapter/examples/__init__.py,sha256=k1F-EotAFbJ3JvK_rNgiH4bUztmxIWtYn0AfbAZ1ZGs,450
 mcp_proxy_adapter/examples/create_certificates_simple.py,sha256=xoa4VtKzb9y7Mn8VqcK-uH2q7Bf89vrWG6G3LQmhJng,27086
-mcp_proxy_adapter/examples/create_test_configs.py,sha256=lFO27tn0V7fUM7i3xa7liV3a-0nXvm12RXe9AiOLs5g,11545
+mcp_proxy_adapter/examples/create_test_configs.py,sha256=GRCmGM9xXTEz3iB7cq3yH-tJCQHuVxrqu0uHuuSSark,12140
 mcp_proxy_adapter/examples/debug_request_state.py,sha256=Z3Gy2-fWtu7KIV9OkzGDLVz7TpL_h9V_99ica40uQBU,4489
 mcp_proxy_adapter/examples/debug_role_chain.py,sha256=GLVXC2fJUwP8UJnXHchd1t-H53cjWLJI3RqTPrKmaak,8750
 mcp_proxy_adapter/examples/demo_client.py,sha256=en2Rtb70B1sQmhL-vdQ4PDpKNNl_mfll2YCFT_jFCAg,10191
@@ -96,10 +96,10 @@ mcp_proxy_adapter/examples/proxy_registration_example.py,sha256=vemRhftnjbiOBCJk
 mcp_proxy_adapter/examples/run_example.py,sha256=yp-a6HIrSk3ddQmbn0KkuKwErId0aNfj028TE6U-zmY,2626
 mcp_proxy_adapter/examples/run_full_test_suite.py,sha256=HuiNTOey2zwk4KSSgh7l3JZlymMHv2yPTCvX0XNAxCY,19827
 mcp_proxy_adapter/examples/run_proxy_server.py,sha256=SBLSSY2F_VEBQD3MsCE_Pa9xFE6Sszr3vHdE9QOEN4Y,5242
-mcp_proxy_adapter/examples/run_security_tests.py,sha256=0vjaUdWC-rLyviQuNxM3PtfiU9TzSRuxGxWMehrFA_w,23311
+mcp_proxy_adapter/examples/run_security_tests.py,sha256=ePekKblBbrfz5-Xe5hgs5OLL4rSd9QiIUlnm9dER8Bo,24082
 mcp_proxy_adapter/examples/run_security_tests_fixed.py,sha256=2BKMT0_-FhmcZA73hdQOt2XR7Cgb9Sq8qBI88BkwAAA,10934
 mcp_proxy_adapter/examples/security_test_client.py,sha256=K5gEVat1SJS2pBVxqLl5c9-uiiG12k8UT3ULQDXZ2Uc,35713
-mcp_proxy_adapter/examples/setup_test_environment.py,sha256=mzuBgvbkSOCYee5FVvILKmFeL1MU0LYelj6jZoXYsrA,43414
+mcp_proxy_adapter/examples/setup_test_environment.py,sha256=QN_WYiZxQ_XqyX5fAw5-8iaLZSmGGwKon7_tp17ihX8,45654
 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
@@ -121,8 +121,8 @@ mcp_proxy_adapter/examples/full_application/hooks/builtin_command_hooks.py,sha25
 mcp_proxy_adapter/examples/scripts/config_generator.py,sha256=SKFlRRCE_pEHGbfjDuzfKpvV2DMwG6lRfK90uJwRlJM,33410
 mcp_proxy_adapter/examples/scripts/create_certificates_simple.py,sha256=yCWdUIhMSDPwoPhuLR9rhPdf7jLN5hCjzNfYYgVyHnw,27769
 mcp_proxy_adapter/examples/scripts/generate_certificates_and_tokens.py,sha256=hUCoJH3fy5WeR_YMHj-_W0mR0ZKUWqewH4FVN3yWyrM,17972
-mcp_proxy_adapter-6.4.32.dist-info/METADATA,sha256=l7MvcMPoyBl-F3SMW31RQYnRb0OlIYK0Ejig1AkavBo,6087
-mcp_proxy_adapter-6.4.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.4.32.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.4.32.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.4.32.dist-info/RECORD,,
+mcp_proxy_adapter-6.4.35.dist-info/METADATA,sha256=wkUzSe0jyswNRF0JTkDouQG4d091T7zgzvAm8v4MMvk,6087
+mcp_proxy_adapter-6.4.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.4.35.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.4.35.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.4.35.dist-info/RECORD,,