mcp-proxy-adapter 6.9.23__py3-none-any.whl → 6.9.25__py3-none-any.whl

mcp_proxy_adapter/core/config_validator.py

@@ -9,6 +9,7 @@ email: vasilyvz@gmail.com
 import json
 import os
 import logging
+import re
 from pathlib import Path
 from typing import Dict, List, Any, Optional, Tuple, Set
 from enum import Enum
@@ -247,6 +248,8 @@ class ConfigValidator:
         self._validate_ssl_configuration()
         self._validate_proxy_registration()
         self._validate_roles_configuration()
+        self._validate_uuid_format()
+        self._validate_unknown_fields()
         
         return self.validation_results
     
@@ -1195,6 +1198,84 @@ class ConfigValidator:
                 key="cert_file"
             ))
     
+    def _validate_uuid_format(self) -> None:
+        """Validate UUID4 format in configuration."""
+        
+        # Check root level UUID
+        if "uuid" in self.config_data:
+            uuid_value = self.config_data["uuid"]
+            if not self._is_valid_uuid4(uuid_value):
+                self.validation_results.append(ValidationResult(
+                    level="error",
+                    message=f"Invalid UUID4 format: '{uuid_value}'. Expected format: xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx",
+                    section="uuid",
+                    key="uuid"
+                ))
+        
+        # Check proxy_registration UUID if it exists
+        if self._has_nested_key("proxy_registration.uuid"):
+            uuid_value = self._get_nested_value("proxy_registration.uuid")
+            if not self._is_valid_uuid4(uuid_value):
+                self.validation_results.append(ValidationResult(
+                    level="error",
+                    message=f"Invalid UUID4 format in proxy_registration: '{uuid_value}'. Expected format: xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx",
+                    section="proxy_registration",
+                    key="uuid"
+                ))
+    
+    def _is_valid_uuid4(self, uuid_str: str) -> bool:
+        """Check if string is a valid UUID4."""
+        if not isinstance(uuid_str, str):
+            return False
+        
+        uuid4_pattern = r'^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$'
+        return bool(re.match(uuid4_pattern, uuid_str, re.IGNORECASE))
+    
+    def _validate_unknown_fields(self) -> None:
+        """Validate that no unknown fields are present in configuration."""
+        # Define all known sections and their allowed fields
+        known_sections = {
+            "server": {"host", "port", "protocol", "debug", "log_level"},
+            "logging": {"level", "file", "log_dir", "log_file", "error_log_file", "access_log_file", 
+                       "max_file_size", "backup_count", "format", "date_format", "console_output", "file_output"},
+            "commands": {"auto_discovery", "commands_directory", "catalog_directory", "plugin_servers",
+                        "auto_install_dependencies", "enabled_commands", "disabled_commands", "custom_commands_path"},
+            "transport": {"type", "port", "verify_client", "chk_hostname", "ssl"},
+            "proxy_registration": {"enabled", "proxy_url", "server_id", "server_name", "description", "version",
+                                 "registration_timeout", "retry_attempts", "retry_delay", "auto_register_on_startup",
+                                 "auto_unregister_on_shutdown", "uuid", "heartbeat"},
+            "debug": {"enabled", "level"},
+            "security": {"enabled", "tokens", "roles", "roles_file"},
+            "roles": {"enabled", "config_file", "default_policy", "auto_load", "validation_enabled"},
+            "ssl": {"enabled", "cert_file", "key_file", "ca_cert"},
+            "uuid": set()  # Root level UUID
+        }
+        
+        # Check for unknown root level fields
+        for field in self.config_data:
+            if field not in known_sections:
+                self.validation_results.append(ValidationResult(
+                    level="warning",
+                    message=f"Unknown field '{field}' at root level",
+                    section=field,
+                    suggestion="Check if this field is needed or if it's a typo"
+                ))
+        
+        # Check for unknown fields in known sections
+        for section_name, allowed_fields in known_sections.items():
+            if section_name in self.config_data:
+                section_data = self.config_data[section_name]
+                if isinstance(section_data, dict):
+                    for field in section_data:
+                        if field not in allowed_fields:
+                            self.validation_results.append(ValidationResult(
+                                level="warning",
+                                message=f"Unknown field '{field}' in section '{section_name}'",
+                                section=section_name,
+                                key=field,
+                                suggestion="Check if this field is needed or if it's a typo"
+                            ))
+    
     def get_validation_summary(self) -> Dict[str, Any]:
         """Get summary of validation results."""
         error_count = sum(1 for r in self.validation_results if r.level == "error")

mcp_proxy_adapter/core/proxy_registration.py

@@ -93,6 +93,23 @@ class ProxyRegistrationManager:
                         "server_id is required in registration configuration. "
                         "Please specify a server_id or proxy_info.name in your configuration."
                     )
+            # UUID is mandatory for registration payload
+            self.uuid = self.registration_config.get("uuid")
+            if not self.uuid:
+                raise ValueError(
+                    "uuid is required in registration configuration. "
+                    "Please specify a UUID under 'proxy_registration.uuid' in your configuration."
+                )
+            
+            # Validate UUID4 format
+            import re
+            uuid4_pattern = r'^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$'
+            if not re.match(uuid4_pattern, self.uuid, re.IGNORECASE):
+                error_msg = f"Invalid UUID4 format: '{self.uuid}'. Expected format: xxxxxxxx-xxxx-4xxx-xxxx-xxxxxxxxxxxx"
+                get_global_logger().error(f"❌ UUID validation failed: {error_msg}")
+                raise ValueError(error_msg)
+            
+            get_global_logger().info(f"✅ UUID validation passed: {self.uuid}")
             self.server_name = self.registration_config.get("server_name")
             if not self.server_name:
                 # Try to get from proxy_info.name as fallback
@@ -113,6 +130,7 @@ class ProxyRegistrationManager:
                     )
         else:
             self.server_id = None
+            self.uuid = None
             self.server_name = None
             self.description = None
             
@@ -419,6 +437,7 @@ class ProxyRegistrationManager:
         proxy_info = self.registration_config.get("proxy_info", {})
         registration_data = {
             "server_id": self.server_id,
+            "uuid": self.uuid,
             "server_url": self.server_url,
             "server_name": self.server_name,
             "description": self.description,

mcp_proxy_adapter/examples/config_builder.py

@@ -27,7 +27,7 @@ def generate_complete_config(host: str = "0.0.0.0", port: int = 8000) -> Dict[st
         Complete configuration dictionary
     """
     return {
-        "uuid": str(uuid.uuid4()),
+        "uuid": str(uuid.uuid4()),  # This generates valid UUID4
         "server": {
             "host": host,
             "port": port,

{mcp_proxy_adapter-6.9.23.dist-info → mcp_proxy_adapter-6.9.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.9.23
+Version: 6.9.25
 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
@@ -35,7 +35,7 @@ Requires-Dist: docstring-parser<1.0.0,>=0.15
 Requires-Dist: typing-extensions<5.0.0,>=4.5.0
 Requires-Dist: jsonrpc>=1.2.0
 Requires-Dist: psutil>=5.9.0
-Requires-Dist: mcp_security_framework>=1.2.6
+Requires-Dist: mcp_security_framework>=1.2.8
 Requires-Dist: flask>=3.1.0
 Requires-Dist: packaging>=20.0
 Requires-Dist: aiohttp<4.0.0,>=3.8.0

{mcp_proxy_adapter-6.9.23.dist-info → mcp_proxy_adapter-6.9.25.dist-info}/RECORD

@@ -62,7 +62,7 @@ mcp_proxy_adapter/core/client.py,sha256=qIbPl8prEwK2U65kl-vGJW2_imo1E4i6HxG_VpPe
 mcp_proxy_adapter/core/client_manager.py,sha256=RIOQqvoefxfjZIDLobnsQW2-_d5iA9wx4n145aIX7NI,9001
 mcp_proxy_adapter/core/client_security.py,sha256=xxws0brmT5dEKyL4vEJQZsL4PH_iXdbzsFJqCsf45Bw,13463
 mcp_proxy_adapter/core/config_converter.py,sha256=_aMJPFwKIbMlzLgtpEHBbXp_PgScKMGHGvXnq95GzgA,17654
-mcp_proxy_adapter/core/config_validator.py,sha256=yzDbBnx12pFKGOXeE_Xayymco8L5MJJosvYBVCJUQ34,55284
+mcp_proxy_adapter/core/config_validator.py,sha256=i0tkmWPPugG5XwQvBGoNuANZwMoHidlFOIhWSezI3QE,59666
 mcp_proxy_adapter/core/crl_utils.py,sha256=JagcJBkGY-YEmkhRWBDDkfi75wIyBOlf6s7YvXgTiHI,11992
 mcp_proxy_adapter/core/errors.py,sha256=CyhQgvMt0ooQjONa65XRBJ44y-l-E5_ES4KOuRvIpBk,8557
 mcp_proxy_adapter/core/logging.py,sha256=g0ZPyDZa8sR_d1OPf-kdEEApUTp1FX_BXajrQdge6IA,8791
@@ -72,7 +72,7 @@ mcp_proxy_adapter/core/mtls_proxy.py,sha256=f_B_cB0REzHiL2WZQPBCwzQnKAzT5s0qsZ8t
 mcp_proxy_adapter/core/mtls_server.py,sha256=dhx_KXEmq8lMI2F6XEpoNybGnVzXeuVyR2abJ0_VZkE,10740
 mcp_proxy_adapter/core/protocol_manager.py,sha256=LzQMxnBfF4UKr1ZTgfK5_KDQEKrHhoJgzw1C-YJjtoQ,15055
 mcp_proxy_adapter/core/proxy_client.py,sha256=T9rqITYNijAw-yE4wvBe7ABN-LhJjkbIEeK6Rv1iUeA,6100
-mcp_proxy_adapter/core/proxy_registration.py,sha256=wBiRT9nSn3PpLQos69Umvuo3B5MX3oXwQVBLQ0OaeI4,41792
+mcp_proxy_adapter/core/proxy_registration.py,sha256=bguolcyGaClcEuRkBkl5s8CnHsn5Vy4yrN9k2jrEM2I,42810
 mcp_proxy_adapter/core/role_utils.py,sha256=YwRenGoXI5YrHVbFjKFAH2DJs2miyqhcr9LWF7mxieg,12284
 mcp_proxy_adapter/core/security_adapter.py,sha256=ArBYnAKh4HsVAow1Qy17apkgWGn6TSiu4yVfdwXE0lk,13189
 mcp_proxy_adapter/core/security_factory.py,sha256=u_WUwnNSTsTFwRV-uwyRufbcUSeOrdZATGs4NEmfNA0,8211
@@ -89,7 +89,7 @@ mcp_proxy_adapter/examples/__init__.py,sha256=k1F-EotAFbJ3JvK_rNgiH4bUztmxIWtYn0
 mcp_proxy_adapter/examples/bugfix_certificate_config.py,sha256=YGBE_SI6wYZUJLWl7-fP1OWXiSH4mHJAZHApgQWvG7s,10529
 mcp_proxy_adapter/examples/cert_manager_bugfix.py,sha256=pwifGipvxQX2WR0sTYZWs0k8g_C228Kd5KJuR0wYB_s,7285
 mcp_proxy_adapter/examples/check_config.py,sha256=oDP3cymq76TqEpPztPihH-_sBktiEb2cG0MdVrY1Sj8,14104
-mcp_proxy_adapter/examples/config_builder.py,sha256=z0I5d83kdNVaR1ATaeT_P4jmxBiIcovlNu7-9I6zgcQ,6978
+mcp_proxy_adapter/examples/config_builder.py,sha256=w4qXjMGgyoEZbQl1dbur6wiTC3KjaA9p6N3IP_-km5U,7008
 mcp_proxy_adapter/examples/config_cli.py,sha256=ZhVG6XEpTFe5-MzELByVsUh0AD4bHPBZeoXnGWbqifs,11059
 mcp_proxy_adapter/examples/create_test_configs.py,sha256=9TrvLa4-bWLPu0SB1JXwWuCsjj-4Vz3yAdowcHtCSSA,8228
 mcp_proxy_adapter/examples/debug_request_state.py,sha256=Z3Gy2-fWtu7KIV9OkzGDLVz7TpL_h9V_99ica40uQBU,4489
@@ -142,8 +142,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.23.dist-info/METADATA,sha256=Wn5Pd1sRjnuXqqSZLz6XdnyYqttAUXRVjApjB_Wg_Aw,8539
-mcp_proxy_adapter-6.9.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.9.23.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.9.23.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.9.23.dist-info/RECORD,,
+mcp_proxy_adapter-6.9.25.dist-info/METADATA,sha256=fCo-1vIB1WCjsOzQuB-UnVNnTzcGsyE6revoPZpJNyY,8539
+mcp_proxy_adapter-6.9.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.9.25.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.9.25.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.9.25.dist-info/RECORD,,