mcp-proxy-adapter 6.3.15__py3-none-any.whl → 6.3.17__py3-none-any.whl

mcp_proxy_adapter/api/middleware/protocol_middleware.py

@@ -144,56 +144,71 @@ class ProtocolMiddleware(BaseHTTPMiddleware):
         Returns:
             Protocol name (http, https, mtls)
         """
-        # Check if request is secure (HTTPS)
-        if request.url.scheme:
-            scheme = request.url.scheme.lower()
-
-            # If HTTPS, check if client certificate is provided (MTLS)
-            if scheme == "https":
-                # Check for client certificate in ASGI scope
-                try:
-                    # Method 1: Check transport info in ASGI scope
-                    if hasattr(request, "scope"):
-                        # Check for client certificate in transport layer
-                        transport = request.scope.get("transport")
-                        if transport and hasattr(transport, "get_extra_info"):
-                            ssl_object = transport.get_extra_info("ssl_object")
-                            if ssl_object:
+        try:
+            # Check if request is secure (HTTPS)
+            if request.url.scheme:
+                scheme = request.url.scheme.lower()
+
+                # If HTTPS, check if client certificate is provided (MTLS)
+                if scheme == "https":
+                    # Check for client certificate in ASGI scope
+                    try:
+                        # Method 1: Check transport info in ASGI scope
+                        if hasattr(request, "scope") and request.scope:
+                            # Check for client certificate in transport layer
+                            transport = request.scope.get("transport")
+                            if transport and hasattr(transport, "get_extra_info"):
                                 try:
-                                    cert = ssl_object.getpeercert()
-                                    if cert:
-                                        logger.debug(f"mTLS client certificate detected: {cert.get('subject', 'unknown')}")
-                                        return "mtls"
+                                    ssl_object = transport.get_extra_info("ssl_object")
+                                    if ssl_object:
+                                        try:
+                                            cert = ssl_object.getpeercert()
+                                            if cert:
+                                                logger.debug(f"mTLS client certificate detected: {cert.get('subject', 'unknown')}")
+                                                return "mtls"
+                                        except Exception as e:
+                                            logger.debug(f"Error checking client certificate: {e}")
                                 except Exception as e:
-                                    logger.debug(f"Error checking client certificate: {e}")
-                        
-                        # Method 2: Check client info in ASGI scope
-                        client_info = request.scope.get("client")
-                        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}")
-                except Exception as e:
-                    logger.debug(f"Error checking ASGI scope for mTLS: {e}")
-
-                # Check for client certificate in headers (proxy forwarded)
-                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")
-                    return "mtls"
-
-                return "https"
-
-            return scheme
-
-        # Fallback to checking headers
-        if request.headers.get("x-forwarded-proto"):
-            return request.headers.get("x-forwarded-proto").lower()
-
-        # Default to HTTP
-        return "http"
+                                    logger.debug(f"Error getting SSL object from transport: {e}")
+                            
+                            # Method 2: Check client info in ASGI scope
+                            try:
+                                client_info = request.scope.get("client")
+                                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}")
+                            except Exception as e:
+                                logger.debug(f"Error checking client info: {e}")
+                    except Exception as e:
+                        logger.debug(f"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")
+                            return "mtls"
+                    except Exception as e:
+                        logger.debug(f"Error checking headers for mTLS: {e}")
+
+                    return "https"
+
+                return scheme
+
+            # Fallback to checking headers
+            if request.headers.get("x-forwarded-proto"):
+                return request.headers.get("x-forwarded-proto").lower()
+
+            # Default to HTTP
+            return "http"
+            
+        except Exception as e:
+            logger.error(f"Error in _get_request_protocol: {e}", exc_info=True)
+            # Fallback to HTTP if there's any error
+            return "http"
 
 
 def setup_protocol_middleware(app, app_config: Optional[Dict[str, Any]] = None):

mcp_proxy_adapter/api/middleware/user_info_middleware.py

@@ -69,8 +69,13 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                 # Initialize PermissionManager only if permissions are enabled
                 if permissions_enabled:
                     # Create PermissionConfig for mcp_security_framework
+                    roles_file = permissions_config.get("roles_file")
+                    if roles_file is None:
+                        logger.warning("⚠️ Permissions enabled but no roles_file specified, using default configuration")
+                        roles_file = None
+                    
                     mcp_permission_config = PermissionConfig(
-                        roles_file=permissions_config.get("roles_file"),
+                        roles_file=roles_file,
                         default_role=permissions_config.get("default_role", "guest"),
                         admin_role=permissions_config.get("admin_role", "admin"),
                         role_hierarchy=permissions_config.get("role_hierarchy", {}),

mcp_proxy_adapter/commands/command_registry.py

@@ -701,8 +701,11 @@ class CommandRegistry:
         try:
             from mcp_proxy_adapter.core.protocol_manager import protocol_manager
 
-            protocol_manager.reload_config()
-            logger.info("✅ Protocol manager configuration reloaded")
+            if protocol_manager is not None:
+                protocol_manager.reload_config()
+                logger.info("✅ Protocol manager configuration reloaded")
+            else:
+                logger.debug("ℹ️ Protocol manager is None, skipping reload")
         except Exception as e:
             logger.error(f"❌ Failed to reload protocol manager: {e}")
 

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.3.15.dist-info → mcp_proxy_adapter-6.3.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.3.15
+Version: 6.3.17
 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.15.dist-info → mcp_proxy_adapter-6.3.17.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=qDkQTXnCvf8u0I3b8PRrguOoVdjd8YRr90ZooOqeOto,3401
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=eZgm70dmQaqLFI_hiC0Ugo48RkiATEeFmPJdbVe1uDU,75
+mcp_proxy_adapter/version.py,sha256=7s-m3bl78elkxdrre9mOD4a3U_658vsNYHd4baGv7QY,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=22NIDGo6pGkOZnvBWeKv_-RIRye4YaYkIskVGIsCCMs,28600
 mcp_proxy_adapter/api/handlers.py,sha256=iyFGoEuUS1wxbV1ELA0zmaxIyQR7j4zw-4MrD-uIO6E,8294
@@ -18,10 +18,10 @@ mcp_proxy_adapter/api/middleware/error_handling.py,sha256=i3oghY1VdjHppFa7bTIx87
 mcp_proxy_adapter/api/middleware/factory.py,sha256=r0BXntUOxF6DiCVqqmAUb3JjargdR28aj2d9X5z-zX4,7987
 mcp_proxy_adapter/api/middleware/logging.py,sha256=AGv9lqfkTOCVJxYKflLghe1cd4kVPMLO1ni5E2FQBlk,4840
 mcp_proxy_adapter/api/middleware/performance.py,sha256=-EvA7YIcTlxn8RuxlWlScJvX2EIoeEp3P5dKVWZHYRY,2357
-mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=61HFAi8hkauKJCSk_s9l672ZbwrzIT0Wj4u3YF8eYLU,10104
+mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=zm-Q0KnCzbAB3ue8dwnEkb-OyCuIbqu01s2_GE2rtH0,11094
 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=A3liNzkZWDDlkDSBBoz8lH9fTLKlOQc_oI_M_dIGHx4,9330
+mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=ttqXM5fVJsW72-ShZxer5rq1g8Qw0NJUOptOItqHvUs,9606
 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
@@ -29,7 +29,7 @@ mcp_proxy_adapter/commands/builtin_commands.py,sha256=8kYLWIr4JvhZtqaVM9Jhqr_-yS
 mcp_proxy_adapter/commands/catalog_manager.py,sha256=1DLvjt9RVMmeNZyynd-frk8gYkdgGJYyBXg6uWTJ16k,34873
 mcp_proxy_adapter/commands/cert_monitor_command.py,sha256=phSms8EYOn1RqSp7na6jw0S1bLRrilmYZIFXVepVFyU,23687
 mcp_proxy_adapter/commands/certificate_management_command.py,sha256=TDoGV2mnEz1HaJiHsxAO_IvtSinVwp0s_av5oIgmRqk,23225
-mcp_proxy_adapter/commands/command_registry.py,sha256=JBtxkNrJZj9CYhRV5kYx6XbABwoaJbhVVtENCMh0jRs,35136
+mcp_proxy_adapter/commands/command_registry.py,sha256=abQPOAzS_zIj4SPsOxsZeQS9pjLxyzlMUt9kI_AYT7E,35288
 mcp_proxy_adapter/commands/config_command.py,sha256=PWX1OhKAmjlc8CSy4-sImdvGeSNgDNyv30Y-P5iZp9g,3767
 mcp_proxy_adapter/commands/dependency_container.py,sha256=mvPob62lQ-mKRbAA9aL3L5gOT9_4V2Vy2cGoup2S840,3239
 mcp_proxy_adapter/commands/dependency_manager.py,sha256=JWdmQ0de6rQAv8GYDToFIlpomBBXqT61XMygWcggYSQ,7366
@@ -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.15.dist-info/METADATA,sha256=bpdIPCx51rPp6PN2gP9f66j_JxiDM7v_mLVZSBVNq_o,22266
-mcp_proxy_adapter-6.3.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.3.15.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.3.15.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
-mcp_proxy_adapter-6.3.15.dist-info/RECORD,,
+mcp_proxy_adapter-6.3.17.dist-info/METADATA,sha256=RSVotDjUk4ak77PfaUnNeJSh0JUb9dG2NlHaUIrCyBo,22266
+mcp_proxy_adapter-6.3.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.3.17.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.3.17.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
+mcp_proxy_adapter-6.3.17.dist-info/RECORD,,