mcp-proxy-adapter 6.4.48__py3-none-any.whl → 6.6.0__py3-none-any.whl

mcp_proxy_adapter/examples/test_config_builder.py

@@ -60,7 +60,9 @@ class TestConfigBuilder:
         config = builder.set_protocol(Protocol.HTTP).build()
         
         assert config["ssl"]["enabled"] is False
+        assert config["ssl"]["chk_hostname"] is False
         assert config["security"]["ssl"]["enabled"] is False
+        assert config["security"]["ssl"]["chk_hostname"] is False
         assert config["protocols"]["allowed_protocols"] == ["http"]
         assert config["protocols"]["default_protocol"] == "http"
         assert config["protocols"]["protocol_handlers"]["http"]["enabled"] is True
@@ -73,11 +75,13 @@ class TestConfigBuilder:
         config = builder.set_protocol(Protocol.HTTPS, cert_dir="/tmp/certs", key_dir="/tmp/keys").build()
         
         assert config["ssl"]["enabled"] is True
+        assert config["ssl"]["chk_hostname"] is True
         assert config["ssl"]["cert_file"] == "/tmp/certs/server_cert.pem"
         assert config["ssl"]["key_file"] == "/tmp/keys/server_key.pem"
         assert config["ssl"]["ca_cert"] == "/tmp/certs/ca_cert.pem"
         
         assert config["security"]["ssl"]["enabled"] is True
+        assert config["security"]["ssl"]["chk_hostname"] is True
         assert config["security"]["ssl"]["cert_file"] == "/tmp/certs/server_cert.pem"
         assert config["security"]["ssl"]["key_file"] == "/tmp/keys/server_key.pem"
         assert config["security"]["ssl"]["ca_cert_file"] == "/tmp/certs/ca_cert.pem"
@@ -94,10 +98,12 @@ class TestConfigBuilder:
         config = builder.set_protocol(Protocol.MTLS, cert_dir="/tmp/certs", key_dir="/tmp/keys").build()
         
         assert config["ssl"]["enabled"] is True
+        assert config["ssl"]["chk_hostname"] is True
         assert config["ssl"]["verify_client"] is True
         assert config["ssl"]["client_cert_required"] is True
         
         assert config["security"]["ssl"]["enabled"] is True
+        assert config["security"]["ssl"]["chk_hostname"] is True
         assert config["security"]["ssl"]["client_cert_file"] == "/tmp/certs/admin_cert.pem"
         assert config["security"]["ssl"]["client_key_file"] == "/tmp/keys/admin_key.pem"
         assert config["security"]["ssl"]["verify_mode"] == "CERT_REQUIRED"
@@ -186,6 +192,40 @@ class TestConfigBuilder:
         assert config["commands"]["enabled_commands"] == enabled
         assert config["commands"]["disabled_commands"] == disabled
     
+    def test_set_hostname_check(self):
+        """Test hostname check configuration."""
+        builder = ConfigBuilder()
+        
+        # Test enabling hostname check
+        config = builder.set_hostname_check(enabled=True).build()
+        assert config["ssl"]["chk_hostname"] is True
+        assert config["security"]["ssl"]["chk_hostname"] is True
+        
+        # Test disabling hostname check
+        config = builder.set_hostname_check(enabled=False).build()
+        assert config["ssl"]["chk_hostname"] is False
+        assert config["security"]["ssl"]["chk_hostname"] is False
+    
+    def test_hostname_check_with_protocols(self):
+        """Test hostname check behavior with different protocols."""
+        # HTTP should have chk_hostname = False
+        builder = ConfigBuilder()
+        config = builder.set_protocol(Protocol.HTTP).build()
+        assert config["ssl"]["chk_hostname"] is False
+        assert config["security"]["ssl"]["chk_hostname"] is False
+        
+        # HTTPS should have chk_hostname = True
+        builder = ConfigBuilder()
+        config = builder.set_protocol(Protocol.HTTPS).build()
+        assert config["ssl"]["chk_hostname"] is True
+        assert config["security"]["ssl"]["chk_hostname"] is True
+        
+        # mTLS should have chk_hostname = True
+        builder = ConfigBuilder()
+        config = builder.set_protocol(Protocol.MTLS).build()
+        assert config["ssl"]["chk_hostname"] is True
+        assert config["security"]["ssl"]["chk_hostname"] is True
+    
     def test_save_configuration(self):
         """Test saving configuration to file."""
         with tempfile.TemporaryDirectory() as temp_dir:

mcp_proxy_adapter/main.py

@@ -59,24 +59,41 @@ def main():
     host = config.get("server.host", "0.0.0.0")
     port = config.get("server.port", 8000)
 
-    # Get SSL configuration strictly from config (no hardcode)
-    ssl_enabled = config.get("ssl.enabled", False)
-    ssl_cert_file = config.get("ssl.cert_file")
-    ssl_key_file = config.get("ssl.key_file")
-    # Support both keys: ssl.ca_cert_file (security framework style) and ssl.ca_cert (legacy)
-    ssl_ca_cert = config.get("ssl.ca_cert_file", config.get("ssl.ca_cert"))
-    verify_client = config.get("ssl.verify_client", False)
-
-    print("🔍 Debug SSL config:")
+    # Get protocol and SSL configuration
+    protocol = config.get("server.protocol", "http")
+    ssl_enabled = protocol in ["https", "mtls"]
+    
+    # SSL configuration based on protocol
+    ssl_cert_file = None
+    ssl_key_file = None
+    ssl_ca_cert = None
+    verify_client = False
+    
+    if ssl_enabled:
+        # Configure SSL based on protocol
+        if protocol == "https":
+            # HTTPS - server SSL only
+            ssl_cert_file = "../../certs/server.crt"
+            ssl_key_file = "../../certs/server.key"
+            ssl_ca_cert = "../../certs/localhost_server.crt"
+            verify_client = False
+
+        elif protocol == "mtls":
+            # mTLS - server SSL + client certificate verification
+            # Use server.crt and server.key for server, and localhost_server.crt as CA
+            ssl_cert_file = "../../certs/server.crt"
+            ssl_key_file = "../../certs/server.key"
+            ssl_ca_cert = "../../certs/localhost_server.crt"
+            verify_client = False  # Disable client cert verification for testing
+
+    print("🔍 Debug config:")
+    print(f"   protocol: {protocol}")
     print(f"   ssl_enabled: {ssl_enabled}")
-    print(f"   ssl_cert_file: {ssl_cert_file}")
-    print(f"   ssl_key_file: {ssl_key_file}")
-    print(f"   ssl_ca_cert: {ssl_ca_cert}")
-    print(f"   verify_client: {verify_client}")
-    print("🔍 Source: configuration (hardcode disabled)")
+    print("🔍 Source: configuration")
 
     print("🚀 Starting MCP Proxy Adapter")
     print(f"🌐 Server: {host}:{port}")
+    print(f"🔒 Protocol: {protocol}")
     if ssl_enabled:
         print("🔐 SSL: Enabled")
         print(f"   Certificate: {ssl_cert_file}")
@@ -86,26 +103,36 @@ def main():
         print(f"   Client verification: {verify_client}")
     print("=" * 50)
 
-    # Configure hypercorn
+    # Configure hypercorn using framework
     config_hypercorn = hypercorn.config.Config()
     config_hypercorn.bind = [f"{host}:{port}"]
 
     if ssl_enabled and ssl_cert_file and ssl_key_file:
-        config_hypercorn.certfile = ssl_cert_file
-        config_hypercorn.keyfile = ssl_key_file
-
-        if ssl_ca_cert:
-            config_hypercorn.ca_certs = ssl_ca_cert
-
+        # Use framework to convert SSL configuration
+        from mcp_proxy_adapter.core.server_adapter import ServerConfigAdapter
+        
+        ssl_config = {
+            "cert_file": ssl_cert_file,
+            "key_file": ssl_key_file,
+            "ca_cert": ssl_ca_cert,
+            "verify_client": verify_client,
+            "chk_hostname": config.get("transport.ssl.chk_hostname", True)
+        }
+        
+        hypercorn_ssl = ServerConfigAdapter.convert_ssl_config_for_engine(ssl_config, "hypercorn")
+        
+        # Apply converted SSL configuration
+        for key, value in hypercorn_ssl.items():
+            setattr(config_hypercorn, key, value)
+        
+        print("🔐 SSL: Configured via framework")
         if verify_client:
-            # For mTLS, require client certificates
-            config_hypercorn.verify_mode = ssl.CERT_REQUIRED
             print("🔐 mTLS: Client certificate verification enabled")
         else:
-            print(
-                "🔐 HTTPS: Regular HTTPS without client certificate",
-            )
-            print("verification")
+            print("🔐 HTTPS: Regular HTTPS without client certificate verification")
+        
+        chk_hostname = ssl_config.get("chk_hostname", True)
+        print(f"🔍 Hostname checking: {'enabled' if chk_hostname else 'disabled'}")
 
         # Prefer modern protocols
         try:

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.4.48.dist-info → mcp_proxy_adapter-6.6.0.dist-info}/METADATA

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

@@ -1,10 +1,10 @@
 mcp_proxy_adapter/__init__.py,sha256=iH0EBBsRj_cfZJpAIsgN_8tTdfefhnl6uUKHjLHhWDQ,1037
 mcp_proxy_adapter/__main__.py,sha256=sq3tANRuTd18euamt0Bmn1sJeAyzXENZ5VvsMwbrDFA,579
-mcp_proxy_adapter/config.py,sha256=-7iVS0mUWWKNeao7nqTAFlUD6FcMwRlDkchN7OwYsr0,21662
+mcp_proxy_adapter/config.py,sha256=NmwYJPfnAFWmGsOlyYkMDfuqA-SeduuvTSjZKJbzbKc,20424
 mcp_proxy_adapter/custom_openapi.py,sha256=XRviX-C-ZkSKdBhORhDTdeN_1FWyEfXZADiASft3t9I,28149
-mcp_proxy_adapter/main.py,sha256=idp3KUR7CT7kTXLVPvvclJlNnt8d_HYl8_jY98uknmo,4677
+mcp_proxy_adapter/main.py,sha256=I9fYgMD8_RNYuSHn-paeTSr9coAuVlEkfLaWeYbZors,5724
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=Qsn1lO8hzs3Z5wG56326GM6FBBR72I5vBZv3h8BXVcI,75
+mcp_proxy_adapter/version.py,sha256=3wn4ixEY89A5pJaACrT6Pg-UKLFQTHKOi6F0jL-TyDo,74
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_proxy_adapter/api/app.py,sha256=cxjavhNTtaYg2ea-UeHSDnKh8edKVNQ2NbXUDYbufFU,34183
 mcp_proxy_adapter/api/handlers.py,sha256=X-hcMNVeTAu4yVkKJEChEsj2bFptUS6sLNN-Wysjkow,10011
@@ -20,7 +20,7 @@ mcp_proxy_adapter/api/middleware/logging.py,sha256=iME87hrbvyTjI-RJro5Cwao7VlHUI
 mcp_proxy_adapter/api/middleware/performance.py,sha256=-EvA7YIcTlxn8RuxlWlScJvX2EIoeEp3P5dKVWZHYRY,2357
 mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=lFqGuT5M-USCTIVvZMH6Fgh3hxQNAmAoDeyYOBPpcbk,9161
 mcp_proxy_adapter/api/middleware/transport_middleware.py,sha256=VG1rWyuh-O2pdc0kQ3SADFvyh286o5Wrnkt8OFQ0WQw,4274
-mcp_proxy_adapter/api/middleware/unified_security.py,sha256=MhbawqXHbd-j99DYbN_1PyInTQNJqhkfczkTs4bOCI4,8322
+mcp_proxy_adapter/api/middleware/unified_security.py,sha256=QX4WUde03-T002Z3TgzhX0Tj2x7BFULOvOkCftsWqw8,8114
 mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=-N6cZOc7z6FUE7xRZ8xGgI4PnMyrJq0Jzpde9VNq6Zs,11077
 mcp_proxy_adapter/commands/__init__.py,sha256=eStfu2UrLfMvMTY6x20GD8sMPmPB1so-0QZQYV53nqo,1565
 mcp_proxy_adapter/commands/auth_validation_command.py,sha256=p4UrAaHyoCxMy98G1BUUlFJWjoelEJzX3OAWIiQaGls,14593
@@ -68,14 +68,14 @@ mcp_proxy_adapter/core/logging.py,sha256=gNI6vfPQC7jrUtVu6NeDsmU72JPlrRRBhtJipL1
 mcp_proxy_adapter/core/mtls_asgi.py,sha256=tvk0P9024s18dcCHY9AaQIecT4ojOTv21EuQWXwooU0,5200
 mcp_proxy_adapter/core/mtls_asgi_app.py,sha256=DT_fTUH1RkvBa3ThbyCyNb-XUHyCb4DqaKA1gcZC6z4,6538
 mcp_proxy_adapter/core/mtls_server.py,sha256=_hj6QWuExKX2LRohYvjPGFC2qTutS7ObegpEc09QijM,10117
-mcp_proxy_adapter/core/protocol_manager.py,sha256=3sWOAiMniQY5nu9CHkitIOGN4CXH28hOTwY92D0yasM,15268
+mcp_proxy_adapter/core/protocol_manager.py,sha256=iaXWsfm1XSfemz5QQBesMluc4cwf-LtuZVi9bm1uj28,14680
 mcp_proxy_adapter/core/proxy_client.py,sha256=CB6KBhV3vH2GU5nZ27VZ_xlNbYTAU_tnYFrkuK5He58,6094
 mcp_proxy_adapter/core/proxy_registration.py,sha256=m58w9iQd5zwXFIpuaDRXKPQ3fhQDBJPkD4w7m742ciY,35200
 mcp_proxy_adapter/core/role_utils.py,sha256=YwRenGoXI5YrHVbFjKFAH2DJs2miyqhcr9LWF7mxieg,12284
 mcp_proxy_adapter/core/security_adapter.py,sha256=MAtNthsp7Qj4-oLFzSi7Pr3vWQbWS_uelqa5LGgrXIE,12957
 mcp_proxy_adapter/core/security_factory.py,sha256=M-1McwUOmuV7Eo-m_P2undtJVNK_KIjDx8o_uRY8rLo,8005
-mcp_proxy_adapter/core/security_integration.py,sha256=oGYoJKrPoOqw262j3daeG8B6ro4pOGYMWmZR_hsTQOc,16881
-mcp_proxy_adapter/core/server_adapter.py,sha256=qKTHdVAwoCUHEF4G3EEUG7JTfLS49ucYMQSkQAz_F4E,9601
+mcp_proxy_adapter/core/security_integration.py,sha256=-5I4i9so_yMjc-zuGO-7zzIsMXemLvrch1q8WFVbIfg,14167
+mcp_proxy_adapter/core/server_adapter.py,sha256=-Tta9BzFCNO2TtdNmA8rd6ubzSGKiIoICpit_fczg1c,9748
 mcp_proxy_adapter/core/server_engine.py,sha256=qmxdkBv-YsQsvxVVQ-_xiAyDshxtnrKBquPJoUjo2fw,9471
 mcp_proxy_adapter/core/settings.py,sha256=D6cF4R_5gJ0XFGxzXUIzeqe-_muu6HL561TAei9wwZ0,10521
 mcp_proxy_adapter/core/ssl_utils.py,sha256=Rjl79d5LdhDzxiMtaIRd9OFh0hTeRANItYFXk-7c5pA,9498
@@ -85,7 +85,8 @@ mcp_proxy_adapter/core/utils.py,sha256=wBdDYBDWQ6zbwrnl9tykHjo0FjJVsLT_x8Bjk1lZX
 mcp_proxy_adapter/examples/__init__.py,sha256=k1F-EotAFbJ3JvK_rNgiH4bUztmxIWtYn0AfbAZ1ZGs,450
 mcp_proxy_adapter/examples/bugfix_certificate_config.py,sha256=YGBE_SI6wYZUJLWl7-fP1OWXiSH4mHJAZHApgQWvG7s,10529
 mcp_proxy_adapter/examples/cert_manager_bugfix.py,sha256=UWUwItjqHqSnOMHocsz40_3deoZE8-vdROLW9y2fEns,7259
-mcp_proxy_adapter/examples/config_builder.py,sha256=Uiu6m_L3UT9dHlqyc5sVWF7QSzJR6sM7Otv1CXGYfsg,24438
+mcp_proxy_adapter/examples/config_builder.py,sha256=kd3-donlGuDgZwJYsy_rjzrydBg_A1GaaJuJ8jj4VDc,9696
+mcp_proxy_adapter/examples/config_builder_simple.py,sha256=qTG3tIIu8eUW8gb06snaWHOTp0BFRRim38VqKrP2Ezo,9109
 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
@@ -102,12 +103,12 @@ mcp_proxy_adapter/examples/required_certificates.py,sha256=YW9-V78oFiZ-FmHlGP-8F
 mcp_proxy_adapter/examples/run_example.py,sha256=yp-a6HIrSk3ddQmbn0KkuKwErId0aNfj028TE6U-zmY,2626
 mcp_proxy_adapter/examples/run_full_test_suite.py,sha256=Zd7SINqi4UdiwDWaZrerh4e35XTqAUVApulEYtZx39M,25613
 mcp_proxy_adapter/examples/run_proxy_server.py,sha256=SBLSSY2F_VEBQD3MsCE_Pa9xFE6Sszr3vHdE9QOEN4Y,5242
-mcp_proxy_adapter/examples/run_security_tests_fixed.py,sha256=bZpMdKrfghP1NV2hf1d1TVXLZHgj2zgeuHZlFQ59hKQ,11853
-mcp_proxy_adapter/examples/security_test_client.py,sha256=2I0x7ViznpecXE6AOYH3TcUMVMumLK7xJ20lxPsvjsc,47937
+mcp_proxy_adapter/examples/run_security_tests_fixed.py,sha256=aIf57LcAlNUEoroRueZ9hRrnVkg0cRgr58vP2T-ZEXM,18328
+mcp_proxy_adapter/examples/security_test_client.py,sha256=HL0AhmmHZ9SHlUx6aJ32jTHJonjKmGil74ifLbsGkZA,48660
 mcp_proxy_adapter/examples/setup_test_environment.py,sha256=JkMqLpH5ZmkNKE7-WT52_kYMxEKLFOyQWbtip29TeiU,51629
 mcp_proxy_adapter/examples/simple_protocol_test.py,sha256=BzFUZvK9Fih3aG4IFLQTZPyPe_s6YjpZfB6uZmQ76rw,3969
 mcp_proxy_adapter/examples/test_config.py,sha256=ekEoUZe9q484vU_0IxOVhQdNMVJXG3IpmQpP--VmuDI,6491
-mcp_proxy_adapter/examples/test_config_builder.py,sha256=qd3tRHVP-dXY2PPxQM0h1VOYYZohrgP3bzRGk2EBTDg,19729
+mcp_proxy_adapter/examples/test_config_builder.py,sha256=SAcWIC54vzO0mrb1L9xZKK2IhNkZuSx7_cMEkC1Lm60,21607
 mcp_proxy_adapter/examples/test_examples.py,sha256=CYlVatdHUVC_rwv4NsvxFG3GXiKIyxPDUH43BOJHjrU,12330
 mcp_proxy_adapter/examples/test_protocol_examples.py,sha256=yCZzZrJ9ICXMkF1bAMozpin2QeTMI653bggPAZTRAUE,12138
 mcp_proxy_adapter/examples/universal_client.py,sha256=n1-cBPOiCipA86Zcc_mI_jMywDMZS1p3u5JT3AqTsrQ,27577
@@ -130,8 +131,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.4.48.dist-info/METADATA,sha256=-oqVyOxCI_0i_8ZIvZcpFMPvwJI1dnGgnvVsef0AGII,8511
-mcp_proxy_adapter-6.4.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.4.48.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.4.48.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.4.48.dist-info/RECORD,,
+mcp_proxy_adapter-6.6.0.dist-info/METADATA,sha256=WSvtaCv_mkqE20kqYWmmJSt_UkCUqmKi4w7vVSLweeo,8510
+mcp_proxy_adapter-6.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.6.0.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.6.0.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.6.0.dist-info/RECORD,,