mcp-proxy-adapter 6.4.29__py3-none-any.whl → 6.4.33__py3-none-any.whl

mcp_proxy_adapter/api/middleware/user_info_middleware.py

@@ -119,12 +119,16 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                 logger.warning(f"⚠️ Failed to initialize AuthManager: {e}")
                 self._security_available = False
 
+        # Always initialize api_keys for fallback
+        security_config = config.get("security", {})
+        auth_config = security_config.get("auth", {})
+        self.api_keys = auth_config.get("api_keys", {})
+        
         if not self._security_available:
             # Fallback to basic API key handling
-            security_config = config.get("security", {})
-            auth_config = security_config.get("auth", {})
-            self.api_keys = auth_config.get("api_keys", {})
             logger.info("ℹ️ User info middleware initialized with basic auth")
+        else:
+            logger.info("ℹ️ User info middleware initialized with mcp_security_framework (fallback enabled)")
 
     async def dispatch(
         self, request: Request, call_next: Callable[[Request], Awaitable[Response]]
@@ -190,9 +194,15 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
 
             if not self._security_available:
                 # Fallback to basic API key handling
-                if api_key in getattr(self, "api_keys", {}):
-                    user_role = self.api_keys[api_key]
-
+                api_keys_dict = getattr(self, "api_keys", {})
+                # Find role by API key value (not key)
+                user_role = None
+                for role, key_value in api_keys_dict.items():
+                    if key_value == api_key:
+                        user_role = role
+                        break
+                
+                if user_role:
                     # Get permissions for this role from roles file if available
                     role_permissions = ["read"]  # default permissions
                     if (
@@ -211,10 +221,9 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                         "roles": [user_role],
                         "permissions": role_permissions,
                     }
-
                     logger.debug(
-                        f"✅ Authenticated user with basic auth: "
-                        f"{request.state.user}"
+                        f"✅ User authenticated with API key: "
+                        f"{api_key[:8]}..."
                     )
                 else:
                     # API key not found

mcp_proxy_adapter/examples/setup_test_environment.py

@@ -1220,6 +1220,66 @@ 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
+    test_ports = [
+        20000,  # basic_http
+        20001,  # http_token  
+        20002,  # https_simple
+        20003,  # https_token
+        20004,  # mtls_no_roles
+        20005,  # test_proxy_server
+        20010,  # proxy_port
+        20020,  # base_port (run_security_tests)
+        20021,  # base_port + 1
+        20022,  # base_port + 2
+        20023,  # base_port + 3
+        20024,  # base_port + 4
+        20025,  # base_port + 5
+        20026,  # base_port + 6
+        20027,  # base_port + 7
+        20028,  # base_port + 8
+        20029,  # base_port + 9
+        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 +1303,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.29"
+__version__ = "6.4.33"

{mcp_proxy_adapter-6.4.29.dist-info → mcp_proxy_adapter-6.4.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.4.29
+Version: 6.4.33
 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.4.29.dist-info → mcp_proxy_adapter-6.4.33.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=_Ft3HY-ks1Af91HKsRoUz5AptexN-vmrrnd8bGpiUIE,75
+mcp_proxy_adapter/version.py,sha256=GtHZWT-co51a-_pBWoXT4OwHOOqgr0GLuUVnIggLNo8,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
@@ -21,7 +21,7 @@ mcp_proxy_adapter/api/middleware/performance.py,sha256=-EvA7YIcTlxn8RuxlWlScJvX2
 mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=lFqGuT5M-USCTIVvZMH6Fgh3hxQNAmAoDeyYOBPpcbk,9161
 mcp_proxy_adapter/api/middleware/transport_middleware.py,sha256=VG1rWyuh-O2pdc0kQ3SADFvyh286o5Wrnkt8OFQ0WQw,4274
 mcp_proxy_adapter/api/middleware/unified_security.py,sha256=qjNPOCusMimXjEtjwyG6CgFieLm2T7O2e2QghqE_s3M,8313
-mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=sUHHyy33xvZKRDtOWfzbndrIxDYLUFeVYfUbPIKawR8,10652
+mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=-N6cZOc7z6FUE7xRZ8xGgI4PnMyrJq0Jzpde9VNq6Zs,11077
 mcp_proxy_adapter/commands/__init__.py,sha256=eStfu2UrLfMvMTY6x20GD8sMPmPB1so-0QZQYV53nqo,1565
 mcp_proxy_adapter/commands/auth_validation_command.py,sha256=p4UrAaHyoCxMy98G1BUUlFJWjoelEJzX3OAWIiQaGls,14593
 mcp_proxy_adapter/commands/base.py,sha256=0_hu8t89-2vWBPFpEMokr27A-IifKI32rkQwZfc2Grk,15162
@@ -99,7 +99,7 @@ mcp_proxy_adapter/examples/run_proxy_server.py,sha256=SBLSSY2F_VEBQD3MsCE_Pa9xFE
 mcp_proxy_adapter/examples/run_security_tests.py,sha256=0vjaUdWC-rLyviQuNxM3PtfiU9TzSRuxGxWMehrFA_w,23311
 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=Y3r8uxzNfo7nLpw9rwHZuzKYWOqMym6UHG5m4SudqXw,45793
 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.29.dist-info/METADATA,sha256=wiiYSkBH4CbFZWcXLsxMnfRjk0-4VNBg_y1HRVN3-Mg,6087
-mcp_proxy_adapter-6.4.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.4.29.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.4.29.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.4.29.dist-info/RECORD,,
+mcp_proxy_adapter-6.4.33.dist-info/METADATA,sha256=mrJve7fFsMkLeo92k7A5-OcOiV7Mb9vzA8_Ydw9puh4,6087
+mcp_proxy_adapter-6.4.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.4.33.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.4.33.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.4.33.dist-info/RECORD,,