Merge remote-tracking branch 'refs/remotes/origin/main'

Author: crivetimihai

mcpgateway/config.py

@@ -317,6 +317,7 @@ def validate_database(self) -> None:
         "text/plain",
         "text/html",
         "text/css",
+        "text/markdown",
         "text/javascript",
         "application/json",
         "application/xml",

mcpgateway/services/resource_service.py

@@ -21,7 +21,6 @@
 import mimetypes
 import re
 from typing import Any, AsyncGenerator, Dict, List, Optional, Union
-from urllib.parse import urlparse
 
 # Third-Party
 import parse
@@ -156,7 +155,6 @@ async def register_resource(self, db: Session, resource: ResourceCreate) -> Reso
 
         Raises:
             ResourceURIConflictError: If resource URI already exists
-            ResourceValidationError: If resource validation fails
             ResourceError: For other resource registration errors
         """
         try:
@@ -170,10 +168,6 @@ async def register_resource(self, db: Session, resource: ResourceCreate) -> Reso
                     resource_id=existing_resource.id,
                 )
 
-            # Validate URI
-            if not self._is_valid_uri(resource.uri):
-                raise ResourceValidationError(f"Invalid URI: {resource.uri}")
-
             # Detect mime type if not provided
             mime_type = resource.mime_type
             if not mime_type:
@@ -642,21 +636,6 @@ async def subscribe_events(self, uri: Optional[str] = None) -> AsyncGenerator[Di
                 if not self._event_subscribers["*"]:
                     del self._event_subscribers["*"]
 
-    def _is_valid_uri(self, uri: str) -> bool:
-        """Validate a resource URI.
-
-        Args:
-            uri: URI to validate
-
-        Returns:
-            True if URI is valid
-        """
-        try:
-            parsed = urlparse(uri)
-            return bool(parsed.scheme and parsed.path)
-        except Exception:
-            return False
-
     def _detect_mime_type(self, uri: str, content: Union[str, bytes]) -> str:
         """Detect mime type from URI and content.
 

tests/unit/mcpgateway/services/test_resource_service.py

@@ -172,7 +172,6 @@ async def test_register_resource_success(self, resource_service, mock_db, sample
 
         # Mock validation and notification
         with (
-            patch.object(resource_service, "_is_valid_uri", return_value=True),
             patch.object(resource_service, "_detect_mime_type", return_value="text/plain"),
             patch.object(resource_service, "_notify_resource_added", new_callable=AsyncMock),
             patch.object(resource_service, "_convert_resource_to_read") as mock_convert,
@@ -238,19 +237,12 @@ async def test_register_resource_uri_conflict_inactive(self, resource_service, m
         assert "inactive" in str(exc_info.value)
 
     @pytest.mark.asyncio
-    async def test_register_resource_invalid_uri(self, resource_service, mock_db, sample_resource_create):
-        """Test registration with invalid URI."""
-        # Mock no existing resource
-        mock_scalar = MagicMock()
-        mock_scalar.scalar_one_or_none.return_value = None
-        mock_db.execute.return_value = mock_scalar
-
-        # Mock invalid URI validation
-        with patch.object(resource_service, "_is_valid_uri", return_value=False):
-            with pytest.raises(ResourceError) as exc_info:  # Changed to ResourceError as that's what's actually raised
-                await resource_service.register_resource(mock_db, sample_resource_create)
+    async def test_resource_create_with_invalid_uri(self):
+        """Test resource creation with invalid URI."""
+        with pytest.raises(ValueError) as exc_info:
+            ResourceCreate(uri="../invalid/uri", name="Bad URI", content="data")
 
-            assert "Invalid URI" in str(exc_info.value)
+        assert "cannot contain directory traversal sequences" in str(exc_info.value)
 
     @pytest.mark.asyncio
     async def test_register_resource_integrity_error(self, resource_service, mock_db, sample_resource_create):
@@ -261,7 +253,7 @@ async def test_register_resource_integrity_error(self, resource_service, mock_db
         mock_db.execute.return_value = mock_scalar
 
         # Mock validation success
-        with patch.object(resource_service, "_is_valid_uri", return_value=True), patch.object(resource_service, "_detect_mime_type", return_value="text/plain"):
+        with patch.object(resource_service, "_detect_mime_type", return_value="text/plain"):
             # Mock IntegrityError on commit
             mock_db.commit.side_effect = IntegrityError("", "", "")
 
@@ -283,7 +275,6 @@ async def test_register_resource_binary_content(self, resource_service, mock_db)
 
         # Mock validation
         with (
-            patch.object(resource_service, "_is_valid_uri", return_value=True),
             patch.object(resource_service, "_detect_mime_type", return_value="application/octet-stream"),
             patch.object(resource_service, "_notify_resource_added", new_callable=AsyncMock),
             patch.object(resource_service, "_convert_resource_to_read") as mock_convert,
@@ -1069,23 +1060,6 @@ async def test_reset_metrics(self, resource_service, mock_db):
 class TestUtilityMethods:
     """Test utility methods."""
 
-    @pytest.mark.parametrize(
-        "uri, expected",
-        [
-            ("http://example.com/test", True),
-            ("https://example.com/test", True),
-            ("file:///path/to/resource", True),
-            ("ftp://example.com/file", True),
-            ("invalid-uri", False),
-            ("", False),
-            ("http://", False),
-        ],
-    )
-    def test_is_valid_uri(self, resource_service, uri, expected):
-        """Test URI validation."""
-        result = resource_service._is_valid_uri(uri)
-        assert result == expected
-
     @pytest.mark.parametrize(
         "uri, content, expected",
         [
@@ -1247,7 +1221,7 @@ async def test_register_resource_generic_error(self, resource_service, mock_db,
         mock_db.execute.return_value = mock_scalar
 
         # Mock validation success
-        with patch.object(resource_service, "_is_valid_uri", return_value=True), patch.object(resource_service, "_detect_mime_type", return_value="text/plain"):
+        with patch.object(resource_service, "_detect_mime_type", return_value="text/plain"):
             # Mock generic error on add
             mock_db.add.side_effect = Exception("Generic error")