rebase and test

Signed-off-by: Mihai Criveti <[email protected]>

Author: crivetimihai

mcpgateway/main.py

@@ -303,12 +303,19 @@ async def lifespan(_app: FastAPI) -> AsyncIterator[None]:
             logger.info(f"Plugin manager initialized with {plugin_manager.plugin_count} plugins")
 
         if settings.enable_header_passthrough:
+            logger.info(f"🔄 Header Passthrough: ENABLED (default headers: {settings.default_passthrough_headers})")
+            if settings.enable_overwrite_base_headers:
+                logger.warning("⚠️  Base Header Override: ENABLED - Client headers can override gateway headers")
+            else:
+                logger.info("🔒 Base Header Override: DISABLED - Gateway headers take precedence")
             db_gen = get_db()
             db = next(db_gen)  # pylint: disable=stop-iteration-return
             try:
                 await set_global_passthrough_headers(db)
             finally:
                 db.close()
+        else:
+            logger.info("🔒 Header Passthrough: DISABLED")
 
         await tool_service.initialize()
         await resource_service.initialize()

tests/unit/mcpgateway/utils/test_passthrough_headers.py

@@ -125,6 +125,7 @@ def test_authorization_conflict_bearer_auth(self, mock_settings, caplog):
     def test_base_header_conflict_prevention(self, mock_settings, caplog):
         """Test that request headers don't override base headers."""
         mock_settings.enable_header_passthrough = True
+        mock_settings.enable_overwrite_base_headers = False
 
         mock_db = Mock()
         mock_global_config = Mock(spec=GlobalConfig)
@@ -412,6 +413,7 @@ def test_database_query_called_correctly(self, mock_settings):
     def test_logging_levels(self, mock_settings, caplog):
         """Test that appropriate log levels are used for different scenarios."""
         mock_settings.enable_header_passthrough = True
+        mock_settings.enable_overwrite_base_headers = False
 
         mock_db = Mock()
         mock_global_config = Mock(spec=GlobalConfig)