mcp-proxy-adapter 6.3.14__py3-none-any.whl → 6.3.16__py3-none-any.whl

mcp_proxy_adapter/api/middleware/protocol_middleware.py

@@ -103,6 +103,9 @@ class ProtocolMiddleware(BaseHTTPMiddleware):
         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)}")
 
             # Check if protocol is allowed
             if not self.protocol_manager.is_protocol_allowed(protocol):
@@ -119,11 +122,13 @@ class ProtocolMiddleware(BaseHTTPMiddleware):
                 )
 
             # Continue processing
+            logger.debug(f"Protocol '{protocol}' allowed, continuing to next middleware/handler")
             response = await call_next(request)
+            logger.debug(f"Protocol middleware completed successfully for {request.method} {request.url.path}")
             return response
 
         except Exception as e:
-            logger.error(f"Protocol middleware error: {e}")
+            logger.error(f"Protocol middleware error: {e}", exc_info=True)
             return JSONResponse(
                 status_code=500,
                 content={"error": "Protocol validation error", "message": str(e)},
@@ -139,39 +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 headers or SSL context
-                if hasattr(request, "scope") and "ssl" in request.scope:
-                    ssl_context = request.scope.get("ssl")
-                    if ssl_context and hasattr(ssl_context, "getpeercert"):
-                        try:
-                            cert = ssl_context.getpeercert()
-                            if cert:
-                                return "mtls"
-                        except:
-                            pass
-
-                # Check for client certificate in headers
-                if request.headers.get("ssl-client-cert") or request.headers.get(
-                    "x-client-cert"
-                ):
-                    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"
+        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:
+                                    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 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/version.py

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

{mcp_proxy_adapter-6.3.14.dist-info → mcp_proxy_adapter-6.3.16.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.3.14
+Version: 6.3.16
 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
 Author-email: Vasiliy Zdanovskiy <vasilyvz@gmail.com>
 Maintainer-email: Vasiliy Zdanovskiy <vasilyvz@gmail.com>
+License: MIT
 Project-URL: Homepage, https://github.com/maverikod/mcp-proxy-adapter
 Project-URL: Documentation, https://github.com/maverikod/mcp-proxy-adapter#readme
 Project-URL: Source, https://github.com/maverikod/mcp-proxy-adapter
@@ -14,7 +15,6 @@ Project-URL: PyPI, https://pypi.org/project/mcp-proxy-adapter/
 Keywords: json-rpc,microservices,fastapi,security,authentication,authorization,proxy,mcp,mtls,ssl,rest,api
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -27,7 +27,6 @@ Classifier: Topic :: Security
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: fastapi<1.0.0,>=0.95.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: hypercorn<1.0.0,>=0.15.0
@@ -53,7 +52,6 @@ Requires-Dist: httpx>=0.24.0; extra == "test"
 Requires-Dist: pytest-mock>=3.10.0; extra == "test"
 Dynamic: author
 Dynamic: home-page
-Dynamic: license-file
 Dynamic: requires-python
 
 # MCP Proxy Adapter

{mcp_proxy_adapter-6.3.14.dist-info → mcp_proxy_adapter-6.3.16.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=MVfIeHEccRPPVwIvZE06OOoj8ARRyWOlAwfPcn9D8gY,75
+mcp_proxy_adapter/version.py,sha256=pf4_y_pbHzVAUiMXhbiLW3FJHLCg0pslVHNa-MDrJkE,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,7 +18,7 @@ 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=dPNYdJ77qD7C7HyjHtH9cknJejrdeyTtvFRtlqlS9C8,8333
+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
@@ -136,10 +136,9 @@ mcp_proxy_adapter/examples/scripts/generate_certificates_and_tokens.py,sha256=hU
 mcp_proxy_adapter/schemas/base_schema.json,sha256=v9G9cGMd4dRhCZsOQ_FMqOi5VFyVbI6Cf3fyIvOT9dc,2881
 mcp_proxy_adapter/schemas/openapi_schema.json,sha256=C3yLkwmDsvnLW9B5gnKKdBGl4zxkeU-rEmjTrNVsQU0,8405
 mcp_proxy_adapter/utils/config_generator.py,sha256=UXxuxxAyKTesAS3DOofQ26e20v771inA7EfBV8PZD1c,47543
-mcp_proxy_adapter-6.3.14.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
 mcp_proxy_adapter_issue_package/demonstrate_issue.py,sha256=O54fwWQvUAjEGiHhQGm1JLnARkhVCwAqjBk_89HyRbY,7894
-mcp_proxy_adapter-6.3.14.dist-info/METADATA,sha256=rLsXqMhDpbDRKpHcUitRcvI0bZTeD9MaBFdZJap0vQs,22348
-mcp_proxy_adapter-6.3.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.3.14.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.3.14.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
-mcp_proxy_adapter-6.3.14.dist-info/RECORD,,
+mcp_proxy_adapter-6.3.16.dist-info/METADATA,sha256=MbTaIC1gffjPJw8WnlLRi2EbvWVGCZy_2xQOCsgyw9E,22266
+mcp_proxy_adapter-6.3.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.3.16.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.3.16.dist-info/top_level.txt,sha256=CHk-Mc-AxjO-tRheegA2qLiQnU4vZRnxuTF81So6SAc,50
+mcp_proxy_adapter-6.3.16.dist-info/RECORD,,

mcp_proxy_adapter-6.3.14.dist-info/licenses/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Vasiliy Zdanovskiy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.