Rebased

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

Author: crivetimihai

mcpgateway/alembic/versions/eb17fd368f9d_merge_passthrough_headers_and_tags_.py

@@ -0,0 +1,24 @@
+"""merge passthrough headers and tags support
+
+Revision ID: eb17fd368f9d
+Revises: 3b17fdc40a8d, cc7b95fec5d9
+Create Date: 2025-08-08 05:31:10.857718
+
+"""
+
+# Standard
+from typing import Sequence, Union
+
+# revision identifiers, used by Alembic.
+revision: str = "eb17fd368f9d"
+down_revision: Union[str, Sequence[str], None] = ("3b17fdc40a8d", "cc7b95fec5d9")
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+
+
+def downgrade() -> None:
+    """Downgrade schema."""

mcpgateway/db.py

@@ -1113,7 +1113,7 @@ class Gateway(Base):
     reachable: Mapped[bool] = mapped_column(default=True)
     last_seen: Mapped[Optional[datetime]]
     tags: Mapped[List[str]] = mapped_column(JSON, default=list, nullable=False)
-    
+
     # Header passthrough configuration
     passthrough_headers: Mapped[Optional[List[str]]] = mapped_column(JSON, nullable=True)  # Store list of strings as JSON array
 

mcpgateway/services/__init__.py

@@ -12,6 +12,7 @@
 - Gateway coordination
 """
 
+# First-Party
 from mcpgateway.services.gateway_service import GatewayError, GatewayService
 from mcpgateway.services.prompt_service import PromptError, PromptService
 from mcpgateway.services.resource_service import ResourceError, ResourceService

mcpgateway/services/tool_service.py

@@ -333,7 +333,9 @@ async def register_tool(self, db: Session, tool: ToolCreate) -> ToolRead:
         except Exception as ex:
             raise ToolError(f"Failed to register tool: {str(ex)}")
 
-    async def list_tools(self, db: Session, include_inactive: bool = False, cursor: Optional[str] = None, tags: Optional[List[str]] = None, request_headers: Optional[Dict[str, str]] = None) -> List[ToolRead]:
+    async def list_tools(
+        self, db: Session, include_inactive: bool = False, cursor: Optional[str] = None, tags: Optional[List[str]] = None, request_headers: Optional[Dict[str, str]] = None
+    ) -> List[ToolRead]:
         """
         Retrieve a list of registered tools from the database.
 

tests/unit/mcpgateway/services/test_tag_service.py

@@ -411,7 +411,7 @@ async def test_update_stats(tag_service):
 
     # Test invalid entity type (should not crash or increment)
     tag_service._update_stats(stats, "invalid")
-    assert stats.total == 5  # Should remain unchanged
+    assert stats.total == 5  # Should remain unmodified
 
 
 @pytest.mark.asyncio

tests/unit/mcpgateway/utils/test_passthrough_headers.py

@@ -99,13 +99,13 @@ def test_authorization_conflict_basic_auth(self, caplog):
 
         # Authorization should be blocked, X-Tenant-Id should pass through
         expected = {
-            "Content-Type": "application/json", 
+            "Content-Type": "application/json",
             "X-Tenant-Id": "acme-corp"
         }
         assert result == expected
-        
+
         # Check warning was logged
-        assert any("Skipping Authorization header passthrough due to basic auth" in record.message 
+        assert any("Skipping Authorization header passthrough due to basic auth" in record.message
                   for record in caplog.records)
 
     def test_authorization_conflict_bearer_auth(self, caplog):
@@ -158,7 +158,7 @@ def test_base_header_conflict_prevention(self, caplog):
         assert result == expected
 
         # Check conflict warning was logged
-        assert any("conflicts with pre-defined headers" in record.message 
+        assert any("conflicts with pre-defined headers" in record.message
                   for record in caplog.records)
 
     def test_case_insensitive_header_matching(self):
@@ -170,7 +170,7 @@ def test_case_insensitive_header_matching(self):
 
         # Request headers are expected to be normalized to lowercase
         request_headers = {
-            "x-tenant-id": "mixed-case-value",  # Lowercase key  
+            "x-tenant-id": "mixed-case-value",  # Lowercase key
             "authorization": "bearer lowercase-header"
         }
         base_headers = {}
@@ -237,7 +237,7 @@ def test_none_allowed_headers(self):
         # Mock settings fallback
         with patch('mcpgateway.utils.passthrough_headers.settings') as mock_settings:
             mock_settings.default_passthrough_headers = ["X-Default"]
-            
+
             result = get_passthrough_headers(request_headers, base_headers, mock_db)
 
         # Should fall back to settings, but request doesn't have X-Default
@@ -255,7 +255,7 @@ def test_no_global_config_fallback_to_settings(self):
         # Mock settings fallback
         with patch('mcpgateway.utils.passthrough_headers.settings') as mock_settings:
             mock_settings.default_passthrough_headers = ["X-Default"]
-            
+
             result = get_passthrough_headers(request_headers, base_headers, mock_db)
 
         expected = {
@@ -311,7 +311,7 @@ def test_base_headers_not_modified(self):
 
         # Original base_headers should not be modified
         assert base_headers == original_base
-        
+
         # Result should include both base and passthrough headers
         assert "Content-Type" in result
         assert "X-Tenant-Id" in result
@@ -328,7 +328,7 @@ def test_multiple_auth_type_conflicts(self, caplog):
 
         # Test with different auth types
         auth_types = ["basic", "bearer", "api-key", None]
-        
+
         for auth_type in auth_types:
             caplog.clear()
             mock_gateway = Mock(spec=DbGateway)
@@ -418,8 +418,8 @@ def test_logging_levels(self, caplog):
 
         # Should have warnings for: missing header, auth conflict, base header conflict
         warning_messages = [record.message for record in caplog.records if record.levelno == logging.WARNING]
-        
+
         assert len(warning_messages) == 3
         assert any("not found in request headers" in msg for msg in warning_messages)
         assert any("due to basic auth" in msg for msg in warning_messages)
-        assert any("conflicts with pre-defined headers" in msg for msg in warning_messages)
+        assert any("conflicts with pre-defined headers" in msg for msg in warning_messages)