mcp-proxy-adapter 6.3.22__py3-none-any.whl → 6.3.23__py3-none-any.whl

mcp_proxy_adapter/api/middleware/protocol_middleware.py

@@ -98,19 +98,25 @@ class ProtocolMiddleware(BaseHTTPMiddleware):
             Response object
         """
         logger.debug(
-            f"ProtocolMiddleware.dispatch called for {request.method} {request.url.path}"
+            f"🔍 ProtocolMiddleware.dispatch START for {request.method} {request.url.path}"
         )
+        logger.debug(f"🔍 ProtocolMiddleware - protocols.enabled: {self.protocol_manager.enabled}")
+        logger.debug(f"🔍 ProtocolMiddleware - allowed_protocols: {self.protocol_manager.allowed_protocols}")
+        
         try:
             # Get protocol from request
             protocol = self._get_request_protocol(request)
-            logger.debug(f"Detected protocol: {protocol} for {request.method} {request.url.path}")
-            logger.debug(f"Request scheme: {request.url.scheme}")
-            logger.debug(f"Request headers: {dict(request.headers)}")
+            logger.debug(f"🔍 ProtocolMiddleware - Detected protocol: {protocol} for {request.method} {request.url.path}")
+            logger.debug(f"🔍 ProtocolMiddleware - Request scheme: {request.url.scheme}")
+            logger.debug(f"🔍 ProtocolMiddleware - Request headers: {dict(request.headers)}")
 
             # Check if protocol is allowed
-            if not self.protocol_manager.is_protocol_allowed(protocol):
+            is_allowed = self.protocol_manager.is_protocol_allowed(protocol)
+            logger.debug(f"🔍 ProtocolMiddleware - Protocol '{protocol}' allowed: {is_allowed}")
+            
+            if not is_allowed:
                 logger.warning(
-                    f"Protocol '{protocol}' not allowed for request to {request.url.path}"
+                    f"❌ ProtocolMiddleware - Protocol '{protocol}' not allowed for request to {request.url.path}"
                 )
                 return JSONResponse(
                     status_code=403,
@@ -122,13 +128,15 @@ class ProtocolMiddleware(BaseHTTPMiddleware):
                 )
 
             # Continue processing
-            logger.debug(f"Protocol '{protocol}' allowed, continuing to next middleware/handler")
+            logger.debug(f"✅ ProtocolMiddleware - Protocol '{protocol}' allowed, continuing to next middleware/handler")
+            logger.debug(f"🔍 ProtocolMiddleware - About to call next handler")
             response = await call_next(request)
-            logger.debug(f"Protocol middleware completed successfully for {request.method} {request.url.path}")
+            logger.debug(f"✅ ProtocolMiddleware - Next handler completed with status: {response.status_code}")
+            logger.debug(f"✅ ProtocolMiddleware - Protocol middleware completed successfully for {request.method} {request.url.path}")
             return response
 
         except Exception as e:
-            logger.error(f"Protocol middleware error: {e}", exc_info=True)
+            logger.error(f"❌ ProtocolMiddleware - Protocol middleware error: {e}", exc_info=True)
             return JSONResponse(
                 status_code=500,
                 content={"error": "Protocol validation error", "message": str(e)},
@@ -144,32 +152,47 @@ class ProtocolMiddleware(BaseHTTPMiddleware):
         Returns:
             Protocol name (http, https, mtls)
         """
+        logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol START")
+        logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - request.url.scheme: {request.url.scheme}")
+        
         try:
             # Check if request is secure (HTTPS)
             if request.url.scheme:
                 scheme = request.url.scheme.lower()
+                logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - scheme: {scheme}")
 
                 # If HTTPS, check if client certificate is provided (MTLS)
                 if scheme == "https":
+                    logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - HTTPS detected, checking for mTLS")
+                    
                     # Check for client certificate in ASGI scope
                     try:
                         # Method 1: Check transport info in ASGI scope
                         if hasattr(request, "scope") and request.scope:
+                            logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - ASGI scope available")
                             # Check for client certificate in transport layer
                             transport = request.scope.get("transport")
                             if transport and hasattr(transport, "get_extra_info"):
+                                logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - transport available, checking SSL object")
                                 try:
                                     ssl_object = transport.get_extra_info("ssl_object")
                                     if ssl_object:
+                                        logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - SSL object available, checking peer cert")
                                         try:
                                             cert = ssl_object.getpeercert()
                                             if cert:
-                                                logger.debug(f"mTLS client certificate detected: {cert.get('subject', 'unknown')}")
+                                                logger.debug(f"✅ ProtocolMiddleware._get_request_protocol - mTLS client certificate detected: {cert.get('subject', 'unknown')}")
                                                 return "mtls"
+                                            else:
+                                                logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - No peer certificate found")
                                         except Exception as e:
-                                            logger.debug(f"Error checking client certificate: {e}")
+                                            logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Error checking client certificate: {e}")
+                                    else:
+                                        logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - No SSL object found")
                                 except Exception as e:
-                                    logger.debug(f"Error getting SSL object from transport: {e}")
+                                    logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Error getting SSL object from transport: {e}")
+                            else:
+                                logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - No transport or get_extra_info method")
                             
                             # Method 2: Check client info in ASGI scope
                             try:
@@ -177,36 +200,50 @@ class ProtocolMiddleware(BaseHTTPMiddleware):
                                 if client_info and len(client_info) > 2:
                                     # client_info format: (host, port, additional_info...)
                                     # Additional info might contain certificate information
-                                    logger.debug(f"Client info detected, might be mTLS: {client_info}")
+                                    logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Client info detected, might be mTLS: {client_info}")
+                                else:
+                                    logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Client info: {client_info}")
                             except Exception as e:
-                                logger.debug(f"Error checking client info: {e}")
+                                logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Error checking client info: {e}")
+                        else:
+                            logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - No ASGI scope available")
                     except Exception as e:
-                        logger.debug(f"Error checking ASGI scope for mTLS: {e}")
+                        logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Error checking ASGI scope for mTLS: {e}")
 
                     # Check for client certificate in headers (proxy forwarded)
                     try:
-                        if (request.headers.get("ssl-client-cert") or 
-                            request.headers.get("x-client-cert") or
-                            request.headers.get("x-ssl-cert") or
-                            request.headers.get("x-forwarded-client-cert")):
-                            logger.debug("mTLS client certificate detected in headers")
+                        mtls_headers = [
+                            request.headers.get("ssl-client-cert"),
+                            request.headers.get("x-client-cert"),
+                            request.headers.get("x-ssl-cert"),
+                            request.headers.get("x-forwarded-client-cert")
+                        ]
+                        if any(mtls_headers):
+                            logger.debug(f"✅ ProtocolMiddleware._get_request_protocol - mTLS client certificate detected in headers")
                             return "mtls"
+                        else:
+                            logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - No mTLS headers found")
                     except Exception as e:
-                        logger.debug(f"Error checking headers for mTLS: {e}")
+                        logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Error checking headers for mTLS: {e}")
 
+                    logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Returning 'https' (no mTLS detected)")
                     return "https"
 
+                logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Returning scheme: {scheme}")
                 return scheme
 
             # Fallback to checking headers
-            if request.headers.get("x-forwarded-proto"):
-                return request.headers.get("x-forwarded-proto").lower()
+            x_forwarded_proto = request.headers.get("x-forwarded-proto")
+            if x_forwarded_proto:
+                logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Using x-forwarded-proto: {x_forwarded_proto}")
+                return x_forwarded_proto.lower()
 
             # Default to HTTP
+            logger.debug(f"🔍 ProtocolMiddleware._get_request_protocol - Defaulting to 'http'")
             return "http"
             
         except Exception as e:
-            logger.error(f"Error in _get_request_protocol: {e}", exc_info=True)
+            logger.error(f"❌ ProtocolMiddleware._get_request_protocol - Error: {e}", exc_info=True)
             # Fallback to HTTP if there's any error
             return "http"
 

mcp_proxy_adapter/core/protocol_manager.py

@@ -160,14 +160,18 @@ class ProtocolManager:
         Returns:
             True if protocol is allowed, False otherwise
         """
+        logger.debug(f"🔍 ProtocolManager.is_protocol_allowed - protocol: {protocol}")
+        logger.debug(f"🔍 ProtocolManager.is_protocol_allowed - enabled: {self.enabled}")
+        logger.debug(f"🔍 ProtocolManager.is_protocol_allowed - allowed_protocols: {self.allowed_protocols}")
+        
         if not self.enabled:
-            logger.debug("Protocol management is disabled, allowing all protocols")
+            logger.debug("✅ ProtocolManager.is_protocol_allowed - Protocol management is disabled, allowing all protocols")
             return True
 
         protocol_lower = protocol.lower()
         is_allowed = protocol_lower in self.allowed_protocols
 
-        logger.debug(f"Protocol '{protocol}' allowed: {is_allowed}")
+        logger.debug(f"🔍 ProtocolManager.is_protocol_allowed - Protocol '{protocol}' allowed: {is_allowed}")
         return is_allowed
 
     def get_protocol_port(self, protocol: str) -> Optional[int]:

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.3.22.dist-info → mcp_proxy_adapter-6.3.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.3.22
+Version: 6.3.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.3.22.dist-info → mcp_proxy_adapter-6.3.23.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=LoepnC3yoCK-S-sNntpi33Js6H0zhCp1nuQ-NcSXoNw,3656
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=l2ln4rN1GYmXKKSn3i7mIS_ofjhJYyapKnbp74PtWHA,75
+mcp_proxy_adapter/version.py,sha256=AXsJFeJCfu8pwHEkazFV-fjEHQwdgjswIDoJv45-fak,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=Ayvk_WsWuDkjYkKCzUB1ImCVINYnxzkGIgKE50UkqRY,29215
 mcp_proxy_adapter/api/handlers.py,sha256=iyFGoEuUS1wxbV1ELA0zmaxIyQR7j4zw-4MrD-uIO6E,8294
@@ -18,7 +18,7 @@ mcp_proxy_adapter/api/middleware/error_handling.py,sha256=bXui9rUn4Gem3PoXuxldSB
 mcp_proxy_adapter/api/middleware/factory.py,sha256=r0BXntUOxF6DiCVqqmAUb3JjargdR28aj2d9X5z-zX4,7987
 mcp_proxy_adapter/api/middleware/logging.py,sha256=iME87hrbvyTjI-RJro5Cwao7VlHUIuWubpVUabv-s1M,5229
 mcp_proxy_adapter/api/middleware/performance.py,sha256=-EvA7YIcTlxn8RuxlWlScJvX2EIoeEp3P5dKVWZHYRY,2357
-mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=zm-Q0KnCzbAB3ue8dwnEkb-OyCuIbqu01s2_GE2rtH0,11094
+mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=pM-VvsYzE8jiyn0kcehvZzg1UfJW38UemNMcp7xoT-w,14651
 mcp_proxy_adapter/api/middleware/transport_middleware.py,sha256=VG1rWyuh-O2pdc0kQ3SADFvyh286o5Wrnkt8OFQ0WQw,4274
 mcp_proxy_adapter/api/middleware/unified_security.py,sha256=PMbJxVzGNlb-IPAqvIeEo1st-jykYX9Mns6lXIfdtAE,7764
 mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=94oItW3uyNhLvp6p1Sl7EhY_gC4MqrbR9KyAJWreTwk,10326
@@ -67,7 +67,7 @@ mcp_proxy_adapter/core/errors.py,sha256=UNEfdmK0zPGJrWH1zUMRjHIJMcoVDcBO4w8xxKHB
 mcp_proxy_adapter/core/logging.py,sha256=gNI6vfPQC7jrUtVu6NeDsmU72JPlrRRBhtJipL1eVrI,9560
 mcp_proxy_adapter/core/mtls_asgi.py,sha256=tvk0P9024s18dcCHY9AaQIecT4ojOTv21EuQWXwooU0,5200
 mcp_proxy_adapter/core/mtls_asgi_app.py,sha256=DT_fTUH1RkvBa3ThbyCyNb-XUHyCb4DqaKA1gcZC6z4,6538
-mcp_proxy_adapter/core/protocol_manager.py,sha256=FM01lBDxUU-W7P8sQR72Jel1aB2nbp1PvO4TRoZ5c_Y,14881
+mcp_proxy_adapter/core/protocol_manager.py,sha256=3sWOAiMniQY5nu9CHkitIOGN4CXH28hOTwY92D0yasM,15268
 mcp_proxy_adapter/core/proxy_client.py,sha256=XweRXBNbntJ5UYdSxUDcOYmJY0jbsKbfdWC0Jw72wdQ,23039
 mcp_proxy_adapter/core/proxy_registration.py,sha256=HzcYay7V0lPgHdmHa980e9HiRGNvFpwPaure1fULiGk,25610
 mcp_proxy_adapter/core/role_utils.py,sha256=YwRenGoXI5YrHVbFjKFAH2DJs2miyqhcr9LWF7mxieg,12284
@@ -137,8 +137,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.3.22.dist-info/METADATA,sha256=p1HyxQikJHF2KV0iqmvGMF3ipXX_BcaQYQpyk5Otzl8,22266
-mcp_proxy_adapter-6.3.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.3.22.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.3.22.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
-mcp_proxy_adapter-6.3.22.dist-info/RECORD,,
+mcp_proxy_adapter-6.3.23.dist-info/METADATA,sha256=ANw-yWKRXnyrro6xp_eYtwxIvqlCasWLQ1KLj-IIibI,22266
+mcp_proxy_adapter-6.3.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.3.23.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.3.23.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
+mcp_proxy_adapter-6.3.23.dist-info/RECORD,,