π OpenHands: AI-Driven Development
Fix fragile URL parsing in Bitbucket service search_repositories method (#10733)
Rohit Malhotraf61fa935966f
diff --git a/openhands/integrations/bitbucket/service/repos.py b/openhands/integrations/bitbucket/service/repos.pyindex 1582c5f71d..b2ab99e380 100644--- a/openhands/integrations/bitbucket/service/repos.py+++ b/openhands/integrations/bitbucket/service/repos.py@@ -1,5 +1,6 @@import refrom typing import Any+from urllib.parse import urlparsefrom openhands.integrations.bitbucket.service.base import BitBucketMixinBasefrom openhands.integrations.service_types import Repository, SuggestedTask@@ -18,18 +19,28 @@ class BitBucketReposMixin(BitBucketMixinBase):repositories = []if public:- # Extract workspace and repo from URL+ # Extract workspace and repo from URL using robust URL parsing# URL format: https://{domain}/{workspace}/{repo}/{additional_params}- # Split by '/' and find workspace and repo parts- url_parts = query.split('/')- if len(url_parts) >= 5: # https:, '', domain, workspace, repo- workspace_slug = url_parts[3]- repo_name = url_parts[4]-- repo = await self.get_repository_details_from_repo_name(- f'{workspace_slug}/{repo_name}'- )- repositories.append(repo)+ try:+ parsed_url = urlparse(query)+ # Remove leading slash and split path into segments+ path_segments = [+ segment for segment in parsed_url.path.split('/') if segment+ ]++ # We need at least 2 path segments: workspace and repo+ if len(path_segments) >= 2:+ workspace_slug = path_segments[0]+ repo_name = path_segments[1]++ repo = await self.get_repository_details_from_repo_name(+ f'{workspace_slug}/{repo_name}'+ )+ repositories.append(repo)+ except (ValueError, IndexError):+ # If URL parsing fails or doesn't have expected structure,+ # return empty list for public search+ passreturn repositoriesdiff --git a/tests/unit/integrations/bitbucket/test_bitbucket_repos.py b/tests/unit/integrations/bitbucket/test_bitbucket_repos.pynew file mode 100644index 0000000000..5d8dc630d5--- /dev/null+++ b/tests/unit/integrations/bitbucket/test_bitbucket_repos.py@@ -0,0 +1,113 @@+"""Tests for Bitbucket repository service URL parsing."""++from unittest.mock import patch++import pytest+from pydantic import SecretStr++from openhands.integrations.bitbucket.bitbucket_service import BitBucketService+from openhands.integrations.service_types import OwnerType, Repository+from openhands.integrations.service_types import ProviderType as ServiceProviderType+++def bitbucket_service():+ """Create a BitBucketService instance for testing."""+ return BitBucketService(token=SecretStr('test-token'))+++async def test_search_repositories_url_parsing_standard_url(bitbucket_service):+ """Test URL parsing with standard Bitbucket URL and verify correct workspace/repo extraction."""+ mock_repo = Repository(+ id='1',+ full_name='workspace/repo',+ name='repo',+ owner=OwnerType.USER,+ git_provider=ServiceProviderType.BITBUCKET,+ is_public=True,+ clone_url='https://bitbucket.org/workspace/repo.git',+ html_url='https://bitbucket.org/workspace/repo',+ )++ with patch.object(+ bitbucket_service,+ 'get_repository_details_from_repo_name',+ return_value=mock_repo,+ ) as mock_get_repo:+ url = 'https://bitbucket.org/workspace/repo'+ repositories = await bitbucket_service.search_repositories(+ query=url, per_page=10, sort='updated', order='desc', public=True+ )++ # Verify the correct workspace/repo combination was extracted and passed+ assert len(repositories) == 1+ assert repositories[0].full_name == 'workspace/repo'+ mock_get_repo.assert_called_once_with('workspace/repo')+++async def test_search_repositories_url_parsing_with_extra_path_segments(+ bitbucket_service,+):+ """Test URL parsing with additional path segments and verify correct workspace/repo extraction."""+ mock_repo = Repository(+ id='1',+ full_name='my-workspace/my-repo',+ name='my-repo',+ owner=OwnerType.USER,+ git_provider=ServiceProviderType.BITBUCKET,+ is_public=True,+ clone_url='https://bitbucket.org/my-workspace/my-repo.git',+ html_url='https://bitbucket.org/my-workspace/my-repo',+ )++ with patch.object(+ bitbucket_service,+ 'get_repository_details_from_repo_name',+ return_value=mock_repo,+ ) as mock_get_repo:+ # Test complex URL with query params, fragments, and extra paths+ url = 'https://bitbucket.org/my-workspace/my-repo/src/feature-branch/src/main.py?at=feature-branch&fileviewer=file-view-default#lines-25'+ repositories = await bitbucket_service.search_repositories(+ query=url, per_page=10, sort='updated', order='desc', public=True+ )++ # Verify the correct workspace/repo combination was extracted from complex URL+ assert len(repositories) == 1+ assert repositories[0].full_name == 'my-workspace/my-repo'+ mock_get_repo.assert_called_once_with('my-workspace/my-repo')+++async def test_search_repositories_url_parsing_invalid_url(bitbucket_service):+ """Test URL parsing with invalid URL returns empty results."""+ with patch.object(+ bitbucket_service, 'get_repository_details_from_repo_name'+ ) as mock_get_repo:+ url = 'not-a-valid-url'+ repositories = await bitbucket_service.search_repositories(+ query=url, per_page=10, sort='updated', order='desc', public=True+ )++ # Should return empty list for invalid URL and not call API+ assert len(repositories) == 0+ mock_get_repo.assert_not_called()+++async def test_search_repositories_url_parsing_insufficient_path_segments(+ bitbucket_service,+):+ """Test URL parsing with insufficient path segments returns empty results."""+ with patch.object(+ bitbucket_service, 'get_repository_details_from_repo_name'+ ) as mock_get_repo:+ url = 'https://bitbucket.org/workspace'+ repositories = await bitbucket_service.search_repositories(+ query=url, per_page=10, sort='updated', order='desc', public=True+ )++ # Should return empty list for insufficient path segments and not call API+ assert len(repositories) == 0+ mock_get_repo.assert_not_called()