mcp-proxy-adapter 6.9.28__py3-none-any.whl → 6.9.30__py3-none-any.whl

mcp_proxy_adapter/examples/generate_config.py

@@ -11,7 +11,6 @@ import json
 import os
 import sys
 from pathlib import Path
-from typing import Dict, Any, Optional
 
 # Add the current directory to the path to import config_builder
 sys.path.insert(0, str(Path(__file__).parent))
@@ -37,7 +36,7 @@ def create_config_from_flags(
     key_dir: str = "./keys",
     output_dir: str = "./configs",
     proxy_registration: bool = False,
-    proxy_url: str = "http://localhost:3004",
+    proxy_url: str = None,
     auto_registration: bool = False,
     server_id: str = "mcp_proxy_adapter"
 ) -> Dict[str, Any]:
@@ -66,13 +65,25 @@ def create_config_from_flags(
     # Configure SSL based on protocol
     if protocol == "https":
         config["ssl"]["enabled"] = True
-        config["ssl"]["cert_file"] = f"{cert_dir}/server.crt"
-        config["ssl"]["key_file"] = f"{key_dir}/server.key"
+        config["ssl"]["cert_file"] = f"{cert_dir}/mcp-proxy.crt"
+        config["ssl"]["key_file"] = f"{key_dir}/mcp-proxy.key"
+        # Update transport for HTTPS
+        config["transport"]["type"] = "https"
+        config["transport"]["chk_hostname"] = True
     elif protocol == "mtls":
         config["ssl"]["enabled"] = True
-        config["ssl"]["cert_file"] = f"{cert_dir}/server.crt"
-        config["ssl"]["key_file"] = f"{key_dir}/server.key"
-        config["ssl"]["ca_cert"] = f"{cert_dir}/ca.crt"
+        config["ssl"]["cert_file"] = f"{cert_dir}/mcp-proxy.crt"
+        config["ssl"]["key_file"] = f"{key_dir}/mcp-proxy.key"
+        config["ssl"]["ca_cert"] = f"{cert_dir}/../ca/ca.crt"
+        # Update transport for mTLS
+        config["transport"]["type"] = "https"
+        config["transport"]["chk_hostname"] = False  # Disable hostname check for mTLS
+        config["transport"]["verify_client"] = True
+        # Add SSL section to transport for mTLS
+        config["transport"]["ssl"] = {
+            "verify_client": True,
+            "ca_cert": f"{cert_dir}/../ca/ca.crt"
+        }
     
     # Configure security if token authentication is enabled
     if token:
@@ -95,9 +106,22 @@ def create_config_from_flags(
     
     # Configure proxy registration if enabled
     if proxy_registration or auto_registration:
+        if not proxy_url:
+            raise ValueError("proxy_url is required when proxy registration is enabled")
+        
         config["proxy_registration"]["enabled"] = True
+        config["proxy_registration"]["protocol"] = protocol
         config["proxy_registration"]["proxy_url"] = proxy_url
         config["proxy_registration"]["server_id"] = server_id
+        
+        # Update server URL based on protocol
+        if protocol == "https" or protocol == "mtls":
+            config["proxy_registration"]["proxy_url"] = proxy_url.replace("http://", "https://")
+        
+        # For mTLS, disable DNS verification but keep SSL verification
+        if protocol == "mtls":
+            config["proxy_registration"]["verify_ssl"] = True
+            config["proxy_registration"]["verify_hostname"] = False  # Disable DNS verification only
     
     return config
 
@@ -296,10 +320,10 @@ Examples:
   python generate_config.py --protocol mtls --roles
   
         # Generate mTLS configuration with automatic proxy registration
-        python generate_config.py --protocol mtls --auto-registration --proxy-url https://mcp-proxy:3004
+        python generate_config.py --protocol mtls --auto-registration --proxy-url https://172.28.0.10:3004
         
         # Generate HTTP configuration with automatic proxy registration
-        python generate_config.py --protocol http --proxy-registration --proxy-url http://localhost:3004
+        python generate_config.py --protocol http --proxy-registration --proxy-url http://172.28.0.10:3004
         """
     )
     
@@ -312,8 +336,8 @@ Examples:
                        help="Enable role-based access control")
     parser.add_argument("--proxy-registration", action="store_true", 
                        help="Enable proxy registration with auto-determined parameters")
-    parser.add_argument("--proxy-url", default="http://localhost:3004", 
-                       help="Proxy URL for registration (default: http://localhost:3004)")
+    parser.add_argument("--proxy-url", 
+                       help="Proxy URL for registration (required when --proxy-registration is enabled)")
     parser.add_argument("--auto-registration", action="store_true",
                        help="Enable automatic proxy registration (same as --proxy-registration)")
     parser.add_argument("--server-id", default="mcp_proxy_adapter",
@@ -349,6 +373,32 @@ Examples:
     
     args = parser.parse_args()
     
+    # Validate required arguments
+    if not args.validate_only and not args.all and not args.full_config:
+        if not args.protocol:
+            parser.error("--protocol is required")
+        
+        if (args.proxy_registration or args.auto_registration) and not args.proxy_url:
+            parser.error("--proxy-url is required when --proxy-registration or --auto-registration is enabled")
+        
+        # Validate port range
+        if not (1 <= args.port <= 65535):
+            parser.error("Port must be between 1 and 65535")
+        
+        # Validate certificate directories for HTTPS/mTLS
+        if args.protocol in ['https', 'mtls']:
+            if not os.path.exists(args.cert_dir):
+                parser.error(f"Certificate directory does not exist: {args.cert_dir}")
+            if not os.path.exists(args.key_dir):
+                parser.error(f"Key directory does not exist: {args.key_dir}")
+        
+        # Validate output directory
+        if not os.path.exists(args.output_dir):
+            try:
+                os.makedirs(args.output_dir, exist_ok=True)
+            except OSError as e:
+                parser.error(f"Cannot create output directory {args.output_dir}: {e}")
+    
     try:
         if args.validate_only:
             # Validate existing configuration file
@@ -403,12 +453,16 @@ Examples:
                 config_file = save_config(config, filename, args.output_dir, validate=not args.no_validate)
                 print(f"✅ Full configuration saved to: {config_file}")
         elif args.protocol:
+            
             # Generate specific configuration
             config = create_config_from_flags(
                 protocol=args.protocol,
                 token=args.token,
                 roles=args.roles,
                 port=args.port,
+                cert_dir=args.cert_dir,
+                key_dir=args.key_dir,
+                output_dir=args.output_dir,
                 proxy_registration=args.proxy_registration,
                 proxy_url=args.proxy_url,
                 auto_registration=args.auto_registration,