Skip to content

🙌 OpenHands: AI-Driven Development

[ALL-1887] Add Entra-backed Azure DevOps auth for enterprise (#14567)

Alonafd1425ff1d9b
diff --git a/.dockerignore b/.dockerignore
index 4bd00d088e..c6c8c51bc3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -13,6 +13,7 @@ frontend/node_modules
# Hidden files and directories
.*
+**/.venv
__pycache__
# Unneded files and directories
diff --git a/enterprise/enterprise_local/convert_to_env.py b/enterprise/enterprise_local/convert_to_env.py
index 9863d333bb..5081646e2d 100644
--- a/enterprise/enterprise_local/convert_to_env.py
+++ b/enterprise/enterprise_local/convert_to_env.py
@@ -112,6 +112,9 @@ lines.append(
lines.append(
'OPENHANDS_BITBUCKET_DATA_CENTER_SERVICE_CLS=integrations.bitbucket_data_center.bitbucket_dc_service.SaaSBitbucketDCService'
)
+lines.append(
+ 'OPENHANDS_AZURE_DEVOPS_SERVICE_CLS=integrations.azure_devops.azure_devops_service.SaaSAzureDevOpsService'
+)
lines.append('POSTHOG_CLIENT_KEY=test')
lines.append('ENABLE_PROACTIVE_CONVERSATION_STARTERS=true')
lines.append('MAX_CONCURRENT_CONVERSATIONS=10')
diff --git a/enterprise/integrations/azure_devops/__init__.py b/enterprise/integrations/azure_devops/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/enterprise/integrations/azure_devops/azure_devops_service.py b/enterprise/integrations/azure_devops/azure_devops_service.py
new file mode 100644
index 0000000000..5111fda90e
--- /dev/null
+++ b/enterprise/integrations/azure_devops/azure_devops_service.py
@@ -0,0 +1,124 @@
+from pydantic import SecretStr
+from server.auth.constants import AZURE_DEVOPS_ORGANIZATION
+from server.auth.token_manager import TokenManager
+
+from openhands.app_server.integrations.azure_devops.azure_devops_service import (
+ AzureDevOpsService,
+)
+from openhands.app_server.integrations.service_types import ProviderType
+from openhands.app_server.utils.logger import openhands_logger as logger
+
+
+class SaaSAzureDevOpsService(AzureDevOpsService):
+ def __init__(
+ self,
+ user_id: str | None = None,
+ external_auth_token: SecretStr | None = None,
+ external_auth_id: str | None = None,
+ token: SecretStr | None = None,
+ external_token_manager: bool = False,
+ base_domain: str | None = None,
+ ):
+ configured_org = AZURE_DEVOPS_ORGANIZATION or None
+ super().__init__(
+ user_id=user_id,
+ external_auth_token=external_auth_token,
+ external_auth_id=external_auth_id,
+ token=token,
+ external_token_manager=external_token_manager,
+ base_domain=base_domain or configured_org,
+ )
+
+ self.external_auth_token = external_auth_token
+ self.external_auth_id = external_auth_id
+ self.token_manager = TokenManager(external=external_token_manager)
+ self.refresh = True
+
+ async def get_latest_token(self) -> SecretStr | None:
+ azure_devops_token = None
+ if self.external_auth_token:
+ azure_devops_token = SecretStr(
+ await self.token_manager.get_idp_token(
+ self.external_auth_token.get_secret_value(),
+ idp=ProviderType.AZURE_DEVOPS,
+ )
+ )
+ logger.debug('Got Azure DevOps token via external_auth_token')
+ elif self.external_auth_id:
+ offline_token = await self.token_manager.load_offline_token(
+ self.external_auth_id
+ )
+ azure_devops_token_str: str | None = (
+ await self.token_manager.get_idp_token_from_offline_token(
+ offline_token, ProviderType.AZURE_DEVOPS
+ )
+ if offline_token
+ else None
+ )
+ azure_devops_token = (
+ SecretStr(azure_devops_token_str) if azure_devops_token_str else None
+ )
+ logger.debug('Got Azure DevOps token via external_auth_id')
+ elif self.user_id:
+ azure_devops_token_str = (
+ await self.token_manager.get_idp_token_from_idp_user_id(
+ self.user_id, ProviderType.AZURE_DEVOPS
+ )
+ )
+ azure_devops_token = (
+ SecretStr(azure_devops_token_str) if azure_devops_token_str else None
+ )
+ logger.debug('Got Azure DevOps token via user_id')
+ else:
+ logger.warning('external_auth_token and user_id not set!')
+ if azure_devops_token:
+ self.token = azure_devops_token
+ return azure_devops_token
+
+ async def get_installations(self) -> list[str]:
+ if self.organization:
+ return [self.organization]
+
+ profile_url = (
+ 'https://app.vssps.visualstudio.com/_apis/profile/profiles/me'
+ '?api-version=7.1-preview.3'
+ )
+ profile, _ = await self._make_request(profile_url)
+ member_id = profile.get('id')
+ if not member_id:
+ return []
+
+ accounts_url = (
+ 'https://app.vssps.visualstudio.com/_apis/accounts'
+ f'?memberId={member_id}&api-version=7.1-preview.1'
+ )
+ accounts, _ = await self._make_request(accounts_url)
+ account_values = accounts.get('value') or accounts.get('accounts') or []
+ return [
+ account['accountName']
+ for account in account_values
+ if account.get('accountName')
+ ]
+
+ async def get_paginated_repos(
+ self,
+ page: int,
+ per_page: int,
+ sort: str,
+ installation_id: str | None,
+ query: str | None = None,
+ ):
+ if installation_id:
+ self.organization = installation_id
+ elif not self.organization:
+ installations = await self.get_installations()
+ if installations:
+ self.organization = installations[0]
+
+ return await super().get_paginated_repos(
+ page=page,
+ per_page=per_page,
+ sort=sort,
+ installation_id=installation_id,
+ query=query,
+ )
diff --git a/enterprise/integrations/models.py b/enterprise/integrations/models.py
index 6fa3ff2d53..9819811621 100644
--- a/enterprise/integrations/models.py
+++ b/enterprise/integrations/models.py
@@ -11,6 +11,7 @@ class SourceType(str, Enum):
GITLAB = 'gitlab'
BITBUCKET = 'bitbucket'
BITBUCKET_DATA_CENTER = 'bitbucket_data_center'
+ AZURE_DEVOPS = 'azure_devops'
OPENHANDS = 'openhands'
SLACK = 'slack'
JIRA = 'jira'
diff --git a/enterprise/server/auth/constants.py b/enterprise/server/auth/constants.py
index 5b02102ad6..c81709c711 100644
--- a/enterprise/server/auth/constants.py
+++ b/enterprise/server/auth/constants.py
@@ -19,6 +19,18 @@ GITLAB_APP_CLIENT_SECRET = os.getenv('GITLAB_APP_CLIENT_SECRET', '').strip()
GITLAB_TOKEN_URL = f'https://{GITLAB_HOST}/oauth/token'
BITBUCKET_APP_CLIENT_ID = os.getenv('BITBUCKET_APP_CLIENT_ID', '').strip()
BITBUCKET_APP_CLIENT_SECRET = os.getenv('BITBUCKET_APP_CLIENT_SECRET', '').strip()
+AZURE_DEVOPS_CLIENT_ID = os.getenv('AZURE_DEVOPS_CLIENT_ID', '').strip()
+AZURE_DEVOPS_CLIENT_SECRET = os.getenv('AZURE_DEVOPS_CLIENT_SECRET', '').strip()
+AZURE_DEVOPS_TENANT_ID = os.getenv('AZURE_DEVOPS_TENANT_ID', '').strip()
+AZURE_DEVOPS_ORGANIZATION = os.getenv('AZURE_DEVOPS_ORGANIZATION', '').strip()
+AZURE_DEVOPS_SCOPE = os.getenv(
+ 'AZURE_DEVOPS_SCOPE', 'https://app.vssps.visualstudio.com/.default'
+).strip()
+AZURE_DEVOPS_TOKEN_URL = (
+ f'https://login.microsoftonline.com/{AZURE_DEVOPS_TENANT_ID}/oauth2/v2.0/token'
+ if AZURE_DEVOPS_TENANT_ID
+ else ''
+)
ENABLE_ENTERPRISE_SSO = os.getenv('ENABLE_ENTERPRISE_SSO', '').strip()
ENABLE_JIRA = os.environ.get('ENABLE_JIRA', 'false') == 'true'
ENABLE_JIRA_DC = os.environ.get('ENABLE_JIRA_DC', 'false') == 'true'
diff --git a/enterprise/server/auth/saas_user_auth.py b/enterprise/server/auth/saas_user_auth.py
index 1844da7a7c..0619a34dc9 100644
--- a/enterprise/server/auth/saas_user_auth.py
+++ b/enterprise/server/auth/saas_user_auth.py
@@ -18,7 +18,7 @@ from server.auth.authorization import (
get_role_permissions,
get_user_org_role,
)
-from server.auth.constants import BITBUCKET_DATA_CENTER_HOST
+from server.auth.constants import AZURE_DEVOPS_ORGANIZATION, BITBUCKET_DATA_CENTER_HOST
from server.auth.cookie_chunking import read_chunked_cookie
from server.auth.token_manager import TokenManager
from server.logger import logger
@@ -415,6 +415,9 @@ class SaasUserAuth(UserAuth):
if idp_type == ProviderType.BITBUCKET_DATA_CENTER and not host:
host = BITBUCKET_DATA_CENTER_HOST or None
+ if idp_type == ProviderType.AZURE_DEVOPS and not host:
+ host = AZURE_DEVOPS_ORGANIZATION or None
+
provider_token = await token_manager.get_idp_token(
access_token.get_secret_value(),
idp=idp_type,
diff --git a/enterprise/server/auth/token_manager.py b/enterprise/server/auth/token_manager.py
index 8365eb6988..e5b9b7a304 100644
--- a/enterprise/server/auth/token_manager.py
+++ b/enterprise/server/auth/token_manager.py
@@ -16,6 +16,11 @@ from keycloak.exceptions import (
from pydantic import BaseModel
from server.auth.auth_error import ExpiredError
from server.auth.constants import (
+ AZURE_DEVOPS_CLIENT_ID,
+ AZURE_DEVOPS_CLIENT_SECRET,
+ AZURE_DEVOPS_SCOPE,
+ AZURE_DEVOPS_TENANT_ID,
+ AZURE_DEVOPS_TOKEN_URL,
BITBUCKET_APP_CLIENT_ID,
BITBUCKET_APP_CLIENT_SECRET,
BITBUCKET_DATA_CENTER_CLIENT_ID,
@@ -314,12 +319,17 @@ class TokenManager:
refresh_token_expires_at: int,
) -> dict[str, str | int] | None:
current_time = int(time.time())
- # expire access_token four hours before actual expiration
- # This ensures tokens are refreshed on resume to have at least 4 hours validity
+ # Refresh access tokens before expiration to ensure validity on resume.
+ # Azure DevOps uses a shorter buffer because Entra access tokens are
+ # short-lived; other providers keep the existing 4-hour buffer.
+ access_token_refresh_buffer_seconds = (
+ 300 if identity_provider == ProviderType.AZURE_DEVOPS else 14400
+ )
access_expired = (
False
if access_token_expires_at == 0
- else access_token_expires_at < current_time + 14400
+ else access_token_expires_at
+ < current_time + access_token_refresh_buffer_seconds
)
refresh_expired = (
False
@@ -360,6 +370,8 @@ class TokenManager:
return await self._refresh_bitbucket_token(refresh_token)
elif idp == ProviderType.BITBUCKET_DATA_CENTER:
return await self._refresh_bitbucket_data_center_token(refresh_token)
+ elif idp == ProviderType.AZURE_DEVOPS:
+ return await self._refresh_azure_devops_token(refresh_token)
else:
raise ValueError(f'Unsupported IDP: {idp}')
@@ -468,6 +480,38 @@ class TokenManager:
data = response.json()
return await self._parse_refresh_response(data)
+ async def _refresh_azure_devops_token(
+ self, refresh_token: str
+ ) -> dict[str, str | int]:
+ if (
+ not AZURE_DEVOPS_TENANT_ID
+ or not AZURE_DEVOPS_CLIENT_ID
+ or not AZURE_DEVOPS_CLIENT_SECRET
+ ):
+ raise ValueError(
+ 'Azure DevOps OAuth is not configured. Set AZURE_DEVOPS_TENANT_ID, '
+ 'AZURE_DEVOPS_CLIENT_ID, and AZURE_DEVOPS_CLIENT_SECRET.'
+ )
+
+ logger.info(f'Refreshing Azure DevOps token with URL: {AZURE_DEVOPS_TOKEN_URL}')
+ payload = {
+ 'client_id': AZURE_DEVOPS_CLIENT_ID,
+ 'client_secret': AZURE_DEVOPS_CLIENT_SECRET,
+ 'refresh_token': refresh_token,
+ 'grant_type': 'refresh_token',
+ 'scope': AZURE_DEVOPS_SCOPE,
+ }
+ async with httpx.AsyncClient(
+ verify=httpx_verify_option(), timeout=IDP_HTTP_TIMEOUT
+ ) as client:
+ response = await client.post(AZURE_DEVOPS_TOKEN_URL, data=payload)
+ response.raise_for_status()
+ logger.info('Successfully refreshed Azure DevOps token')
+
+ data = response.json()
+ data.setdefault('refresh_token', refresh_token)
+ return await self._parse_refresh_response(data)
+
async def _parse_refresh_response(self, data: dict) -> dict[str, str | int]:
access_token = data.get('access_token')
refresh_token = data.get('refresh_token')
diff --git a/enterprise/server/config.py b/enterprise/server/config.py
index 162cb6c341..2ac3bd3792 100644
--- a/enterprise/server/config.py
+++ b/enterprise/server/config.py
@@ -8,6 +8,7 @@ import jwt
import requests # type: ignore
from fastapi import HTTPException
from server.auth.constants import (
+ AZURE_DEVOPS_CLIENT_ID,
BITBUCKET_APP_CLIENT_ID,
BITBUCKET_DATA_CENTER_CLIENT_ID,
ENABLE_ENTERPRISE_SSO,
@@ -80,7 +81,7 @@ class SaaSServerConfig(ServerConfig):
self._get_app_slug()
def _get_app_slug(self):
- """Retrieves the GitHub App slug using the GitHub API's /app endpoint by generating a JWT for the app
+ """Retrieves the GitHub App slug using the GitHub API's /app endpoint by generating a JWT for the app.
Raises:
HTTPException: If the request to the GitHub API fails.
@@ -152,6 +153,9 @@ class SaaSServerConfig(ServerConfig):
if BITBUCKET_DATA_CENTER_CLIENT_ID:
providers_configured.append(ProviderType.BITBUCKET_DATA_CENTER)
+ if AZURE_DEVOPS_CLIENT_ID:
+ providers_configured.append(ProviderType.AZURE_DEVOPS)
+
config: dict[str, typing.Any] = {
'APP_MODE': self.app_mode,
'APP_SLUG': self.app_slug,
diff --git a/enterprise/server/routes/org_models.py b/enterprise/server/routes/org_models.py
index 49d0152afd..5a427e1316 100644
--- a/enterprise/server/routes/org_models.py
+++ b/enterprise/server/routes/org_models.py
@@ -607,7 +607,13 @@ class OrgAppSettingsUpdate(BaseModel):
return v
-VALID_GIT_PROVIDERS = {'github', 'gitlab', 'bitbucket', 'bitbucket_data_center'}
+VALID_GIT_PROVIDERS = {
+ 'github',
+ 'gitlab',
+ 'bitbucket',
+ 'bitbucket_data_center',
+ 'azure_devops',
+}
class GitOrgClaimRequest(BaseModel):
diff --git a/enterprise/tests/unit/integrations/azure_devops/__init__.py b/enterprise/tests/unit/integrations/azure_devops/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/enterprise/tests/unit/integrations/azure_devops/test_azure_devops_service.py b/enterprise/tests/unit/integrations/azure_devops/test_azure_devops_service.py
new file mode 100644
index 0000000000..5109625ef6
--- /dev/null
+++ b/enterprise/tests/unit/integrations/azure_devops/test_azure_devops_service.py
@@ -0,0 +1,100 @@
+"""Unit tests for SaaSAzureDevOpsService."""
+
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from integrations.azure_devops.azure_devops_service import SaaSAzureDevOpsService
+from pydantic import SecretStr
+
+from openhands.app_server.integrations.service_types import ProviderType
+
+
+async def test_get_latest_token_updates_cached_token_for_retry_headers():
+ service = SaaSAzureDevOpsService(
+ external_auth_token=SecretStr('keycloak-token'),
+ token=SecretStr('expired-token'),
+ )
+
+ with patch.object(
+ service.token_manager,
+ 'get_idp_token',
+ new_callable=AsyncMock,
+ return_value='fresh-token',
+ ) as mock_get_idp_token:
+ token = await service.get_latest_token()
+
+ assert token is not None
+ assert token.get_secret_value() == 'fresh-token'
+ assert service.token.get_secret_value() == 'fresh-token'
+ mock_get_idp_token.assert_awaited_once_with(
+ 'keycloak-token',
+ idp=ProviderType.AZURE_DEVOPS,
+ )
+
+
+async def test_get_latest_token_updates_cached_token_from_external_auth_id():
+ service = SaaSAzureDevOpsService(
+ external_auth_id='external-auth-id',
+ token=SecretStr('expired-token'),
+ )
+
+ with (
+ patch.object(
+ service.token_manager,
+ 'load_offline_token',
+ new_callable=AsyncMock,
+ return_value='offline-token',
+ ) as mock_load_offline_token,
+ patch.object(
+ service.token_manager,
+ 'get_idp_token_from_offline_token',
+ new_callable=AsyncMock,
+ return_value='fresh-token',
+ ) as mock_get_idp_token_from_offline_token,
+ ):
+ token = await service.get_latest_token()
+
+ assert token is not None
+ assert token.get_secret_value() == 'fresh-token'
+ assert service.token.get_secret_value() == 'fresh-token'
+ mock_load_offline_token.assert_awaited_once_with('external-auth-id')
+ mock_get_idp_token_from_offline_token.assert_awaited_once_with(
+ 'offline-token',
+ ProviderType.AZURE_DEVOPS,
+ )
+
+
+async def test_get_latest_token_updates_cached_token_from_user_id():
+ service = SaaSAzureDevOpsService(
+ user_id='azure-user-id',
+ token=SecretStr('expired-token'),
+ )
+
+ with patch.object(
+ service.token_manager,
+ 'get_idp_token_from_idp_user_id',
+ new_callable=AsyncMock,
+ return_value='fresh-token',
+ ) as mock_get_idp_token_from_user_id:
+ token = await service.get_latest_token()
+
+ assert token is not None
+ assert token.get_secret_value() == 'fresh-token'
+ assert service.token.get_secret_value() == 'fresh-token'
+ mock_get_idp_token_from_user_id.assert_awaited_once_with(
+ 'azure-user-id',
+ ProviderType.AZURE_DEVOPS,
+ )
+
+
+async def test_get_latest_token_leaves_cached_token_when_refresh_unavailable():
+ service = SaaSAzureDevOpsService(token=SecretStr('stored-token'))
+
+ token = await service.get_latest_token()
+
+ assert token is None
+ assert service.token.get_secret_value() == 'stored-token'
diff --git a/enterprise/tests/unit/server/routes/test_org_git_claims.py b/enterprise/tests/unit/server/routes/test_org_git_claims.py
index c7e10571aa..50e8c61b38 100644
--- a/enterprise/tests/unit/server/routes/test_org_git_claims.py
+++ b/enterprise/tests/unit/server/routes/test_org_git_claims.py
@@ -348,7 +348,13 @@ class TestGitOrgClaimRequestValidation:
"""Each supported provider is accepted and normalized to lowercase."""
from server.routes.org_models import GitOrgClaimRequest
- for provider in ['github', 'GitLab', 'BITBUCKET', 'BITBUCKET_DATA_CENTER']:
+ for provider in [
+ 'github',
+ 'GitLab',
+ 'BITBUCKET',
+ 'BITBUCKET_DATA_CENTER',
+ 'AZURE_DEVOPS',
+ ]:
req = GitOrgClaimRequest(provider=provider, git_organization='test-org')
assert req.provider == provider.lower().strip()
@@ -358,7 +364,7 @@ class TestGitOrgClaimRequestValidation:
from server.routes.org_models import GitOrgClaimRequest
with pytest.raises(ValidationError, match='Invalid provider'):
- GitOrgClaimRequest(provider='azure_devops', git_organization='test-org')
+ GitOrgClaimRequest(provider='forgejo', git_organization='test-org')
def test_empty_git_organization_is_rejected(self):
"""An empty git_organization raises a validation error."""
@@ -493,7 +499,7 @@ class TestGitClaimsHTTPIntegration:
client = TestClient(mock_app)
response = client.post(
f'/api/organizations/{org_id}/git-claims',
- json={'provider': 'azure_devops', 'git_organization': 'test'},
+ json={'provider': 'forgejo', 'git_organization': 'test'},
)
assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY
diff --git a/enterprise/tests/unit/test_token_manager_extended.py b/enterprise/tests/unit/test_token_manager_extended.py
index 62f083b879..307cf6dd4c 100644
--- a/enterprise/tests/unit/test_token_manager_extended.py
+++ b/enterprise/tests/unit/test_token_manager_extended.py
@@ -452,6 +452,102 @@ class TestRefreshBitbucketDataCenterToken:
)
+class TestRefreshAzureDevOpsToken:
+ """Tests for the _refresh_azure_devops_token code path."""
+
+ @pytest.mark.asyncio
+ async def test_happy_path(self, token_manager):
+ mock_response = MagicMock()
+ mock_response.raise_for_status = MagicMock()
+ mock_response.json.return_value = {
+ 'access_token': 'new_azure_access',
+ 'refresh_token': 'new_azure_refresh',
+ 'expires_in': 3600,
+ 'refresh_token_expires_in': 86400,
+ }
+
+ with (
+ patch('server.auth.token_manager.AZURE_DEVOPS_TENANT_ID', 'tenant-id'),
+ patch('server.auth.token_manager.AZURE_DEVOPS_CLIENT_ID', 'client-id'),
+ patch(
+ 'server.auth.token_manager.AZURE_DEVOPS_CLIENT_SECRET',
+ 'client-secret',
+ ),
+ patch(
+ 'server.auth.token_manager.AZURE_DEVOPS_SCOPE',
+ 'https://app.vssps.visualstudio.com/.default',
+ ),
+ patch(
+ 'server.auth.token_manager.AZURE_DEVOPS_TOKEN_URL',
+ 'https://login.microsoftonline.com/tenant-id/oauth2/v2.0/token',
+ ),
+ patch('httpx.AsyncClient') as mock_client_cls,
+ ):
+ mock_client = AsyncMock()
+ mock_client.post = AsyncMock(return_value=mock_response)
+ mock_client_cls.return_value.__aenter__ = AsyncMock(
+ return_value=mock_client
+ )
+ mock_client_cls.return_value.__aexit__ = AsyncMock(return_value=None)
+
+ result = await token_manager._refresh_azure_devops_token(
+ 'old_refresh_token'
+ )
+
+ mock_client.post.assert_called_once_with(
+ 'https://login.microsoftonline.com/tenant-id/oauth2/v2.0/token',
+ data={
+ 'client_id': 'client-id',
+ 'client_secret': 'client-secret',
+ 'refresh_token': 'old_refresh_token',
+ 'grant_type': 'refresh_token',
+ 'scope': 'https://app.vssps.visualstudio.com/.default',
+ },
+ )
+ assert result['access_token'] == 'new_azure_access'
+ assert result['refresh_token'] == 'new_azure_refresh'
+
+ @pytest.mark.asyncio
+ async def test_reuses_existing_refresh_token_when_response_omits_one(
+ self, token_manager
+ ):
+ mock_response = MagicMock()
+ mock_response.raise_for_status = MagicMock()
+ mock_response.json.return_value = {
+ 'access_token': 'new_azure_access',
+ 'expires_in': 3600,
+ }
+
+ with (
+ patch('server.auth.token_manager.AZURE_DEVOPS_TENANT_ID', 'tenant-id'),
+ patch('server.auth.token_manager.AZURE_DEVOPS_CLIENT_ID', 'client-id'),
+ patch(
+ 'server.auth.token_manager.AZURE_DEVOPS_CLIENT_SECRET',
+ 'client-secret',
+ ),
+ patch('httpx.AsyncClient') as mock_client_cls,
+ ):
+ mock_client = AsyncMock()
+ mock_client.post = AsyncMock(return_value=mock_response)
+ mock_client_cls.return_value.__aenter__ = AsyncMock(
+ return_value=mock_client
+ )
+ mock_client_cls.return_value.__aexit__ = AsyncMock(return_value=None)
+
+ result = await token_manager._refresh_azure_devops_token(
+ 'old_refresh_token'
+ )
+
+ assert result['access_token'] == 'new_azure_access'
+ assert result['refresh_token'] == 'old_refresh_token'
+
+ @pytest.mark.asyncio
+ async def test_missing_config_raises_value_error(self, token_manager):
+ with patch('server.auth.token_manager.AZURE_DEVOPS_TENANT_ID', ''):
+ with pytest.raises(ValueError, match='Azure DevOps OAuth'):
+ await token_manager._refresh_azure_devops_token('refresh-token')
+
+
class TestOrgTokenMethods:
"""Test cases for store_org_token and load_org_token methods."""
diff --git a/frontend/src/components/features/auth/login-content.tsx b/frontend/src/components/features/auth/login-content.tsx
index 1da88634dc..8516c729dd 100644
--- a/frontend/src/components/features/auth/login-content.tsx
+++ b/frontend/src/components/features/auth/login-content.tsx
@@ -5,6 +5,7 @@ import OpenHandsLogoWhite from "#/assets/branding/openhands-logo-white.svg?react
import GitHubLogo from "#/assets/branding/github-logo.svg?react";
import GitLabLogo from "#/assets/branding/gitlab-logo.svg?react";
import BitbucketLogo from "#/assets/branding/bitbucket-logo.svg?react";
+import AzureDevOpsLogo from "#/assets/branding/azure-devops-logo.svg?react";
import { useAuthUrl } from "#/hooks/use-auth-url";
import { WebClientConfig } from "#/api/option-service/option.types";
import { Provider } from "#/types/settings";
@@ -68,6 +69,12 @@ export function LoginContent({
authUrl,
});
+ const azureDevOpsAuthUrl = useAuthUrl({
+ appMode: appMode || null,
+ identityProvider: "azure_devops",
+ authUrl,
+ });
+
const enterpriseSsoAuthUrl = useAuthUrl({
appMode: appMode || null,
identityProvider: "enterprise_sso",
@@ -131,6 +138,12 @@ export function LoginContent({
}
};
+ const handleAzureDevOpsAuth = () => {
+ if (azureDevOpsAuthUrl) {
+ handleAuthRedirect(azureDevOpsAuthUrl);
+ }
+ };
+
const handleEnterpriseSsoAuth = () => {
if (enterpriseSsoAuthUrl) {
handleAuthRedirect(enterpriseSsoAuthUrl);
@@ -153,6 +166,10 @@ export function LoginContent({
providersConfigured &&
providersConfigured.length > 0 &&
providersConfigured.includes("bitbucket_data_center");
+ const showAzureDevOps =
+ providersConfigured &&
+ providersConfigured.length > 0 &&
+ providersConfigured.includes("azure_devops");
const showEnterpriseSso =
providersConfigured &&
providersConfigured.length > 0 &&
@@ -281,6 +298,23 @@ export function LoginContent({
</button>
)}
+ {showAzureDevOps && (
+ <button
+ type="button"
+ onClick={handleAzureDevOpsAuth}
+ className={`${buttonBaseClasses} bg-[#0078D4] text-white`}
+ >
+ <AzureDevOpsLogo
+ width={14}
+ height={14}
+ className="shrink-0"
+ />
+ <span className={buttonLabelClasses}>
+ {t(I18nKey.AZURE_DEVOPS$CONNECT_ACCOUNT)}
+ </span>
+ </button>
+ )}
+
{showEnterpriseSso && (
<button
type="button"
diff --git a/frontend/src/i18n/declaration.ts b/frontend/src/i18n/declaration.ts
index 7d85eebbfe..074eb9bedc 100644
--- a/frontend/src/i18n/declaration.ts
+++ b/frontend/src/i18n/declaration.ts
@@ -295,6 +295,7 @@ export enum I18nKey {
SETTINGS$PERSONAL_AGENT_INFO = "SETTINGS$PERSONAL_AGENT_INFO",
SETTINGS$GITHUB = "SETTINGS$GITHUB",
SETTINGS$AZURE_DEVOPS = "SETTINGS$AZURE_DEVOPS",
+ AZURE_DEVOPS$NOT_CONNECTED = "AZURE_DEVOPS$NOT_CONNECTED",
SETTINGS$SLACK = "SETTINGS$SLACK",
COMMON$STATUS = "COMMON$STATUS",
SETTINGS$GITLAB_NOT_CONNECTED = "SETTINGS$GITLAB_NOT_CONNECTED",
diff --git a/frontend/src/i18n/translation.json b/frontend/src/i18n/translation.json
index 975203f801..da87dafb87 100644
--- a/frontend/src/i18n/translation.json
+++ b/frontend/src/i18n/translation.json
@@ -5014,6 +5014,23 @@
"uk": "Azure DevOps",
"ca": "Azure DevOps"
},
+ "AZURE_DEVOPS$NOT_CONNECTED": {
+ "en": "Azure DevOps not connected",
+ "ja": "Azure DevOps が接続されていません",
+ "zh-CN": "Azure DevOps 未连接",
+ "zh-TW": "Azure DevOps 未連接",
+ "ko-KR": "Azure DevOps가 연결되지 않음",
+ "no": "Azure DevOps ikke tilkoblet",
+ "it": "Azure DevOps non connesso",
+ "pt": "Azure DevOps não conectado",
+ "es": "Azure DevOps no conectado",
+ "ar": "Azure DevOps غير متصل",
+ "fr": "Azure DevOps non connecté",
+ "tr": "Azure DevOps bağlı değil",
+ "de": "Azure DevOps nicht verbunden",
+ "uk": "Azure DevOps не підключено",
+ "ca": "Azure DevOps no connectat"
+ },
"SETTINGS$SLACK": {
"en": "Slack",
"ja": "Slack",
diff --git a/frontend/src/routes/git-settings.tsx b/frontend/src/routes/git-settings.tsx
index e3fe5bebc9..00af7a00cd 100644
--- a/frontend/src/routes/git-settings.tsx
+++ b/frontend/src/routes/git-settings.tsx
@@ -14,6 +14,7 @@ import { BitbucketDCWebhookManager } from "#/components/features/settings/git-se
import { AzureDevOpsTokenInput } from "#/components/features/settings/git-settings/azure-devops-token-input";
import { ForgejoTokenInput } from "#/components/features/settings/git-settings/forgejo-token-input";
import { ConfigureGitHubRepositoriesAnchor } from "#/components/features/settings/git-settings/configure-github-repositories-anchor";
+import { ConfigureAzureDevOpsAnchor } from "#/components/features/settings/git-settings/configure-azure-devops-anchor";
import { InstallSlackAppAnchor } from "#/components/features/settings/git-settings/install-slack-app-anchor";
import DebugStackframeDot from "#/icons/debug-stackframe-dot.svg?react";
import { I18nKey } from "#/i18n/declaration";
@@ -224,6 +225,8 @@ function GitSettingsScreen() {
const shouldRenderBitbucketDCSection =
isSaas &&
Boolean(config?.providers_configured?.includes("bitbucket_data_center"));
+ const shouldRenderAzureDevOpsSection =
+ isSaas && Boolean(config?.providers_configured?.includes("azure_devops"));
const shouldRenderSlackSection = isSaas && Boolean(config?.slack_enabled);
const shouldRenderProjectManagementIntegrations =
config?.feature_flags?.enable_jira ||
@@ -306,6 +309,33 @@ function GitSettingsScreen() {
</>
)}
+ {shouldRenderAzureDevOpsSection && (
+ <>
+ <div className="mt-6 flex flex-col gap-4 pb-8">
+ <Typography.H3 className="text-xl">
+ {t(I18nKey.SETTINGS$AZURE_DEVOPS)}
+ </Typography.H3>
+ <div className="flex items-center">
+ <DebugStackframeDot
+ className="w-6 h-6 shrink-0"
+ color={isAzureDevOpsTokenSet ? "#BCFF8C" : "#FF684E"}
+ />
+ <Typography.Text
+ className="text-sm text-gray-400"
+ testId="azure-devops-status-text"
+ >
+ {t(I18nKey.COMMON$STATUS)}:{" "}
+ {isAzureDevOpsTokenSet
+ ? t(I18nKey.STATUS$CONNECTED)
+ : t(I18nKey.AZURE_DEVOPS$NOT_CONNECTED)}
+ </Typography.Text>
+ </div>
+ <ConfigureAzureDevOpsAnchor />
+ </div>
+ <div className="w-1/2 border-b border-gray-200" />
+ </>
+ )}
+
{shouldRenderSlackSection && (
<>
<div className="pb-1 mt-6 flex flex-col">
diff --git a/openhands/app_server/app_conversation/app_conversation_service_base.py b/openhands/app_server/app_conversation/app_conversation_service_base.py
index a4f0d3a122..bc611a5afd 100644
--- a/openhands/app_server/app_conversation/app_conversation_service_base.py
+++ b/openhands/app_server/app_conversation/app_conversation_service_base.py
@@ -26,8 +26,10 @@ from openhands.app_server.app_conversation.skill_loader import (
build_sandbox_config,
load_skills_from_agent_server,
)
+from openhands.app_server.integrations.service_types import ProviderType
from openhands.app_server.sandbox.sandbox_models import SandboxInfo
from openhands.app_server.user.user_context import UserContext
+from openhands.app_server.utils.auth import looks_like_jwt
from openhands.app_server.utils.git import ensure_valid_git_branch_name
from openhands.sdk import Agent, LLMSummarizingCondenser
from openhands.sdk.context import AgentContext
@@ -251,7 +253,7 @@ class AppConversationServiceBase(AppConversationService, ABC):
) -> AsyncGenerator[AppConversationStartTask, None]:
task.status = AppConversationStartTaskStatus.PREPARING_REPOSITORY
yield task
- await self.clone_or_init_git_repo(task, workspace)
+ await self.clone_or_init_git_repo(task, workspace, sandbox)
# Compute the project root — the cloned repo directory when a repo is
# selected, or the sandbox working_dir otherwise. This must be used
@@ -318,6 +320,7 @@ class AppConversationServiceBase(AppConversationService, ABC):
self,
task: AppConversationStartTask,
workspace: AsyncRemoteWorkspace,
+ sandbox: SandboxInfo | None = None,
):
request = task.request
@@ -355,14 +358,35 @@ class AppConversationServiceBase(AppConversationService, ABC):
dir_name = request.selected_repository.split('/')[-1]
quoted_remote_repo_url = shlex.quote(remote_repo_url)
quoted_dir_name = shlex.quote(dir_name)
+ git_dir = Path(workspace.working_dir) / dir_name
+ azure_devops_bearer_token = await self._get_azure_devops_bearer_token_for_git(
+ request.git_provider,
+ remote_repo_url,
+ )
# Clone the repo - this is the slow part!
- clone_command = f'git clone {quoted_remote_repo_url} {quoted_dir_name}'
+ if azure_devops_bearer_token:
+ auth_header = shlex.quote(
+ f'Authorization: Bearer {azure_devops_bearer_token}'
+ )
+ clone_command = (
+ f'git -c http.extraheader={auth_header} clone '
+ f'{quoted_remote_repo_url} {quoted_dir_name}'
+ )
+ else:
+ clone_command = f'git clone {quoted_remote_repo_url} {quoted_dir_name}'
result = await workspace.execute_command(
clone_command, workspace.working_dir, 120
)
if result.exit_code:
_logger.warning(f'Git clone failed: {result.stderr}')
+ elif azure_devops_bearer_token:
+ await self._configure_azure_devops_git_credential_helper(
+ workspace,
+ git_dir,
+ request.selected_repository,
+ sandbox,
+ )
# Checkout the appropriate branch
if request.selected_branch:
@@ -375,11 +399,106 @@ class AppConversationServiceBase(AppConversationService, ABC):
checkout_command = (
f'git checkout -b {shlex.quote(openhands_workspace_branch)}'
)
- git_dir = Path(workspace.working_dir) / dir_name
result = await workspace.execute_command(checkout_command, git_dir)
if result.exit_code:
_logger.warning(f'Git checkout failed: {result.stderr}')
+ async def _get_azure_devops_bearer_token_for_git(
+ self,
+ git_provider: ProviderType | None,
+ remote_repo_url: str,
+ ) -> str | None:
+ if (
+ git_provider != ProviderType.AZURE_DEVOPS
+ and 'dev.azure.com' not in remote_repo_url
+ ):
+ return None
+
+ try:
+ token = await self.user_context.get_latest_token(ProviderType.AZURE_DEVOPS)
+ except Exception as exc:
+ _logger.warning(f'Failed to get Azure DevOps token for git: {exc}')
+ return None
+ if token and looks_like_jwt(token):
+ return token
+ return None
+
+ async def _configure_azure_devops_git_credential_helper(
+ self,
+ workspace: AsyncRemoteWorkspace,
+ git_dir: Path,
+ selected_repository: str,
+ sandbox: SandboxInfo | None,
+ ) -> None:
+ if sandbox is None:
+ _logger.warning(
+ 'Skipping Azure DevOps git credential helper setup: missing sandbox'
+ )
+ return
+
+ org = selected_repository.split('/')[0]
+ helper_path = git_dir / '.git' / 'openhands-azure-devops-credential-helper'
+ secret_path = (
+ f'/api/v1/sandboxes/{sandbox.id}/settings/secrets/azure_devops_token'
+ )
+ web_url = getattr(self, 'web_url', None)
+ if web_url is None:
+ _logger.debug(
+ 'Azure DevOps git credential helper has no configured web_url; '
+ 'it will rely on OH_WEBHOOKS_0_BASE_URL at runtime.'
+ )
+ app_base_url = shlex.quote(web_url if isinstance(web_url, str) else '')
+ helper_script = f"""#!/bin/sh
+if [ "$1" != "get" ]; then
+ exit 0
+fi
+
+session_api_key="${{OH_SESSION_API_KEYS_0:-${{SESSION_API_KEY:-}}}}"
+webhook_url="${{OH_WEBHOOKS_0_BASE_URL:-}}"
+app_base_url={app_base_url}
+if [ -n "$webhook_url" ]; then
+ base_url="${{webhook_url%/api/v1/webhooks}}"
+else
+ base_url="$app_base_url"
+fi
+if [ -z "$session_api_key" ] || [ -z "$base_url" ]; then
+ exit 0
+fi
+
+secret_url="$base_url{secret_path}"
+token="$(curl -fsS \\
+ -H "X-Session-API-Key: $session_api_key" \\
+ "$secret_url" 2>/dev/null)" || exit 0
+if [ -z "$token" ]; then
+ exit 0
+fi
+
+printf '%s\\n' "username=oauth2"
+printf 'password=%s\\n' "$token"
+"""
+ helper_path_quoted = shlex.quote(str(helper_path))
+ helper_value = shlex.quote(f'!{shlex.quote(str(helper_path))}')
+ extraheader_key = shlex.quote(f'http.https://dev.azure.com/{org}/.extraheader')
+ credential_username_key = shlex.quote(
+ f'credential.https://dev.azure.com/{org}.username'
+ )
+ credential_helper_key = shlex.quote(
+ f'credential.https://dev.azure.com/{org}.helper'
+ )
+ command = (
+ f'printf %s {shlex.quote(helper_script)} > {helper_path_quoted}'
+ f' && chmod 700 {helper_path_quoted}'
+ f' && (git config --local --unset-all {extraheader_key} || true)'
+ f' && git config --local {credential_username_key} oauth2'
+ f' && git config --local {credential_helper_key} {helper_value}'
+ ' && git config --local credential.useHttpPath true'
+ )
+ result = await workspace.execute_command(command, git_dir)
+ if result.exit_code:
+ _logger.warning(
+ f'Azure DevOps git credential helper setup failed: {result.stderr}'
+ )
+
async def maybe_run_setup_script(
self,
workspace: AsyncRemoteWorkspace,
diff --git a/openhands/app_server/integrations/azure_devops/azure_devops_service.py b/openhands/app_server/integrations/azure_devops/azure_devops_service.py
index 8fdba80620..b441cdb6e4 100644
--- a/openhands/app_server/integrations/azure_devops/azure_devops_service.py
+++ b/openhands/app_server/integrations/azure_devops/azure_devops_service.py
@@ -29,6 +29,7 @@ from openhands.app_server.integrations.service_types import (
ProviderType,
RequestMethod,
)
+from openhands.app_server.utils.auth import looks_like_jwt
from openhands.app_server.utils.import_utils import get_impl
@@ -114,25 +115,6 @@ class AzureDevOpsService(
"""Get the base URL for Azure DevOps API calls."""
return f'https://dev.azure.com/{self.organization}'
- @staticmethod
- def _is_oauth_token(token: str) -> bool:
- """Check if a token is an OAuth JWT token (from SSO) vs a PAT.
-
- OAuth tokens from Azure AD/Entra ID are JWTs with the format:
- header.payload.signature (three base64url-encoded parts separated by dots)
-
- PATs are opaque tokens without this structure.
-
- Args:
- token: The token string to check
-
- Returns:
- True if the token appears to be a JWT (OAuth), False if it's a PAT
- """
- # JWTs have exactly 3 parts separated by dots
- parts = token.split('.')
- return len(parts) == 3 and all(len(part) > 0 for part in parts)
-
async def _get_azure_devops_headers(self) -> dict[str, Any]:
"""Retrieve the Azure DevOps authentication headers.
@@ -155,7 +137,7 @@ class AzureDevOpsService(
token_value = self.token.get_secret_value()
# Detect token type and use appropriate authentication method
- if self._is_oauth_token(token_value):
+ if looks_like_jwt(token_value):
# OAuth 2.0 access token from SSO (Azure AD/Keycloak broker)
# Use Bearer authentication as per OAuth 2.0 spec
auth_header = f'Bearer {token_value}'
diff --git a/openhands/app_server/integrations/provider.py b/openhands/app_server/integrations/provider.py
index 7535c069f4..079999becb 100644
--- a/openhands/app_server/integrations/provider.py
+++ b/openhands/app_server/integrations/provider.py
@@ -41,6 +41,7 @@ from openhands.app_server.integrations.service_types import (
TokenResponse,
User,
)
+from openhands.app_server.utils.auth import looks_like_jwt
from openhands.app_server.utils.http_session import httpx_verify_option
from openhands.app_server.utils.logger import openhands_logger as logger
@@ -587,7 +588,10 @@ class ProviderHandler:
url_creds = f'x-token-auth:{quote(token_value, safe="")}'
remote_url = f'{protocol}://{url_creds}@{domain}/{scm_path}'
elif provider == ProviderType.AZURE_DEVOPS:
- # Azure DevOps uses PAT with Basic auth
+ # Entra OAuth tokens work with Azure Repos through a Bearer
+ # header. Return a clean remote URL here; callers that need
+ # to run git commands should add the header out-of-band.
+ # PATs still use Basic auth for OSS/manual-token flows.
# Format: https://{anything}:{PAT}@dev.azure.com/{org}/{project}/_git/{repo}
# The username can be anything (it's ignored), but cannot be empty
# We use the org name as the username for clarity
@@ -623,12 +627,17 @@ class ProviderHandler:
f'[Azure DevOps] URL-encoded parts - org: {org_encoded}, project: {project_encoded}, repo: {repo_encoded}'
)
# Use org name as username (it's ignored by Azure DevOps but required for git)
- remote_url = f'https://{org}:***@{clean_domain}/{org_encoded}/{project_encoded}/_git/{repo_encoded}'
- logger.info(
- f'[Azure DevOps] Constructed git URL (token masked): {remote_url}'
- )
- # Set the actual URL with token
- remote_url = f'https://{org}:{token_value}@{clean_domain}/{org_encoded}/{project_encoded}/_git/{repo_encoded}'
+ if looks_like_jwt(token_value):
+ remote_url = f'https://{clean_domain}/{org_encoded}/{project_encoded}/_git/{repo_encoded}'
+ logger.info(
+ f'[Azure DevOps] Constructed OAuth git URL: {remote_url}'
+ )
+ else:
+ remote_url = f'https://{org}:***@{clean_domain}/{org_encoded}/{project_encoded}/_git/{repo_encoded}'
+ logger.info(
+ f'[Azure DevOps] Constructed PAT git URL (token masked): {remote_url}'
+ )
+ remote_url = f'https://{org}:{quote(token_value, safe="")}@{clean_domain}/{org_encoded}/{project_encoded}/_git/{repo_encoded}'
else:
# Fallback if format is unexpected
logger.warning(
diff --git a/openhands/app_server/user/auth_user_context.py b/openhands/app_server/user/auth_user_context.py
index 2936b09a9c..6bfd416d20 100644
--- a/openhands/app_server/user/auth_user_context.py
+++ b/openhands/app_server/user/auth_user_context.py
@@ -1,4 +1,6 @@
+import logging
from dataclasses import dataclass
+from types import MappingProxyType
from typing import Any, AsyncGenerator
from fastapi import Request
@@ -19,6 +21,7 @@ from openhands.app_server.user_auth.user_auth import UserAuth, get_user_auth
from openhands.sdk.secret import SecretSource, StaticSecret
USER_AUTH_ATTR = 'user_auth'
+_logger = logging.getLogger(__name__)
@dataclass
@@ -69,9 +72,23 @@ class AuthUserContext(UserContext):
results: dict[str, str] = {}
if provider_tokens:
for provider_type, provider_token in provider_tokens.items():
- if provider_token.token:
- env_key = ProviderHandler.get_provider_env_key(provider_type)
- results[env_key] = provider_token.token.get_secret_value()
+ env_key = ProviderHandler.get_provider_env_key(provider_type)
+ latest_token = None
+ if provider_type == ProviderType.AZURE_DEVOPS:
+ try:
+ latest_token = await self.get_latest_token(provider_type)
+ except Exception as exc:
+ _logger.warning(
+ 'Failed to refresh provider token for %s: %s',
+ provider_type.value,
+ exc,
+ )
+ if latest_token:
+ results[env_key] = latest_token
+ elif provider_token.token:
+ token_value = provider_token.token.get_secret_value()
+ if token_value:
+ results[env_key] = token_value
return results
async def get_provider_handler(self):
@@ -79,6 +96,8 @@ class AuthUserContext(UserContext):
if not provider_handler:
provider_tokens = await self.user_auth.get_provider_tokens()
assert provider_tokens is not None
+ if not isinstance(provider_tokens, MappingProxyType):
+ provider_tokens = MappingProxyType(provider_tokens)
user_id = await self.get_user_id()
provider_handler = ProviderHandler(
provider_tokens=provider_tokens, external_auth_id=user_id
diff --git a/openhands/app_server/utils/auth.py b/openhands/app_server/utils/auth.py
new file mode 100644
index 0000000000..1633c94475
--- /dev/null
+++ b/openhands/app_server/utils/auth.py
@@ -0,0 +1,3 @@
+def looks_like_jwt(token_value: str) -> bool:
+ parts = token_value.split('.')
+ return len(parts) == 3 and all(parts)
diff --git a/openhands/app_server/web_client/default_web_client_config_injector.py b/openhands/app_server/web_client/default_web_client_config_injector.py
index 9b41a6657c..84dbdd9d7c 100644
--- a/openhands/app_server/web_client/default_web_client_config_injector.py
+++ b/openhands/app_server/web_client/default_web_client_config_injector.py
@@ -90,6 +90,9 @@ def _get_providers_configured() -> list[ProviderType]:
if os.getenv('BITBUCKET_DATA_CENTER_CLIENT_ID', '').strip():
providers.append(ProviderType.BITBUCKET_DATA_CENTER)
+ if os.getenv('AZURE_DEVOPS_CLIENT_ID', '').strip():
+ providers.append(ProviderType.AZURE_DEVOPS)
+
if os.getenv('ENABLE_ENTERPRISE_SSO', '').strip():
providers.append(ProviderType.ENTERPRISE_SSO)
diff --git a/tests/unit/app_server/test_app_conversation_service_base.py b/tests/unit/app_server/test_app_conversation_service_base.py
index b3f55de7ee..562b0660c9 100644
--- a/tests/unit/app_server/test_app_conversation_service_base.py
+++ b/tests/unit/app_server/test_app_conversation_service_base.py
@@ -16,7 +16,8 @@ from openhands.app_server.app_conversation.app_conversation_models import AgentT
from openhands.app_server.app_conversation.app_conversation_service_base import (
AppConversationServiceBase,
)
-from openhands.app_server.sandbox.sandbox_models import SandboxInfo
+from openhands.app_server.integrations.service_types import ProviderType
+from openhands.app_server.sandbox.sandbox_models import SandboxInfo, SandboxStatus
from openhands.app_server.user.user_context import UserContext
from openhands.sdk.skills import Skill
@@ -768,7 +769,11 @@ async def test_clone_or_init_git_repo_quotes_selected_branch_before_checkout(
):
user_info = MockUserInfo()
service, mock_user_context = _create_service_with_mock_user_context(
- user_info, bind_methods=('clone_or_init_git_repo',)
+ user_info,
+ bind_methods=(
+ 'clone_or_init_git_repo',
+ '_get_azure_devops_bearer_token_for_git',
+ ),
)
service.init_git_in_empty_workspace = True
mock_user_context.get_authenticated_git_url = AsyncMock(
@@ -789,6 +794,104 @@ async def test_clone_or_init_git_repo_quotes_selected_branch_before_checkout(
)
+async def test_clone_or_init_git_repo_configures_dynamic_azure_devops_helper(
+ mock_workspace,
+):
+ user_info = MockUserInfo()
+ service, mock_user_context = _create_service_with_mock_user_context(
+ user_info,
+ bind_methods=(
+ 'clone_or_init_git_repo',
+ '_get_azure_devops_bearer_token_for_git',
+ '_configure_azure_devops_git_credential_helper',
+ ),
+ )
+ service.init_git_in_empty_workspace = True
+ mock_user_context.get_authenticated_git_url = AsyncMock(
+ return_value='https://dev.azure.com/org/project/_git/repo'
+ )
+ mock_user_context.get_latest_token = AsyncMock(
+ return_value='header.payload.signature'
+ )
+ task = Mock()
+ task.request = Mock(
+ selected_repository='org/project/repo',
+ selected_branch='main',
+ git_provider=ProviderType.AZURE_DEVOPS,
+ )
+ sandbox = SandboxInfo(
+ id='sandbox-123',
+ created_by_user_id='user-123',
+ sandbox_spec_id='spec-123',
+ status=SandboxStatus.RUNNING,
+ session_api_key='session-key',
+ )
+
+ await service.clone_or_init_git_repo(task, mock_workspace, sandbox)
+
+ commands = [call.args[0] for call in mock_workspace.execute_command.call_args_list]
+ assert any(
+ "git -c http.extraheader='Authorization: Bearer header.payload.signature' clone"
+ in command
+ for command in commands
+ )
+ helper_command = next(
+ command
+ for command in commands
+ if 'openhands-azure-devops-credential-helper' in command
+ )
+ assert (
+ '/api/v1/sandboxes/sandbox-123/settings/secrets/azure_devops_token'
+ in helper_command
+ )
+ assert (
+ 'git config --local --unset-all http.https://dev.azure.com/org/.extraheader'
+ in helper_command
+ )
+ assert 'credential.https://dev.azure.com/org.helper' in helper_command
+ assert not any(
+ command.startswith(
+ 'git config --local http.https://dev.azure.com/org/.extraheader'
+ )
+ for command in commands
+ )
+
+
+async def test_azure_devops_git_credential_helper_logs_without_web_url(
+ mock_workspace,
+):
+ user_info = MockUserInfo()
+ service, _ = _create_service_with_mock_user_context(
+ user_info,
+ bind_methods=('_configure_azure_devops_git_credential_helper',),
+ )
+ service.web_url = None
+ sandbox = SandboxInfo(
+ id='sandbox-123',
+ created_by_user_id='user-123',
+ sandbox_spec_id='spec-123',
+ status=SandboxStatus.RUNNING,
+ session_api_key='session-key',
+ )
+
+ with patch(
+ 'openhands.app_server.app_conversation.app_conversation_service_base._logger.debug'
+ ) as mock_debug:
+ await service._configure_azure_devops_git_credential_helper(
+ mock_workspace,
+ Path(mock_workspace.working_dir),
+ 'org/project/repo',
+ sandbox,
+ )
+
+ mock_debug.assert_called_once_with(
+ 'Azure DevOps git credential helper has no configured web_url; '
+ 'it will rely on OH_WEBHOOKS_0_BASE_URL at runtime.'
+ )
+
+
@pytest.mark.asyncio
async def test_configure_git_user_settings_both_name_and_email(mock_workspace):
"""Test configuring both git user name and email."""
diff --git a/tests/unit/app_server/test_default_web_client_config_injector.py b/tests/unit/app_server/test_default_web_client_config_injector.py
index f64dd374c6..7a5755eee5 100644
--- a/tests/unit/app_server/test_default_web_client_config_injector.py
+++ b/tests/unit/app_server/test_default_web_client_config_injector.py
@@ -360,6 +360,7 @@ class TestGetProvidersConfigured:
'GITLAB_APP_CLIENT_ID',
'BITBUCKET_APP_CLIENT_ID',
'BITBUCKET_DATA_CENTER_CLIENT_ID',
+ 'AZURE_DEVOPS_CLIENT_ID',
'ENABLE_ENTERPRISE_SSO',
]:
os.environ.pop(var, None)
@@ -412,6 +413,17 @@ class TestGetProvidersConfigured:
result = _get_providers_configured()
assert ProviderType.BITBUCKET_DATA_CENTER in result
+ def test_includes_azure_devops_when_client_id_set(self):
+ """When AZURE_DEVOPS_CLIENT_ID is set, include Azure DevOps in providers."""
+ from openhands.app_server.integrations.service_types import ProviderType
+ from openhands.app_server.web_client.default_web_client_config_injector import (
+ _get_providers_configured,
+ )
+
+ with patch.dict(os.environ, {'AZURE_DEVOPS_CLIENT_ID': 'some-client-id'}):
+ result = _get_providers_configured()
+ assert ProviderType.AZURE_DEVOPS in result
+
def test_includes_enterprise_sso_when_enabled(self):
"""When ENABLE_ENTERPRISE_SSO is set, include Enterprise SSO in providers."""
from openhands.app_server.integrations.service_types import ProviderType
@@ -459,6 +471,7 @@ class TestGetProvidersConfigured:
'GITLAB_APP_CLIENT_ID': 'gitlab-id',
'BITBUCKET_APP_CLIENT_ID': '',
'BITBUCKET_DATA_CENTER_CLIENT_ID': 'bbdc-id',
+ 'AZURE_DEVOPS_CLIENT_ID': 'azure-id',
'ENABLE_ENTERPRISE_SSO': 'enabled',
},
):
@@ -467,8 +480,9 @@ class TestGetProvidersConfigured:
assert ProviderType.GITLAB in result
assert ProviderType.BITBUCKET not in result
assert ProviderType.BITBUCKET_DATA_CENTER in result
+ assert ProviderType.AZURE_DEVOPS in result
assert ProviderType.ENTERPRISE_SSO in result
- assert len(result) == 4
+ assert len(result) == 5
class TestGetGithubAppSlug:
diff --git a/tests/unit/app_server/test_sandbox_secrets_router.py b/tests/unit/app_server/test_sandbox_secrets_router.py
index 88f7364b3a..9b4f2eb758 100644
--- a/tests/unit/app_server/test_sandbox_secrets_router.py
+++ b/tests/unit/app_server/test_sandbox_secrets_router.py
@@ -811,12 +811,74 @@ class TestProviderTokensInEndpoints:
)
ctx = AuthUserContext(user_auth=mock_user_auth)
+ ctx.get_latest_token = AsyncMock(return_value='unused-token') # type: ignore[method-assign]
result = await ctx.get_provider_tokens(as_env_vars=True)
gh_key = ProviderHandler.get_provider_env_key(ProviderType.GITHUB)
gl_key = ProviderHandler.get_provider_env_key(ProviderType.GITLAB)
assert result[gh_key] == 'ghp_test123'
assert result[gl_key] == 'glpat-test456'
+ ctx.get_latest_token.assert_not_called() # type: ignore[attr-defined]
+
+ async def test_get_provider_tokens_as_env_vars_prefers_latest_token(self):
+ """Provider env vars resolve through the provider service at call time."""
+ mock_user_auth = AsyncMock()
+ mock_user_auth.get_provider_tokens = AsyncMock(
+ return_value={
+ ProviderType.AZURE_DEVOPS: ProviderToken(
+ token=SecretStr('stale-token')
+ ),
+ }
+ )
+ ctx = AuthUserContext(user_auth=mock_user_auth)
+ ctx.get_latest_token = AsyncMock(return_value='fresh-token') # type: ignore[method-assign]
+
+ result = await ctx.get_provider_tokens(as_env_vars=True)
+
+ azure_key = ProviderHandler.get_provider_env_key(ProviderType.AZURE_DEVOPS)
+ assert result[azure_key] == 'fresh-token'
+
+ async def test_get_provider_tokens_as_env_vars_continues_after_refresh_error(
+ self,
+ ):
+ """A provider refresh error does not drop unrelated provider tokens."""
+ mock_user_auth = AsyncMock()
+ mock_user_auth.get_provider_tokens = AsyncMock(
+ return_value={
+ ProviderType.AZURE_DEVOPS: ProviderToken(
+ token=SecretStr('azure-stored-token')
+ ),
+ ProviderType.GITHUB: ProviderToken(token=SecretStr('ghp_test123')),
+ }
+ )
+ ctx = AuthUserContext(user_auth=mock_user_auth)
+ refresh_calls: list[ProviderType] = []
+
+ async def get_latest_token(provider_type: ProviderType) -> str | None:
+ refresh_calls.append(provider_type)
+ if provider_type == ProviderType.AZURE_DEVOPS:
+ raise ValueError('token refresh failed')
+ return None
+
+ ctx.get_latest_token = get_latest_token # type: ignore[method-assign]
+
+ with patch(
+ 'openhands.app_server.user.auth_user_context._logger.warning'
+ ) as mock_warning:
+ result = await ctx.get_provider_tokens(as_env_vars=True)
+
+ azure_key = ProviderHandler.get_provider_env_key(ProviderType.AZURE_DEVOPS)
+ gh_key = ProviderHandler.get_provider_env_key(ProviderType.GITHUB)
+ assert result[azure_key] == 'azure-stored-token'
+ assert result[gh_key] == 'ghp_test123'
+ assert refresh_calls == [ProviderType.AZURE_DEVOPS]
+ assert mock_warning.call_count == 1
+ mock_warning.assert_called_once()
+ assert mock_warning.call_args.args[0] == (
+ 'Failed to refresh provider token for %s: %s'
+ )
+ assert mock_warning.call_args.args[1] == 'azure_devops'
+ assert isinstance(mock_warning.call_args.args[2], ValueError)
async def test_empty_provider_tokens_excluded(self):
"""Provider tokens with empty token values are excluded."""
diff --git a/tests/unit/integrations/test_provider_immutability.py b/tests/unit/integrations/test_provider_immutability.py
index 131ce3f404..9f95100c33 100644
--- a/tests/unit/integrations/test_provider_immutability.py
+++ b/tests/unit/integrations/test_provider_immutability.py
@@ -209,6 +209,52 @@ def test_get_provider_env_key():
assert ProviderHandler.get_provider_env_key(ProviderType.GITLAB) == 'gitlab_token'
+async def test_azure_devops_oauth_git_url_omits_token():
+ jwt_token = 'header.payload.signature'
+ tokens = MappingProxyType(
+ {
+ ProviderType.AZURE_DEVOPS: ProviderToken(
+ token=SecretStr(jwt_token),
+ host='alonaking',
+ )
+ }
+ )
+ handler = ProviderHandler(provider_tokens=tokens)
+
+ with patch.object(handler, 'verify_repo_provider') as mock_verify:
+ mock_verify.return_value.git_provider = ProviderType.AZURE_DEVOPS
+ mock_verify.return_value.full_name = 'alonaking/project/repo'
+
+ remote_url = await handler.get_authenticated_git_url('alonaking/project/repo')
+
+ assert remote_url == 'https://dev.azure.com/alonaking/project/_git/repo'
+ assert jwt_token not in remote_url
+
+
+async def test_azure_devops_pat_git_url_uses_basic_auth():
+ tokens = MappingProxyType(
+ {
+ ProviderType.AZURE_DEVOPS: ProviderToken(
+ token=SecretStr('pat-token'),
+ host='alonaking',
+ )
+ }
+ )
+ handler = ProviderHandler(provider_tokens=tokens)
+
+ with patch.object(handler, 'verify_repo_provider') as mock_verify:
+ mock_verify.return_value.git_provider = ProviderType.AZURE_DEVOPS
+ mock_verify.return_value.full_name = 'alonaking/project/repo'
+
+ remote_url = await handler.get_authenticated_git_url('alonaking/project/repo')
+
+ assert remote_url == (
+ 'https://alonaking:[email protected]/alonaking/project/_git/repo'
+ )
+
+
@pytest.mark.asyncio
async def test_get_github_organizations_delegates_to_service():
"""Test that get_github_organizations calls get_organizations_from_installations on the GitHub service."""