mcp-proxy-adapter 6.2.32__py3-none-any.whl → 6.2.34__py3-none-any.whl

mcp_proxy_adapter/api/middleware/user_info_middleware.py

@@ -8,8 +8,7 @@ Author: Vasiliy Zdanovskiy
 email: vasilyvz@gmail.com
 """
 
-import logging
-from typing import Dict, Any, Optional, Callable, Awaitable
+from typing import Dict, Any, Callable, Awaitable
 from fastapi import Request, Response
 from starlette.middleware.base import BaseHTTPMiddleware
 
@@ -17,23 +16,25 @@ from mcp_proxy_adapter.core.logging import logger
 
 # Import mcp_security_framework components
 try:
-    from mcp_security_framework import AuthManager
-    from mcp_security_framework.schemas.config import AuthConfig
+    from mcp_security_framework import AuthManager, PermissionManager
+    from mcp_security_framework.schemas.config import (
+        AuthConfig, PermissionConfig
+    )
     _MCP_SECURITY_AVAILABLE = True
     print("✅ mcp_security_framework available in middleware")
 except ImportError:
     _MCP_SECURITY_AVAILABLE = False
-    print("⚠️ mcp_security_framework not available in middleware, using basic auth")
+    print("⚠️ mcp_security_framework not available in middleware, "
+          "using basic auth")
 
 
 class UserInfoMiddleware(BaseHTTPMiddleware):
     """
     Middleware for setting user information in request.state.
-    
+
     This middleware extracts user information from authentication headers
     and sets it in request.state for use by commands.
     """
-    
     def __init__(self, app, config: Dict[str, Any]):
         """
         Initialize user info middleware.
@@ -54,6 +55,7 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                 # Get API keys configuration
                 security_config = config.get("security", {})
                 auth_config = security_config.get("auth", {})
+                permissions_config = security_config.get("permissions", {})
 
                 # Create AuthConfig for mcp_security_framework
                 mcp_auth_config = AuthConfig(
@@ -62,8 +64,34 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                     api_keys=auth_config.get("api_keys", {})
                 )
 
-                self.auth_manager = AuthManager(mcp_auth_config)
-                logger.info("✅ User info middleware initialized with mcp_security_framework")
+                # Create PermissionConfig for mcp_security_framework
+                mcp_permission_config = PermissionConfig(
+                    roles_file=permissions_config.get("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", {}),
+                    permission_cache_enabled=permissions_config.get(
+                        "permission_cache_enabled", True
+                    ),
+                    permission_cache_ttl=permissions_config.get(
+                        "permission_cache_ttl", 300
+                    ),
+                    wildcard_permissions=permissions_config.get(
+                        "wildcard_permissions", False
+                    ),
+                    strict_mode=permissions_config.get("strict_mode", True),
+                    roles=permissions_config.get("roles", {})
+                )
+
+                # Initialize PermissionManager first
+                self.permission_manager = PermissionManager(mcp_permission_config)
+
+                # Initialize AuthManager with permission_manager
+                self.auth_manager = AuthManager(
+                    mcp_auth_config, self.permission_manager
+                )
+                logger.info("✅ User info middleware initialized with "
+                            "mcp_security_framework")
             except Exception as e:
                 logger.warning(f"⚠️ Failed to initialize AuthManager: {e}")
                 self._security_available = False
@@ -74,21 +102,23 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
             auth_config = security_config.get("auth", {})
             self.api_keys = auth_config.get("api_keys", {})
             logger.info("ℹ️ User info middleware initialized with basic auth")
-    
-    async def dispatch(self, request: Request, call_next: Callable[[Request], Awaitable[Response]]) -> Response:
+
+    async def dispatch(
+        self, request: Request,
+        call_next: Callable[[Request], Awaitable[Response]]
+    ) -> Response:
         """
         Process request and set user info in request.state.
-        
+
         Args:
             request: Request object
             call_next: Next handler
-            
+
         Returns:
             Response object
         """
         # Extract API key from headers
         api_key = request.headers.get("X-API-Key")
-        
         if api_key:
             if self.auth_manager and self._security_available:
                 try:
@@ -99,11 +129,16 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                         # Set user info from AuthManager result
                         request.state.user = {
                             "id": api_key,
-                            "role": auth_result.roles[0] if auth_result.roles else "guest",
+                            "role": (auth_result.roles[0]
+                                     if auth_result.roles else "guest"),
                             "roles": auth_result.roles or ["guest"],
-                            "permissions": getattr(auth_result, 'permissions', ["read"])
+                            "permissions": getattr(
+                                auth_result, 'permissions', ["read"]
+                            )
                         }
-                        logger.debug(f"✅ Authenticated user with mcp_security_framework: {request.state.user}")
+                        logger.debug(f"✅ Authenticated user with "
+                                     f"mcp_security_framework: "
+                                     f"{request.state.user}")
                     else:
                         # Authentication failed
                         request.state.user = {
@@ -112,9 +147,11 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                             "roles": ["guest"],
                             "permissions": ["read"]
                         }
-                        logger.debug(f"❌ Authentication failed for API key: {api_key[:8]}...")
+                        logger.debug(f"❌ Authentication failed for API key: "
+                                     f"{api_key[:8]}...")
                 except Exception as e:
-                    logger.warning(f"⚠️ AuthManager error: {e}, falling back to basic auth")
+                    logger.warning(f"⚠️ AuthManager error: {e}, "
+                                   f"falling back to basic auth")
                     self._security_available = False
 
             if not self._security_available:
@@ -124,8 +161,12 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
 
                     # Get permissions for this role from roles file if available
                     role_permissions = ["read"]  # default permissions
-                    if hasattr(self, 'roles_config') and self.roles_config and user_role in self.roles_config:
-                        role_permissions = self.roles_config[user_role].get("permissions", ["read"])
+                    if (hasattr(self, 'roles_config') and
+                            self.roles_config and
+                            user_role in self.roles_config):
+                        role_permissions = self.roles_config[user_role].get(
+                            "permissions", ["read"]
+                        )
 
                     # Set user info in request.state
                     request.state.user = {
@@ -135,7 +176,8 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                         "permissions": role_permissions
                     }
 
-                    logger.debug(f"✅ Authenticated user with basic auth: {request.state.user}")
+                    logger.debug(f"✅ Authenticated user with basic auth: "
+                                 f"{request.state.user}")
                 else:
                     # API key not found
                     request.state.user = {
@@ -154,5 +196,5 @@ class UserInfoMiddleware(BaseHTTPMiddleware):
                 "permissions": ["read"]
             }
             logger.debug("ℹ️ No API key provided, using guest access")
-        
+
         return await call_next(request)

mcp_proxy_adapter/config.py

@@ -119,7 +119,7 @@ class Config:
                 "server_id": "mcp_proxy_adapter",
                 "server_name": "MCP Proxy Adapter",
                 "description": "JSON-RPC API for interacting with MCP Proxy",
-                "version": "6.2.32",
+                "version": "6.2.33",
                 "registration_timeout": 30,
                 "retry_attempts": 3,
                 "retry_delay": 5,

mcp_proxy_adapter/core/client.py

@@ -24,7 +24,7 @@ from requests.exceptions import RequestException
 
 # Import security framework components
 try:
-    from mcp_security_framework import SecurityManager, AuthManager, CertificateManager
+    from mcp_security_framework import SecurityManager, AuthManager, CertificateManager, PermissionManager
     from mcp_security_framework.utils import generate_api_key, create_jwt_token, validate_jwt_token
     from mcp_security_framework.utils import extract_roles_from_cert, validate_certificate_chain
     from mcp_security_framework.utils import create_ssl_context, validate_server_certificate
@@ -85,9 +85,13 @@ class UniversalClient:
             # Initialize security manager
             self.security_manager = SecurityManager(self.security_config)
             
-            # Initialize auth manager
+            # Initialize permission manager first
+            permissions_config = self.security_config.get("permissions", {})
+            self.permission_manager = PermissionManager(permissions_config)
+            
+            # Initialize auth manager with permission_manager
             auth_config = self.security_config.get("auth", {})
-            self.auth_manager = AuthManager(auth_config)
+            self.auth_manager = AuthManager(auth_config, self.permission_manager)
             
             # Initialize certificate manager
             cert_config = self.security_config.get("certificates", {})

mcp_proxy_adapter/core/proxy_registration.py

@@ -49,7 +49,7 @@ class ProxyRegistrationManager:
         self.registration_config = config.get("registration", config.get("proxy_registration", {}))
         
         # Basic registration settings
-        self.proxy_url = self.registration_config.get("proxy_url", self.registration_config.get("server_url", "https://proxy-registry.example.com"))
+        self.proxy_url = self.registration_config.get("proxy_url", "https://proxy-registry.example.com")
         self.server_id = self.registration_config.get("server_id", self.registration_config.get("proxy_info", {}).get("name", "mcp_proxy_adapter"))
         self.server_name = self.registration_config.get("server_name", self.registration_config.get("proxy_info", {}).get("name", "MCP Proxy Adapter"))
         self.description = self.registration_config.get("description", self.registration_config.get("proxy_info", {}).get("description", "JSON-RPC API for interacting with MCP Proxy"))

mcp_proxy_adapter/examples/universal_client.py

@@ -19,7 +19,7 @@ import requests
 from requests.exceptions import RequestException
 # Import security framework components
 try:
-    from mcp_security_framework import SecurityManager, AuthManager, CertificateManager
+    from mcp_security_framework import SecurityManager, AuthManager, CertificateManager, PermissionManager
     from mcp_security_framework.utils import generate_api_key, create_jwt_token, validate_jwt_token
     from mcp_security_framework.utils import extract_roles_from_cert, validate_certificate_chain
     from mcp_security_framework.utils import create_ssl_context, validate_server_certificate
@@ -69,9 +69,12 @@ class UniversalClient:
         try:
             # Initialize security manager
             self.security_manager = SecurityManager(self.security_config)
-            # Initialize auth manager
+            # Initialize permission manager first
+            permissions_config = self.security_config.get("permissions", {})
+            self.permission_manager = PermissionManager(permissions_config)
+            # Initialize auth manager with permission_manager
             auth_config = self.security_config.get("auth", {})
-            self.auth_manager = AuthManager(auth_config)
+            self.auth_manager = AuthManager(auth_config, self.permission_manager)
             # Initialize certificate manager
             cert_config = self.security_config.get("certificates", {})
             self.cert_manager = CertificateManager(cert_config)

mcp_proxy_adapter/version.py

@@ -2,5 +2,5 @@
 Version information for MCP Proxy Adapter.
 """
 
-__version__ = "6.2.32"
+__version__ = "6.2.34"
 

{mcp_proxy_adapter-6.2.32.dist-info → mcp_proxy_adapter-6.2.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.2.32
+Version: 6.2.34
 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.2.32.dist-info → mcp_proxy_adapter-6.2.34.dist-info}/RECORD

@@ -1,10 +1,10 @@
 mcp_proxy_adapter/__init__.py,sha256=B7m1YWyv_Wb87-Q-JqVpHQgwajnfIgDyZ_iIxzdTbBY,1021
 mcp_proxy_adapter/__main__.py,sha256=-Wp1myP9DzJNB9j97mj62C8kFk5YUbCmd0e7Rnwte0A,769
-mcp_proxy_adapter/config.py,sha256=C1CA-o7IhUdnklmI1h7tgfYVkMyTV2ST3jvlPnhkI64,21600
+mcp_proxy_adapter/config.py,sha256=QIOV57A_hwDH2z_BVEBJKDsPpa3IUKlqhRAij4bpQik,21600
 mcp_proxy_adapter/custom_openapi.py,sha256=jYUrCy8C1mShh3sjKj-JkzSMLAvxDLTvtzSJFj5HUNg,15023
 mcp_proxy_adapter/main.py,sha256=9qt_pEQdq8roUc73CumfDn6jDWP_NyfdE1lCGEynv5I,2841
 mcp_proxy_adapter/openapi.py,sha256=36vOEbJjGnVZR6hUhl6mHCD29HYOEFKo2bL0JdGSm-4,13952
-mcp_proxy_adapter/version.py,sha256=vhjtZ1Yb2aJqQRwY96rTG9HSzJesFzSpX6gIRZqZf_g,76
+mcp_proxy_adapter/version.py,sha256=8Rv-tnRMFu7W1xVGrsKl9PqMpFzjts8hLs89BkGcJHw,76
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=khl4kaI4mJ6dNbfAK7hR97Ek-eWC9NBeuXHr6GVbLoU,28911
 mcp_proxy_adapter/api/handlers.py,sha256=DcZT7MVBV33q-0EJ0iFqxE0VgBkFt6d_SqoRkntwyvc,8477
@@ -21,7 +21,7 @@ mcp_proxy_adapter/api/middleware/performance.py,sha256=dHBxTF43LEGXMKHMH3A8ybKmw
 mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=iVjJrTEfKy15ZchQUo-Mu0hBg9kEP6vgzee_3PtWd6M,8115
 mcp_proxy_adapter/api/middleware/transport_middleware.py,sha256=Esy2gGKpEV5RoUTilr1YKKTDc5jh5RxsomD0VXyR2pE,4396
 mcp_proxy_adapter/api/middleware/unified_security.py,sha256=fDWUeIuHjYUngVnB8gVR9ES3IQSaY9VP2YPZGXATJlU,7617
-mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=CWZvwUqieNhC8_ArTvncRjFfU3RHusO-dMcUSvRv01A,6311
+mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=gJX5WUMa-ByWpbvbFUftymH3BuQNaj1h1lGDqq9VU6g,8134
 mcp_proxy_adapter/commands/__init__.py,sha256=r791wg4FKhWSi5rqA3vekDcGf5kr18pwF1woX-dnZKo,1525
 mcp_proxy_adapter/commands/auth_validation_command.py,sha256=z612WJDVgZwaCrxdQhATwRc5i3qxH37MPuIV6SuZPn8,15083
 mcp_proxy_adapter/commands/base.py,sha256=tunyrmt-LYJMQZslAZQor3KZvOrn1IYNpL5uOAnSdxc,15791
@@ -57,7 +57,7 @@ mcp_proxy_adapter/core/app_factory.py,sha256=Xwyz40GNOWWa7ThArweawNBY4WI4bEI3_cj
 mcp_proxy_adapter/core/app_runner.py,sha256=JPpx9rKmaHAVdFnHRl2rXycptQkTSQ13Er7Qf1KZIA4,10614
 mcp_proxy_adapter/core/auth_validator.py,sha256=lJxBVkoQWSk5CNtnPYMEJSsz4FhcXK-gB5QJ_OP9jEE,20937
 mcp_proxy_adapter/core/certificate_utils.py,sha256=7VOhjRcygCToYgPTUt_MgcNILdpRBRBNZSFpeS_QrfA,39541
-mcp_proxy_adapter/core/client.py,sha256=YxtaHvMoqKcjWJ-2mf2FH22wUGWUZjXMEKPqxypNOPE,21340
+mcp_proxy_adapter/core/client.py,sha256=AeNjMyaTnnR0g6Sw_c28X_le8o5SbEi-_PaRtVttGWQ,21624
 mcp_proxy_adapter/core/client_manager.py,sha256=sKEhapMpogqb54WIWEpz2bMjrX3wvYooX-a844IfCTU,9164
 mcp_proxy_adapter/core/client_security.py,sha256=8isHpvv-7H85QzI8K3Pfyr_KdvpE2xYyIT4wqWrttNU,13575
 mcp_proxy_adapter/core/config_converter.py,sha256=FAA2zx-yRgqMgzg73o9Aq5CEEfodNCeaA8Yluto4wAs,16985
@@ -68,7 +68,7 @@ mcp_proxy_adapter/core/mtls_asgi.py,sha256=X2lAj3wk3L85amRCp_-10sqvZa5wJf_diXhwr
 mcp_proxy_adapter/core/mtls_asgi_app.py,sha256=VeolP08TTaqYU5fGeaZexj6EBWBDugoVrEGXzJW4PuM,6406
 mcp_proxy_adapter/core/protocol_manager.py,sha256=ISFRXjUuK4Q3uMbVB8-O_ozQSsDEH0PQA_HAKGeUrrw,14763
 mcp_proxy_adapter/core/proxy_client.py,sha256=n44T5iBS29y6E2lQLGKpOQxPYVrxIl98OAs6mMuhEsM,22916
-mcp_proxy_adapter/core/proxy_registration.py,sha256=OeSDjID-1ofJxRQhmzKGoXM6E-Pk0WmuUfMdsiSo2u0,19829
+mcp_proxy_adapter/core/proxy_registration.py,sha256=Mmh-hWVJKkADLP8361Nx_SGFp9JRwtWnQtjuOhGx5Ss,19785
 mcp_proxy_adapter/core/role_utils.py,sha256=wMoTVz3gF5fM7jozNMwsEwPkp1tui26M-t_KH1Oz8gs,12880
 mcp_proxy_adapter/core/security_adapter.py,sha256=wZ3OH1WzhUdpN8N8CrGJSFFVNi474DqdazIqQ1T8PN4,13343
 mcp_proxy_adapter/core/security_factory.py,sha256=4r7qvBq30XfosGD_b1ZHyNVLN8rOQ3NAKuaCOCEK8jA,8262
@@ -100,7 +100,7 @@ mcp_proxy_adapter/examples/setup_test_environment.py,sha256=fAfz1U7qERY-Z9ly15Wl
 mcp_proxy_adapter/examples/test_config.py,sha256=1X9X8lNlWOcM1ZbIzteeMvLdgxnJEK_ev1BYTZiA9ws,6451
 mcp_proxy_adapter/examples/test_config_generator.py,sha256=SBKL0bv-kUwUUbwrFVbxuA_6pDvK2573Jxm9wPiyI8s,3927
 mcp_proxy_adapter/examples/test_examples.py,sha256=KH095FFEQDMKYZglclr5qy3cW__t3H8VX1l8dvCkQos,12132
-mcp_proxy_adapter/examples/universal_client.py,sha256=IIKGRa0__KoWVla3VnVl-RjkkG_nPpM8vglPm70pV9c,26948
+mcp_proxy_adapter/examples/universal_client.py,sha256=qPwDWE33b_WMZCdNE25wRRxvSsMr2syOdeUlF1gUY-I,27219
 mcp_proxy_adapter/examples/basic_framework/__init__.py,sha256=4aYD--R6hy9n9CUxj7Osb9HcdVUMJ6_cfpu4ujkbCwI,345
 mcp_proxy_adapter/examples/basic_framework/main.py,sha256=cDmqeUN1lDBBwuwLjmnP3qIyofCZ3Jr5Ct7Im-qCsUU,1728
 mcp_proxy_adapter/examples/basic_framework/commands/__init__.py,sha256=_VQNLUEdsxUG-4yt9BZI_vtOxHAdGG0OUSsP6Wj-Vz4,76
@@ -134,9 +134,9 @@ mcp_proxy_adapter/examples/scripts/generate_certificates_and_tokens.py,sha256=J0
 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=2dxwBh9k_nUw9kgytZso5TNOQpBqd3c-RpKSTLoHlLE,46465
-mcp_proxy_adapter-6.2.32.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
-mcp_proxy_adapter-6.2.32.dist-info/METADATA,sha256=BVnNC6hX9Oqb-DILZ7UOpyxGlaeuNgRxbT0czZVJY8o,22348
-mcp_proxy_adapter-6.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.2.32.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
-mcp_proxy_adapter-6.2.32.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.2.32.dist-info/RECORD,,
+mcp_proxy_adapter-6.2.34.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
+mcp_proxy_adapter-6.2.34.dist-info/METADATA,sha256=l0uENuXxZKqEOdMXaaMBnEWWegRTQDO9CJYiNGWGIhA,22348
+mcp_proxy_adapter-6.2.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.2.34.dist-info/entry_points.txt,sha256=J3eV6ID0lt_VSp4lIdIgBFTqLCThgObNNxRCbyfiMHw,70
+mcp_proxy_adapter-6.2.34.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.2.34.dist-info/RECORD,,