mcp-proxy-adapter 6.9.5__py3-none-any.whl → 6.9.7__py3-none-any.whl

mcp_proxy_adapter/core/config_validator.py

@@ -46,7 +46,7 @@ class ConfigValidator:
     def __init__(self, config_path: Optional[str] = None):
         """
         Initialize configuration validator.
-        
+
         Args:
             config_path: Path to configuration file for validation
         """
@@ -183,7 +183,7 @@ class ConfigValidator:
     def load_config(self, config_path: Optional[str] = None) -> None:
         """
         Load configuration from file.
-        
+
         Args:
             config_path: Path to configuration file
         """
@@ -217,7 +217,7 @@ class ConfigValidator:
     def validate_config(self, config_data: Optional[Dict[str, Any]] = None) -> List[ValidationResult]:
         """
         Validate configuration data.
-        
+
         Args:
             config_data: Configuration data to validate. If None, uses loaded config.
             
@@ -314,6 +314,11 @@ class ConfigValidator:
         # Check conditional sections based on feature flags
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
+            
+            # Only check if the enabled key exists in the configuration
+            if not self._has_nested_key(enabled_key):
+                continue
+                
             is_enabled = self._get_nested_value_safe(enabled_key, False)
             
             if is_enabled and feature_name in self.required_sections:
@@ -362,6 +367,12 @@ class ConfigValidator:
         """Validate feature flags and their dependencies."""
         for feature_name, feature_config in self.feature_flags.items():
             enabled_key = feature_config["enabled_key"]
+            
+            # Check if the enabled key exists in the configuration
+            if not self._has_nested_key(enabled_key):
+                # Skip validation if the feature flag key doesn't exist
+                continue
+                
             is_enabled = self._get_nested_value_safe(enabled_key, False)
             
             if is_enabled:
@@ -377,26 +388,28 @@ class ConfigValidator:
                 
                 # Check required files
                 for file_key in feature_config["required_files"]:
-                    file_path = self._get_nested_value(file_key)
-                    if file_path and not os.path.exists(file_path):
-                        self.validation_results.append(ValidationResult(
-                            level="error",
-                            message=f"Feature '{feature_name}' is enabled but required file '{file_path}' does not exist",
-                            section=feature_name,
-                            key=file_key
+                    if self._has_nested_key(file_key):
+                        file_path = self._get_nested_value(file_key)
+                        if file_path and not os.path.exists(file_path):
+                            self.validation_results.append(ValidationResult(
+                                level="error",
+                                message=f"Feature '{feature_name}' is enabled but required file '{file_path}' does not exist",
+                                section=feature_name,
+                                key=file_key
                         ))
             else:
                 # Feature is disabled - check that optional files are not required
                 for file_key in feature_config["optional_files"]:
-                    file_path = self._get_nested_value(file_key)
-                    if file_path and not os.path.exists(file_path):
-                        self.validation_results.append(ValidationResult(
-                            level="warning",
-                            message=f"Optional file '{file_path}' for disabled feature '{feature_name}' does not exist",
-                            section=feature_name,
-                            key=file_key,
-                            suggestion="This is not an error since the feature is disabled"
-                        ))
+                    if self._has_nested_key(file_key):
+                        file_path = self._get_nested_value(file_key)
+                        if file_path and not os.path.exists(file_path):
+                            self.validation_results.append(ValidationResult(
+                                level="warning",
+                                message=f"Optional file '{file_path}' for disabled feature '{feature_name}' does not exist",
+                                section=feature_name,
+                                key=file_key,
+                                suggestion="This is not an error since the feature is disabled"
+                            ))
     
     def _validate_protocol_requirements(self) -> None:
         """Validate protocol-specific requirements."""
@@ -415,32 +428,35 @@ class ConfigValidator:
         
         # Check SSL requirements
         if requirements["ssl_enabled"]:
-            ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
-            if not ssl_enabled:
-                self.validation_results.append(ValidationResult(
-                    level="error",
-                    message=f"Protocol '{protocol}' requires SSL to be enabled",
-                    section="ssl",
-                    key="enabled"
+            # Only check SSL if ssl section exists
+            if self._has_nested_key("ssl.enabled"):
+                ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
+                if not ssl_enabled:
+                    self.validation_results.append(ValidationResult(
+                        level="error",
+                        message=f"Protocol '{protocol}' requires SSL to be enabled",
+                        section="ssl",
+                        key="enabled"
                 ))
             
             # Check required SSL files
             for file_key in requirements["required_files"]:
-                file_path = self._get_nested_value(file_key)
-                if not file_path:
-                    self.validation_results.append(ValidationResult(
-                        level="error",
-                        message=f"Protocol '{protocol}' requires {file_key} to be specified",
-                        section="ssl",
-                        key=file_key.split(".")[-1]
-                    ))
-                elif not os.path.exists(file_path):
-                    self.validation_results.append(ValidationResult(
-                        level="error",
-                        message=f"Protocol '{protocol}' requires file '{file_path}' to exist",
-                        section="ssl",
-                        key=file_key.split(".")[-1]
-                    ))
+                if self._has_nested_key(file_key):
+                    file_path = self._get_nested_value(file_key)
+                    if not file_path:
+                        self.validation_results.append(ValidationResult(
+                            level="error",
+                            message=f"Protocol '{protocol}' requires {file_key} to be specified",
+                            section="ssl",
+                            key=file_key.split(".")[-1]
+                        ))
+                    elif not os.path.exists(file_path):
+                        self.validation_results.append(ValidationResult(
+                            level="error",
+                            message=f"Protocol '{protocol}' requires file '{file_path}' to exist",
+                            section="ssl",
+                            key=file_key.split(".")[-1]
+                        ))
         
         # Check client verification requirements
         if requirements["client_verification"]:
@@ -538,7 +554,7 @@ class ConfigValidator:
                 if auth_method == "certificate":
                     cert_file = self._get_nested_value("proxy_registration.certificate.cert_file")
                     key_file = self._get_nested_value("proxy_registration.certificate.key_file")
-                if not cert_file or not key_file:
+            if not cert_file or not key_file:
                     self.validation_results.append(ValidationResult(
                         level="error",
                         message="Certificate authentication is enabled but certificate files are not specified",
@@ -557,6 +573,10 @@ class ConfigValidator:
     
     def _validate_ssl_configuration(self) -> None:
         """Validate SSL configuration with detailed certificate validation."""
+        # Only validate SSL if the ssl section exists
+        if not self._has_nested_key("ssl.enabled"):
+            return
+
         ssl_enabled = self._get_nested_value_safe("ssl.enabled", False)
         
         if ssl_enabled:

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.9.5.dist-info → mcp_proxy_adapter-6.9.7.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ mcp_proxy_adapter/config.py,sha256=1Ngxri2IPGoytYdCF5pXzbLUXsWcf6qYENkaDkAppg0,2
 mcp_proxy_adapter/custom_openapi.py,sha256=XRviX-C-ZkSKdBhORhDTdeN_1FWyEfXZADiASft3t9I,28149
 mcp_proxy_adapter/main.py,sha256=NFcSW7WaEnimRWe5zj28D0CH9otHlRZ92d2Um6XiGjE,10399
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=H4y12LYc2zqn1jp-HbYjiwhKAaPPybDzCaf9Sl6SshU,74
+mcp_proxy_adapter/version.py,sha256=e_sPEsKJLZMvetzVlFPS_CvyEGxkD-vhanbfb-2ii1o,74
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=PQ1Ch5ydJIHp3Z6gcMCzKkTsXPQAuZ9weHtQ-EXnNGY,37134
 mcp_proxy_adapter/api/handlers.py,sha256=X-hcMNVeTAu4yVkKJEChEsj2bFptUS6sLNN-Wysjkow,10011
@@ -62,7 +62,7 @@ mcp_proxy_adapter/core/client.py,sha256=qIbPl8prEwK2U65kl-vGJW2_imo1E4i6HxG_VpPe
 mcp_proxy_adapter/core/client_manager.py,sha256=yD8HZJlOwmDbVU49YfzSbh1XZ-Vib8qfcLVAaH03Jdg,8832
 mcp_proxy_adapter/core/client_security.py,sha256=siUaYorcDbpZsEIKgLfg-jBKkp7z_Er8wsO63mDD3Is,13127
 mcp_proxy_adapter/core/config_converter.py,sha256=Wnnsrbw7DxtgDfLG-IyyzK-hkKu0_1yp7-7dW87tu_4,17422
-mcp_proxy_adapter/core/config_validator.py,sha256=hEl1w2Ab_GZeGWNdGOVjzFVFgbzDhz3EvAsrENDXwd4,48370
+mcp_proxy_adapter/core/config_validator.py,sha256=Jiu3rJ9eJyEUBNsZ88jVQ-cj_Hd5BxhlBbWtyG6QAsA,49313
 mcp_proxy_adapter/core/crl_utils.py,sha256=Jnwq2UN52IoCDZCwByRP3XNMOJexftb-mVaH6zes6Fc,11706
 mcp_proxy_adapter/core/errors.py,sha256=CyhQgvMt0ooQjONa65XRBJ44y-l-E5_ES4KOuRvIpBk,8557
 mcp_proxy_adapter/core/logging.py,sha256=VIpiC6QTGLukRjiJoVpq3VEoLKhUeLNl8IdfljpW6ZU,9654
@@ -135,8 +135,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/schemas/roles.json,sha256=pgf_ZyqKyXbfGUxvobpiLiSJz9zzxrMuoVWEkEpz3N8,764
 mcp_proxy_adapter/schemas/roles_schema.json,sha256=deHgI7L6GwfBXacOlNtDgDJelDThppClC3Ti4Eh8rJY,5659
-mcp_proxy_adapter-6.9.5.dist-info/METADATA,sha256=z40vgZzi2X2_tKG77uK2up95EKM9hKFfnDp9eT8vMAM,8510
-mcp_proxy_adapter-6.9.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.5.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.5.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.5.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.7.dist-info/METADATA,sha256=jPv79sUiL5LIIc9uoDBw4i994eFASaTpiJXisdAGz0g,8510
+mcp_proxy_adapter-6.9.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.7.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.7.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.7.dist-info/RECORD,,