-
Notifications
You must be signed in to change notification settings - Fork 8
feat(a2a): add optional Bearer auth support for JWT-protected agents #78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nemerna
wants to merge
5
commits into
RHEcosystemAppEng:main
Choose a base branch
from
nemerna:feat/a2a-bearer-auth
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b596400
feat(a2a): add optional Bearer auth for JWT-protected A2A agents
nemerna 37e0d98
fix(a2a): configurable blocking/TLS verify, explicit part kind
nemerna 76934a6
fix(a2a): restore default-off TLS verification, wire optional Bearer …
nemerna e2c33d3
fix(ci): bump Python to 3.12 to match harbor's requires-python
nemerna d06f50f
style: apply ruff format to a2a_adapter.py
nemerna File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| """Tests for optional Bearer auth on abevalflow.harbor_agents.a2a_adapter.A2AAgent.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| from pathlib import Path | ||
| from unittest.mock import AsyncMock, MagicMock, patch | ||
|
|
||
| import pytest | ||
|
|
||
| from abevalflow.harbor_agents.a2a_adapter import A2AAgent | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def logs_dir(tmp_path: Path) -> Path: | ||
| return tmp_path / "logs" | ||
|
|
||
|
|
||
| class TestA2AAuthTokenResolution: | ||
| def test_auth_token_kwarg(self, logs_dir: Path) -> None: | ||
| agent = A2AAgent(logs_dir, "https://agent.example.com", auth_token="jwt-kwarg") | ||
| assert agent._auth_token == "jwt-kwarg" | ||
|
|
||
| def test_extra_env_agent_auth_token(self, logs_dir: Path) -> None: | ||
| agent = A2AAgent( | ||
| logs_dir, | ||
| "https://agent.example.com", | ||
| extra_env={"AGENT_AUTH_TOKEN": "jwt-extra"}, | ||
| ) | ||
| assert agent._auth_token == "jwt-extra" | ||
|
|
||
| def test_env_agent_auth_token(self, logs_dir: Path, monkeypatch: pytest.MonkeyPatch) -> None: | ||
| monkeypatch.setenv("AGENT_AUTH_TOKEN", "jwt-env") | ||
| agent = A2AAgent(logs_dir, "https://agent.example.com") | ||
| assert agent._auth_token == "jwt-env" | ||
|
|
||
| def test_kwarg_overrides_env(self, logs_dir: Path, monkeypatch: pytest.MonkeyPatch) -> None: | ||
| monkeypatch.setenv("AGENT_AUTH_TOKEN", "jwt-env") | ||
| agent = A2AAgent(logs_dir, "https://agent.example.com", auth_token="jwt-kwarg") | ||
| assert agent._auth_token == "jwt-kwarg" | ||
|
|
||
| def test_no_token(self, logs_dir: Path, monkeypatch: pytest.MonkeyPatch) -> None: | ||
| monkeypatch.delenv("AGENT_AUTH_TOKEN", raising=False) | ||
| agent = A2AAgent(logs_dir, "https://agent.example.com") | ||
| assert agent._auth_token == "" | ||
|
|
||
|
|
||
| class TestA2ASendRequestHeaders: | ||
| @pytest.mark.asyncio | ||
| async def test_includes_bearer_header_when_token_set(self, logs_dir: Path) -> None: | ||
| agent = A2AAgent(logs_dir, "https://agent.example.com", auth_token="secret-jwt") | ||
|
|
||
| mock_response = AsyncMock() | ||
| mock_response.raise_for_status = MagicMock() | ||
| mock_response.json = AsyncMock(return_value={"result": {}}) | ||
|
|
||
| mock_post_ctx = AsyncMock() | ||
| mock_post_ctx.__aenter__.return_value = mock_response | ||
|
|
||
| mock_session = AsyncMock() | ||
| mock_session.post = MagicMock(return_value=mock_post_ctx) | ||
|
|
||
| mock_session_ctx = AsyncMock() | ||
| mock_session_ctx.__aenter__.return_value = mock_session | ||
|
|
||
| with patch( | ||
| "abevalflow.harbor_agents.a2a_adapter.aiohttp.ClientSession", | ||
| return_value=mock_session_ctx, | ||
| ): | ||
| await agent._send_request({"jsonrpc": "2.0", "id": "1"}) | ||
|
|
||
| _, kwargs = mock_session.post.call_args | ||
| assert kwargs["headers"]["Authorization"] == "Bearer secret-jwt" | ||
| assert kwargs["headers"]["Content-Type"] == "application/json" | ||
|
|
||
| @pytest.mark.asyncio | ||
| async def test_omits_authorization_without_token(self, logs_dir: Path) -> None: | ||
| agent = A2AAgent(logs_dir, "https://agent.example.com") | ||
|
|
||
| mock_response = AsyncMock() | ||
| mock_response.raise_for_status = MagicMock() | ||
| mock_response.json = AsyncMock(return_value={"result": {}}) | ||
|
|
||
| mock_post_ctx = AsyncMock() | ||
| mock_post_ctx.__aenter__.return_value = mock_response | ||
|
|
||
| mock_session = AsyncMock() | ||
| mock_session.post = MagicMock(return_value=mock_post_ctx) | ||
|
|
||
| mock_session_ctx = AsyncMock() | ||
| mock_session_ctx.__aenter__.return_value = mock_session | ||
|
|
||
| with patch( | ||
| "abevalflow.harbor_agents.a2a_adapter.aiohttp.ClientSession", | ||
| return_value=mock_session_ctx, | ||
| ): | ||
| await agent._send_request({"jsonrpc": "2.0", "id": "1"}) | ||
|
|
||
| _, kwargs = mock_session.post.call_args | ||
| assert "Authorization" not in kwargs["headers"] | ||
| assert kwargs["headers"] == {"Content-Type": "application/json"} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there are some CVEs affecting aiohttps (e.g., GHSA-mfx4-hv73-q22v, GHSA-mq44-7p77-q5h7, GHSA-cq5v-8q36-5273), so better to go with aiohttp>=3.14.3