mcp-proxy-adapter 6.3.4__py3-none-any.whl → 6.3.5__py3-none-any.whl

mcp_proxy_adapter/core/protocol_manager.py

@@ -16,169 +16,197 @@ from mcp_proxy_adapter.core.logging import logger
 class ProtocolManager:
     """
     Manages protocol configurations and validates protocol access.
-    
+
     This class handles the validation of allowed protocols and their associated ports,
     ensuring that only configured protocols are accessible.
     """
-    
+
     def __init__(self, app_config: Optional[Dict] = None):
         """
         Initialize the protocol manager.
-        
+
         Args:
             app_config: Application configuration dictionary (optional)
         """
         self.app_config = app_config
         self._load_config()
-    
+
     def _load_config(self):
         """Load protocol configuration from config."""
         # Use provided config or fallback to global config; normalize types
-        current_config = self.app_config if self.app_config is not None else config.get_all()
-        logger.debug(f"ProtocolManager._load_config - current_config type: {type(current_config)}")
+        current_config = (
+            self.app_config if self.app_config is not None else config.get_all()
+        )
+        logger.debug(
+            f"ProtocolManager._load_config - current_config type: {type(current_config)}"
+        )
 
-        if not hasattr(current_config, 'get'):
+        if not hasattr(current_config, "get"):
             # Not a dict-like config, fallback to global
-            logger.debug(f"ProtocolManager._load_config - current_config is not dict-like, falling back to global config")
+            logger.debug(
+                f"ProtocolManager._load_config - current_config is not dict-like, falling back to global config"
+            )
             current_config = config.get_all()
 
-        logger.debug(f"ProtocolManager._load_config - final current_config type: {type(current_config)}")
-        if hasattr(current_config, 'get'):
-            logger.debug(f"ProtocolManager._load_config - current_config keys: {list(current_config.keys()) if hasattr(current_config, 'keys') else 'no keys'}")
+        logger.debug(
+            f"ProtocolManager._load_config - final current_config type: {type(current_config)}"
+        )
+        if hasattr(current_config, "get"):
+            logger.debug(
+                f"ProtocolManager._load_config - current_config keys: {list(current_config.keys()) if hasattr(current_config, 'keys') else 'no keys'}"
+            )
 
         # Get protocols configuration
         logger.debug(f"ProtocolManager._load_config - before getting protocols")
         try:
             self.protocols_config = current_config.get("protocols", {})
-            logger.debug(f"ProtocolManager._load_config - protocols_config type: {type(self.protocols_config)}")
-            if hasattr(self.protocols_config, 'get'):
-                logger.debug(f"ProtocolManager._load_config - protocols_config is dict-like")
+            logger.debug(
+                f"ProtocolManager._load_config - protocols_config type: {type(self.protocols_config)}"
+            )
+            if hasattr(self.protocols_config, "get"):
+                logger.debug(
+                    f"ProtocolManager._load_config - protocols_config is dict-like"
+                )
             else:
-                logger.debug(f"ProtocolManager._load_config - protocols_config is NOT dict-like: {repr(self.protocols_config)}")
+                logger.debug(
+                    f"ProtocolManager._load_config - protocols_config is NOT dict-like: {repr(self.protocols_config)}"
+                )
         except Exception as e:
             logger.debug(f"ProtocolManager._load_config - ERROR getting protocols: {e}")
             self.protocols_config = {}
 
-        self.enabled = self.protocols_config.get("enabled", True) if hasattr(self.protocols_config, 'get') else True
-        
+        self.enabled = (
+            self.protocols_config.get("enabled", True)
+            if hasattr(self.protocols_config, "get")
+            else True
+        )
+
         # Get SSL configuration to determine allowed protocols
         ssl_enabled = self._is_ssl_enabled(current_config)
-        
+
         # Set allowed protocols based on SSL configuration
         if ssl_enabled:
             # If SSL is enabled, allow both HTTP and HTTPS
-            self.allowed_protocols = self.protocols_config.get("allowed_protocols", ["http", "https"])
+            self.allowed_protocols = self.protocols_config.get(
+                "allowed_protocols", ["http", "https"]
+            )
             # Ensure HTTPS is in allowed protocols if SSL is enabled
             if "https" not in self.allowed_protocols:
                 self.allowed_protocols.append("https")
         else:
             # If SSL is disabled, only allow HTTP
-            self.allowed_protocols = self.protocols_config.get("allowed_protocols", ["http"])
+            self.allowed_protocols = self.protocols_config.get(
+                "allowed_protocols", ["http"]
+            )
             # Remove HTTPS from allowed protocols if SSL is disabled
             if "https" in self.allowed_protocols:
                 self.allowed_protocols.remove("https")
-        
-        logger.debug(f"Protocol manager loaded config: enabled={self.enabled}, allowed_protocols={self.allowed_protocols}, ssl_enabled={ssl_enabled}")
-    
+
+        logger.debug(
+            f"Protocol manager loaded config: enabled={self.enabled}, allowed_protocols={self.allowed_protocols}, ssl_enabled={ssl_enabled}"
+        )
+
     def _is_ssl_enabled(self, current_config: Dict) -> bool:
         """
         Check if SSL is enabled in configuration.
-        
+
         Args:
             current_config: Current configuration dictionary
-            
+
         Returns:
             True if SSL is enabled, False otherwise
         """
         # Try security framework SSL config first
         security_config = current_config.get("security", {})
         ssl_config = security_config.get("ssl", {})
-        
+
         if ssl_config.get("enabled", False):
             logger.debug("SSL enabled via security.ssl configuration")
             return True
-        
+
         # Fallback to legacy SSL config
         legacy_ssl_config = current_config.get("ssl", {})
         if legacy_ssl_config.get("enabled", False):
             logger.debug("SSL enabled via legacy ssl configuration")
             return True
-        
+
         logger.debug("SSL is disabled in configuration")
         return False
-    
+
     def update_config(self, new_config: Dict):
         """
         Update configuration and reload protocol settings.
-        
+
         Args:
             new_config: New configuration dictionary
         """
         self.app_config = new_config
         self._load_config()
-        logger.info(f"Protocol manager configuration updated: allowed_protocols={self.allowed_protocols}")
-    
+        logger.info(
+            f"Protocol manager configuration updated: allowed_protocols={self.allowed_protocols}"
+        )
+
     def reload_config(self):
         """Reload protocol configuration from global config."""
         self._load_config()
-        
+
     def is_protocol_allowed(self, protocol: str) -> bool:
         """
         Check if a protocol is allowed based on configuration.
-        
+
         Args:
             protocol: Protocol name (http, https, mtls)
-            
+
         Returns:
             True if protocol is allowed, False otherwise
         """
         if not self.enabled:
             logger.debug("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}")
         return is_allowed
-    
+
     def get_protocol_port(self, protocol: str) -> Optional[int]:
         """
         Get the configured port for a specific protocol.
-        
+
         Args:
             protocol: Protocol name (http, https, mtls)
-            
+
         Returns:
             Port number if configured, None otherwise
         """
         protocol_lower = protocol.lower()
         protocol_config = self.protocols_config.get(protocol_lower, {})
-        
+
         if not protocol_config.get("enabled", False):
             logger.debug(f"Protocol '{protocol}' is not enabled")
             return None
-            
+
         port = protocol_config.get("port")
         logger.debug(f"Protocol '{protocol}' port: {port}")
         return port
-    
+
     def get_allowed_protocols(self) -> List[str]:
         """
         Get list of all allowed protocols.
-        
+
         Returns:
             List of allowed protocol names
         """
         return self.allowed_protocols.copy()
-    
+
     def get_protocol_config(self, protocol: str) -> Dict:
         """
         Get full configuration for a specific protocol.
-        
+
         Args:
             protocol: Protocol name (http, https, mtls)
-            
+
         Returns:
             Protocol configuration dictionary
         """
@@ -191,118 +219,128 @@ class ProtocolManager:
             except Exception:
                 return {}
         return {}
-    
+
     def validate_url_protocol(self, url: str) -> Tuple[bool, Optional[str]]:
         """
         Validate if the URL protocol is allowed.
-        
+
         Args:
             url: URL to validate
-            
+
         Returns:
             Tuple of (is_allowed, error_message)
         """
         try:
             parsed = urlparse(url)
             protocol = parsed.scheme.lower()
-            
+
             if not protocol:
                 return False, "No protocol specified in URL"
-                
+
             if not self.is_protocol_allowed(protocol):
-                return False, f"Protocol '{protocol}' is not allowed. Allowed protocols: {self.allowed_protocols}"
-                
+                return (
+                    False,
+                    f"Protocol '{protocol}' is not allowed. Allowed protocols: {self.allowed_protocols}",
+                )
+
             return True, None
-            
+
         except Exception as e:
             return False, f"Invalid URL format: {str(e)}"
-    
+
     def get_ssl_context_for_protocol(self, protocol: str) -> Optional[ssl.SSLContext]:
         """
         Get SSL context for HTTPS or MTLS protocol.
-        
+
         Args:
             protocol: Protocol name (https, mtls)
-            
+
         Returns:
             SSL context if protocol requires SSL, None otherwise
         """
         if protocol.lower() not in ["https", "mtls"]:
             return None
-            
+
         # Use provided config or fallback to global config
-        current_config = self.app_config if self.app_config is not None else config.get_all()
-        
+        current_config = (
+            self.app_config if self.app_config is not None else config.get_all()
+        )
+
         # Get SSL configuration
         ssl_config = self._get_ssl_config(current_config)
-        
+
         if not ssl_config.get("enabled", False):
-            logger.warning(f"SSL required for protocol '{protocol}' but SSL is disabled")
+            logger.warning(
+                f"SSL required for protocol '{protocol}' but SSL is disabled"
+            )
             return None
-            
+
         cert_file = ssl_config.get("cert_file")
         key_file = ssl_config.get("key_file")
-        
+
         if not cert_file or not key_file:
-            logger.warning(f"SSL required for protocol '{protocol}' but certificate files not configured")
+            logger.warning(
+                f"SSL required for protocol '{protocol}' but certificate files not configured"
+            )
             return None
-            
+
         try:
             from mcp_proxy_adapter.core.ssl_utils import SSLUtils
-            
+
             ssl_context = SSLUtils.create_ssl_context(
                 cert_file=cert_file,
                 key_file=key_file,
                 ca_cert=ssl_config.get("ca_cert"),
-                verify_client=protocol.lower() == "mtls" or ssl_config.get("verify_client", False),
+                verify_client=protocol.lower() == "mtls"
+                or ssl_config.get("verify_client", False),
                 cipher_suites=ssl_config.get("cipher_suites", []),
                 min_tls_version=ssl_config.get("min_tls_version", "1.2"),
-                max_tls_version=ssl_config.get("max_tls_version", "1.3")
+                max_tls_version=ssl_config.get("max_tls_version", "1.3"),
             )
-            
+
             logger.info(f"SSL context created for protocol '{protocol}'")
             return ssl_context
-            
+
         except Exception as e:
             logger.error(f"Failed to create SSL context for protocol '{protocol}': {e}")
             return None
-    
+
     def _get_ssl_config(self, current_config: Dict) -> Dict:
         """
         Get SSL configuration from config.
-        
+
         Args:
             current_config: Current configuration dictionary
-            
+
         Returns:
             SSL configuration dictionary
         """
         # Try security framework SSL config first
         security_config = current_config.get("security", {})
         ssl_config = security_config.get("ssl", {})
-        
+
         if ssl_config.get("enabled", False):
             logger.debug("Using security.ssl configuration")
             return ssl_config
-        
+
         # Fallback to legacy SSL config
         legacy_ssl_config = current_config.get("ssl", {})
         if legacy_ssl_config.get("enabled", False):
             logger.debug("Using legacy ssl configuration")
             return legacy_ssl_config
-        
+
         # Return empty config if SSL is disabled
         return {"enabled": False}
-    
+
     def get_protocol_info(self) -> Dict[str, Dict]:
         """
         Get information about all configured protocols.
-        
+
         Returns:
             Dictionary with protocol information
         """
         info = {}
-        
+
         for protocol in ["http", "https", "mtls"]:
             protocol_config = self.get_protocol_config(protocol)
             info[protocol] = {
@@ -310,76 +348,88 @@ class ProtocolManager:
                 "allowed": self.is_protocol_allowed(protocol),
                 "port": protocol_config.get("port"),
                 "requires_ssl": protocol in ["https", "mtls"],
-                "ssl_context_available": self.get_ssl_context_for_protocol(protocol) is not None
+                "ssl_context_available": self.get_ssl_context_for_protocol(protocol)
+                is not None,
             }
-            
+
         return info
-    
+
     def validate_protocol_configuration(self) -> List[str]:
         """
         Validate the current protocol configuration.
-        
+
         Returns:
             List of validation errors (empty if configuration is valid)
         """
         errors = []
-        
+
         if not self.enabled:
             return errors
-            
+
         # Check if allowed protocols are configured
         for protocol in self.allowed_protocols:
             if protocol not in ["http", "https", "mtls"]:
                 errors.append(f"Unknown protocol '{protocol}' in allowed_protocols")
                 continue
-                
+
             protocol_config = self.get_protocol_config(protocol)
-            
+
             if not protocol_config.get("enabled", False):
-                errors.append(f"Protocol '{protocol}' is in allowed_protocols but not enabled")
+                errors.append(
+                    f"Protocol '{protocol}' is in allowed_protocols but not enabled"
+                )
                 continue
-                
+
             port = protocol_config.get("port")
             if not port:
-                errors.append(f"Protocol '{protocol}' is enabled but no port configured")
+                errors.append(
+                    f"Protocol '{protocol}' is enabled but no port configured"
+                )
                 continue
-                
+
             # Check SSL requirements
             if protocol in ["https", "mtls"]:
                 # Use provided config or fallback to global config
-                current_config = self.app_config if self.app_config is not None else config.get_all()
+                current_config = (
+                    self.app_config if self.app_config is not None else config.get_all()
+                )
                 ssl_config = self._get_ssl_config(current_config)
-                
+
                 if not ssl_config.get("enabled", False):
-                    errors.append(f"Protocol '{protocol}' requires SSL but SSL is disabled")
+                    errors.append(
+                        f"Protocol '{protocol}' requires SSL but SSL is disabled"
+                    )
                 elif not ssl_config.get("cert_file") or not ssl_config.get("key_file"):
-                    errors.append(f"Protocol '{protocol}' requires SSL but certificate files not configured")
-        
+                    errors.append(
+                        f"Protocol '{protocol}' requires SSL but certificate files not configured"
+                    )
+
         return errors
 
 
 # Global protocol manager instance - will be updated with config when needed
 protocol_manager = None
 
+
 def get_protocol_manager(app_config: Optional[Dict] = None) -> ProtocolManager:
     """
     Get protocol manager instance with current configuration.
-    
+
     Args:
         app_config: Application configuration dictionary (optional)
-        
+
     Returns:
         ProtocolManager instance
     """
     global protocol_manager
-    
+
     # If no app_config provided, use global config
     if app_config is None:
         app_config = config.get_all()
-    
+
     # Create new instance if none exists or config changed
     if protocol_manager is None or protocol_manager.app_config != app_config:
         protocol_manager = ProtocolManager(app_config)
         logger.info("Protocol manager created with new configuration")
-    
-    return protocol_manager 
+
+    return protocol_manager