open-swe/tests/test_atlassian_connect.py
Adam Moussa 1f80500cf3
Some checks are pending
CI / Lint (push) Waiting to run
CI / Format check (push) Waiting to run
CI / Typecheck (push) Waiting to run
CI / Unit tests (push) Waiting to run
CI / Playwright E2E (push) Waiting to run
CI / Docker build smoke (push) Waiting to run
CI / Triage ledger up to date (push) Waiting to run
CI / ui bun.lock in sync (push) Waiting to run
feat: Jira + Confluence integration (tools + triggers) (#182)
* feat(open-swe): add Jira tool plane (Phase 1)

Curated Jira Cloud REST v3 toolset for the agent, mirroring the Linear
tools:

- utils/jira.py: service-account REST client (Basic auth) with get/
  create/update issue, comments, list projects, trace comment; issue and
  comment bodies normalized to markdown.
- utils/adf.py: minimal ADF <-> markdown conversion (read paths convert
  Jira ADF to markdown; agent comments convert prose to ADF).
- tools/jira_{comment,get_issue,get_issue_comments,create_issue,
  update_issue,list_projects}.py wired into the tool registry and the
  main agent tool list.
- tests/test_jira_utils.py: ADF conversion + mocked-transport util tests.

Reads JIRA_BASE_URL / JIRA_SERVICE_EMAIL / JIRA_API_TOKEN; unset env
returns a clean error, so this is safe to land dark. Trigger plane,
prompt guidance, and config plumbing follow in Phase 2.

* feat(open-swe): add Confluence tool plane (Phase 3)

Curated Confluence Cloud REST toolset for the agent, mirroring the Jira
tools:

- utils/confluence.py: service-account REST client (Basic auth) with
  get/create/update page, add comment, CQL search. Page bodies are XHTML
  storage format (not ADF), with minimal storage<->text converters;
  update_page reads the current version and bumps it, as Confluence
  requires.
- tools/confluence_{get_page,create_page,update_page,comment,search}.py
  registered in the tool registry.
- tests/test_confluence_utils.py: converter + mocked-transport tests
  including the version-bump path.

Reads CONFLUENCE_BASE_URL / CONFLUENCE_EMAIL / CONFLUENCE_API_TOKEN;
unset env returns a clean error. Activation in the agent tool list lands
with the Phase 2 server.py wiring.

* feat(open-swe): add Jira trigger plane (Phase 2)

Make an @openswe comment on a Jira issue spawn an agent run, mirroring
the Linear trigger plane:

- webhooks/jira.py: process_jira_issue clones process_linear_issue —
  deterministic thread id, full-issue fetch, actor accountId->email
  attribution feeding resolve_login_from_email_async (PRs open as the
  human), multimodal image handling, source="jira" + jira_issue config.
- webapp.py: POST/GET /webhooks/jira, verify_jira_secret (constant-time
  X-Automation-Webhook-Token check, fails closed), repo-resolution
  cascade, get_repo_config_from_jira_mapping.
- utils/jira_project_repo_map.py: JIRA_PROJECT_TO_REPO (placeholder
  entry — real project->repo mappings still needed).
- utils/jira.py: get_user_email (accountId -> email) for attribution.
- completion.py: source=="jira" failure-reply branch.
- prompt.py: Jira-triggered notify guidance + Refs:/branch key from
  {jira_project_key}-{jira_issue_number}.
- server.py: read jira_issue config + pass jira key to the system
  prompt; also activates the Phase 3 Confluence tools in the agent list.

Jira Automation lacks native webhook HMAC signing, so trust is a shared
secret header (decision D2); replay protection is weaker than Linear's
HMAC+timestamp. /sh-security-review + an Atlassian IP allowlist are the
outstanding gate/hardening before push.

* fix(open-swe): harden Jira webhook trust (sh-security-review)

Resolves findings from the Phase 2 security review (detector fan-out +
proof-or-kill verifier). The unsigned Jira Automation webhook body was
trusted for identity, comment content, repo routing, and issue
existence; a JIRA_WEBHOOK_SECRET holder could forge those fields.

- Corroborate against the real Jira record: the webhook body is now only
  a pointer (issue_key + required comment_id). The triggering comment's
  author and text are re-fetched server-side via get_comment/fetch_jira_
  comment, and identity, the @openswe check, prompt text, and project
  key are derived from that authoritative record — never payload author/
  body fields. An uncorroborated comment is rejected. (closes the
  account-id impersonation, unsigned-body prompt injection, and
  fabricated-issue findings)
- Validate issue_key against the Jira key format and percent-encode all
  untrusted path segments (_seg) so a crafted key can't traverse to a
  different Jira REST endpoint or inject query params. (closes the path-
  traversal / query-injection findings)
- Route source=="jira" through the bot-token-default / author_prs_as_
  user opt-in path in resolve_github_token, matching Linear, instead of
  unconditionally resolving a per-user OAuth token from a payload email.
- Gate attribution on an active user mapping (is_login_mapped) so a
  pending/unconfirmed mapping can't drive PR authorship.

Adds regression tests: server-corroboration wins over payload, malformed
issue_key rejected, uncorroborated comment rejected, path-segment
encoding, project-key derivation, active-mapping gate.

Remaining (non-blocking, deployment/hardening): set ALLOWED_GITHUB_ORGS/
REPOS so the shared allowlist isn't fail-open; consider HMAC-over-body +
timestamp on the Automation payload to close the residual replay gap.

* harden(open-swe): opt-in Jira webhook replay/IP + fail-closed allowlist

Folds the two deployment-hardening items from the Phase 2 security review
into code (all opt-in / default-off, so existing and upstream deployments
are unaffected):

- JIRA_WEBHOOK_REQUIRE_SIGNATURE: when set, the Automation payload must
  carry X-Openswe-Signature (hex HMAC-SHA256 of the raw body keyed by
  JIRA_WEBHOOK_SECRET) plus a fresh timestamp, verified by
  verify_jira_signature / _jira_timestamp_is_fresh (mirrors the Linear
  HMAC+freshness model). Closes the static-token model's replay/forgery
  gap when enabled.
- JIRA_WEBHOOK_IP_ALLOWLIST: optional CIDR allowlist on the webhook's
  direct client IP (verify_jira_source_ip). Documented as direct-peer
  only; behind a proxy/LB, allowlist Atlassian's ranges at that layer.
- REQUIRE_REPO_ALLOWLIST: makes an empty ALLOWED_GITHUB_ORGS/REPOS fail
  CLOSED instead of the back-compat allow-all, plus a startup fail-open
  warning. Applies to all channels for consistency.

Documents all new vars (and a Jira section) in .env.example. Adds tests
for signature on/off + valid/missing/wrong/stale, IP allow/deny/off, and
the fail-closed allowlist.

* feat(open-swe): Confluence Atlassian Connect trigger (Phase 4)

Adds the @openswe-on-a-Confluence-comment trigger via a private Atlassian
Connect app. Designed and adversarially verified with the ultracode
workflow (3 divergent Opus designs + judge; 3 proof-or-kill Opus
skeptics on the implemented crypto).

- utils/atlassian_connect.py: hand-rolled qsh (pinned to Atlassian's
  official test vector), PyJWT HS256 webhook verifier with alg-pinning,
  issuer binding, and qsh-verified-last ordering; RS256 signed-install
  lifecycle verifier against Atlassian's published keys; installation
  store keyed by clientKey with the sharedSecret encrypted at rest
  (TOKEN_ENCRYPTION_KEY / Fernet). No new dependency (PyJWT already pinned).
- webhooks/confluence.py: install/uninstall lifecycle + comment handler.
  The JWT-signed webhook body is only a pointer; the comment's real
  author/text/container are re-fetched server-side via the Basic-auth
  service account (Phase-2 corroboration lesson), with active-only login
  attribution and the repo allowlist.
- utils/confluence.py: get_comment / get_user_email (path-encoded).
- webapp.py: GET /connect/atlassian-connect.json (served dynamically),
  POST /connect/{installed,uninstalled,webhook/comment-created}, the
  space->repo resolver, thread-id, and fetch helpers.
- completion.py: source=="confluence" failure-reply branch.

Security: the sh-security-review verify pass confirmed one HIGH — the
symmetric signed-install=false first-install was trust-on-first-use gated
only by the public Confluence hostname (webhook-auth bypass). Fixed by
switching to signed-install=true + RS256 verification of lifecycle
callbacks, which cryptographically authenticates the first install. All
other attack lenses (forgery/replay/alg-confusion/overwrite/uninstall
DoS/corroboration/injection) were defeated; residuals are deployment
config (REQUIRE_REPO_ALLOWLIST) or accepted-by-design (qsh cannot cover
bodies; comment-trigger prompt injection, shared with all sources).

New env (documented in .env.example): CONFLUENCE_BASE_URL/EMAIL/API_TOKEN,
CONNECT_BASE_URL, CONNECT_EXPECTED_BASE_URL (optional). Install secrets
require the durable Postgres LangGraph store in prod.

Outstanding before push: /sh-security-review on the real diff and the
GPT-4.1 cross-family review (auth boundary); README/CLAUDE.md + memory.

* docs(open-swe): Phase 5 — Confluence prompt guidance + architecture docs

- prompt.py: Confluence-triggered runs notify via confluence_comment on
  the triggering page; add Confluence to the shared-base source list.
- CLAUDE.md: document the Jira + Confluence tool planes and the Atlassian
  triggers (Jira Automation shared-secret webhook; Confluence Connect app
  with HS256 webhook + qsh and RS256 signed-install lifecycle), plus the
  server-side corroboration + encrypted install store.

Phase 5 also verified the trigger surface end-to-end against a running
uvicorn app (descriptor served; /connect/* and /webhooks/jira fail closed
without valid auth) and recorded the integration in project memory.

* fix(open-swe): resolve /sh-security-review findings on the Atlassian surface

Formal sh-security-review (detector fan-out + verifier) over the Phase-4
Connect surface (esp. the new RS256 signed-install code, unseen by the
earlier adversarial verify) and the Phase-2 opt-in hardening.

CRITICAL — cross-tenant install (origin validation, CWE-346): signed-
install proves the caller is *an* Atlassian tenant, not *ours*, and the
descriptor is served publicly, so any attacker could install the app on
their own Confluence site and drive agent runs against our allowlisted
repos. The baseUrl body field is attacker-controlled and cannot bind the
tenant; only the signature-verified clientKey (JWT iss) can. Added a
MANDATORY, fail-closed CONNECT_EXPECTED_CLIENT_KEYS allowlist checked in
process_install after signature+iss verification.

HIGH — cross-tenant thread-id collision (CWE-330/863): Confluence comment
ids are per-instance, so generate_thread_id_from_confluence_comment now
salts the hash with the verified clientKey (plumbed from the webhook JWT
iss) to prevent thread hijack across tenants.

HIGH/MEDIUM — path/query injection (CWE-22/88): get_page and update_page
interpolated page_id into the REST path unencoded (update_page on a
mutating PUT with no params= backstop). Now _seg()-encoded, matching the
rest of the module.

MEDIUM — self-trigger loop (CWE-405): process_confluence_comment had no
bot-authorship early-out. Added an optional CONFLUENCE_BOT_ACCOUNT_ID
guard mirroring the Linear botActor / Jira comment_author_is_bot checks.

LOW — corrected the CONNECT_EXPECTED_BASE_URL comment to document it as
opt-in defense-in-depth (the clientKey allowlist is the real gate).

Verified clean by the detectors: RS256/HS256 alg-pinning, aud/iss/exp,
kid-fetch SSRF (host-pinned + quote-encoded), at-rest secret encryption,
constant-time comparisons, and the Phase-2 hardening. New regression
tests for each fix; full suite green (1602).

* harden(open-swe): GPT-4.1 cross-family review follow-ups

Cross-family review (GPT-4.1 via orchestrator cross_reviewer) found no
critical/high issues and confirmed the auth boundary is fail-closed and
correct. Two low-cost defense-in-depth items applied:

- Validate the signed-install JWT 'kid' against a strict charset before
  the public-key fetch, so a malformed kid fails fast with no network
  call (on top of the existing fixed host + percent-encoding).
- Make JWT nbf verification explicit (verify_nbf) on both the RS256
  lifecycle and HS256 webhook decodes.

Other suggestions triaged as already-handled (aud cross-app replay is
blocked by the per-tenant iss->secret lookup; documented static-token/IP/
baseUrl tradeoffs; qsh pinned to Atlassian's vector) or ops/infra
(Fernet rotation via MultiFernet; rate limiting at the gateway).

* docs(open-swe): document Jira + Confluence in installation & customization guides

- INSTALLATION.md §5: add Jira (Automation-rule webhook + shared secret,
  service account, JIRA_PROJECT_TO_REPO) and Confluence (Atlassian Connect
  app install, CONNECT_EXPECTED_CLIENT_KEYS bootstrap, durable-store note,
  CONFLUENCE_SPACE_TO_REPO) trigger setup; §6: add the new env vars +
  REQUIRE_REPO_ALLOWLIST.
- CUSTOMIZATION.md: jira_*/confluence_* in the tools table; repo-extraction
  note covers all four sources.
- AGENTS.md: match CLAUDE.md (triggers, webhooks, tool list, auth).
- README.md: invocation section, tools table, and overview line.
2026-07-13 19:45:54 -04:00

305 lines
11 KiB
Python

"""Atlassian Connect qsh vectors + JWT verification (auth boundary).
qsh correctness is a silent-auth-bypass surface, so the official Atlassian test
vector and the three endpoint vectors are pinned here. The JWT tests exercise
alg-pinning, signature, exp, issuer binding, and qsh binding.
"""
from __future__ import annotations
import time
from types import SimpleNamespace
import jwt
import pytest
from agent.utils import atlassian_connect as ac
_SECRET = "connect-shared-secret"
def _request(method: str, path: str, query: str = "", *, token: str | None = None) -> object:
headers = {"Authorization": f"JWT {token}"} if token else {}
return SimpleNamespace(
method=method,
url=SimpleNamespace(path=path, query=query),
headers=headers,
query_params={},
)
def _make_token(
*,
secret: str = _SECRET,
iss: str = "tenant-1",
alg: str = "HS256",
exp_delta: int = 180,
qsh: str | None = "auto",
method: str = "POST",
path: str = "/connect/webhook/comment-created",
query: str = "",
drop_exp: bool = False,
) -> str:
claims: dict = {"iss": iss}
if not drop_exp:
claims["exp"] = int(time.time()) + exp_delta
if qsh == "auto":
claims["qsh"] = ac.compute_qsh(method, path, query)
elif qsh is not None:
claims["qsh"] = qsh
return jwt.encode(claims, secret, algorithm=alg)
# --- qsh vectors -----------------------------------------------------------
def test_official_atlassian_qsh_vector() -> None:
canon = ac.canonical_request(
"GET",
"/path/to/service",
"zee_last=param&repeated=parameter 1&first=param&repeated=parameter 2",
)
assert canon == (
"GET&/path/to/service&first=param&repeated=parameter%201,parameter%202&zee_last=param"
)
@pytest.mark.parametrize(
("path", "expected"),
[
("/connect/installed", "72c0a77bd4d709a202e9b2561ed003fdb400318f7a1cfabe47576d1e1d5b5dd7"),
(
"/connect/uninstalled",
"ef0c0673ed4cf59a823d82cdc5c397c8643d79db724ce7d567342ea15e02acfe",
),
(
"/connect/webhook/comment-created",
"72e058a8906e894732718ec80dbbbf073640341b9ac6ed7cd86f887f23a00b4d",
),
],
)
def test_endpoint_qsh_vectors(path: str, expected: str) -> None:
assert ac.compute_qsh("POST", path, "") == expected
def test_qsh_drops_jwt_param_and_encodes_space_not_plus() -> None:
# jwt param is excluded; space must be %20 (never +).
with_jwt = ac.compute_qsh("GET", "/x", "a=b c&jwt=zzz")
without = ac.compute_qsh("GET", "/x", "a=b c")
assert with_jwt == without
assert "%20" in ac.canonical_request("GET", "/x", "a=b c")
assert "+" not in ac.canonical_request("GET", "/x", "a=b c")
# --- JWT verification ------------------------------------------------------
def test_valid_token_accepted() -> None:
token = _make_token()
req = _request("POST", "/connect/webhook/comment-created", token=token)
claims = ac.verify_connect_jwt(req, shared_secret=_SECRET)
assert claims is not None
assert claims["iss"] == "tenant-1"
def test_missing_token_rejected() -> None:
req = _request("POST", "/connect/webhook/comment-created")
assert ac.verify_connect_jwt(req, shared_secret=_SECRET) is None
def test_alg_none_rejected() -> None:
token = jwt.encode({"iss": "t", "exp": int(time.time()) + 60}, "", algorithm="none")
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET) is None
def test_wrong_secret_rejected() -> None:
token = _make_token(secret="attacker-secret")
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET) is None
def test_expired_token_rejected() -> None:
token = _make_token(exp_delta=-3600)
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET) is None
def test_missing_secret_fails_closed() -> None:
token = _make_token()
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=None) is None
def test_issuer_binding_mismatch_rejected() -> None:
token = _make_token(iss="tenant-1")
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET, expected_client_key="tenant-2") is None
def test_qsh_mismatch_rejected_cross_endpoint_replay() -> None:
# Token signed with the qsh for /installed, replayed at the webhook endpoint.
token = _make_token(path="/connect/installed")
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET) is None
def test_missing_qsh_rejected_when_required() -> None:
token = _make_token(qsh=None)
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET, qsh_required=True) is None
def test_missing_qsh_allowed_on_lifecycle_when_not_required() -> None:
token = _make_token(qsh=None)
req = _request("POST", "/connect/installed", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET, qsh_required=False) is not None
def test_context_qsh_rejected() -> None:
token = _make_token(qsh="context-qsh")
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET, qsh_required=False) is None
def test_missing_exp_rejected() -> None:
token = _make_token(drop_exp=True)
req = _request("POST", "/connect/webhook/comment-created", token=token)
assert ac.verify_connect_jwt(req, shared_secret=_SECRET) is None
# --- baseUrl host allowlist (first-install gate) ---------------------------
def test_base_url_allowlist(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(
ac, "CONNECT_EXPECTED_BASE_URL_HOSTS", frozenset({"seahaven.atlassian.net"})
)
assert ac.base_url_host_allowed("https://seahaven.atlassian.net/wiki") is True
assert ac.base_url_host_allowed("https://evil.example.com/wiki") is False
def test_base_url_allowlist_empty_fails_closed(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(ac, "CONNECT_EXPECTED_BASE_URL_HOSTS", frozenset())
assert ac.base_url_host_allowed("https://seahaven.atlassian.net/wiki") is False
# --- signed-install (asymmetric RS256) lifecycle verification ---------------
_AUD = "https://openswe.example.com"
def _rsa_keypair() -> tuple[str, str]:
from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.primitives.asymmetric import rsa
key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
priv = key.private_bytes(
serialization.Encoding.PEM,
serialization.PrivateFormat.PKCS8,
serialization.NoEncryption(),
).decode()
pub = (
key.public_key()
.public_bytes(serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo)
.decode()
)
return priv, pub
def _install_token(priv_pem: str, *, iss="tenant-1", aud=_AUD, exp_delta=180) -> str:
return jwt.encode(
{"iss": iss, "aud": aud, "exp": int(time.time()) + exp_delta},
priv_pem,
algorithm="RS256",
headers={"kid": "install-key-1"},
)
def _install_req(token: str) -> object:
return SimpleNamespace(
method="POST",
url=SimpleNamespace(path="/connect/installed", query=""),
headers={"Authorization": f"JWT {token}"},
query_params={},
)
def _run_install_verify(token, pub_pem, monkeypatch, *, expected_client_key=None):
import asyncio
from unittest.mock import AsyncMock, patch
monkeypatch.setattr(ac, "CONNECT_BASE_URL", _AUD)
with patch.object(ac, "_fetch_atlassian_public_key", new=AsyncMock(return_value=pub_pem)):
return asyncio.run(
ac.verify_asymmetric_install_jwt(
_install_req(token), expected_client_key=expected_client_key
)
)
def test_signed_install_valid_accepted(monkeypatch: pytest.MonkeyPatch) -> None:
priv, pub = _rsa_keypair()
claims = _run_install_verify(_install_token(priv), pub, monkeypatch)
assert claims is not None and claims["iss"] == "tenant-1"
def test_signed_install_hs256_rejected(monkeypatch: pytest.MonkeyPatch) -> None:
# An HS256 token (symmetric alg-confusion) must not pass asymmetric verify.
_priv, pub = _rsa_keypair()
hs = jwt.encode({"iss": "t", "aud": _AUD, "exp": int(time.time()) + 60}, "x", algorithm="HS256")
assert _run_install_verify(hs, pub, monkeypatch) is None
def test_signed_install_wrong_audience_rejected(monkeypatch: pytest.MonkeyPatch) -> None:
priv, pub = _rsa_keypair()
token = _install_token(priv, aud="https://some-other-app.example.com")
assert _run_install_verify(token, pub, monkeypatch) is None
def test_signed_install_wrong_key_rejected(monkeypatch: pytest.MonkeyPatch) -> None:
priv, _pub = _rsa_keypair()
_priv2, pub2 = _rsa_keypair()
assert _run_install_verify(_install_token(priv), pub2, monkeypatch) is None
def test_signed_install_expired_rejected(monkeypatch: pytest.MonkeyPatch) -> None:
priv, pub = _rsa_keypair()
assert _run_install_verify(_install_token(priv, exp_delta=-3600), pub, monkeypatch) is None
def test_signed_install_issuer_binding(monkeypatch: pytest.MonkeyPatch) -> None:
priv, pub = _rsa_keypair()
token = _install_token(priv, iss="tenant-1")
assert _run_install_verify(token, pub, monkeypatch, expected_client_key="tenant-2") is None
def test_signed_install_key_fetch_failure_rejected(monkeypatch: pytest.MonkeyPatch) -> None:
priv, _pub = _rsa_keypair()
assert _run_install_verify(_install_token(priv), None, monkeypatch) is None
async def test_fetch_public_key_rejects_malformed_kid() -> None:
# Defense-in-depth: a kid with path/URL chars is rejected before any fetch.
for bad in ["../../evil", "a/b", "http://evil.com", "a b", ""]:
assert await ac._fetch_atlassian_public_key(bad) is None
def test_client_key_allowed_fails_closed(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(ac, "CONNECT_EXPECTED_CLIENT_KEYS", frozenset())
assert ac.client_key_allowed("anything") is False
monkeypatch.setattr(ac, "CONNECT_EXPECTED_CLIENT_KEYS", frozenset({"ours"}))
assert ac.client_key_allowed("ours") is True
assert ac.client_key_allowed("attacker") is False
assert ac.client_key_allowed("") is False
def test_signed_install_no_base_url_rejected(monkeypatch: pytest.MonkeyPatch) -> None:
import asyncio
from unittest.mock import AsyncMock, patch
priv, pub = _rsa_keypair()
monkeypatch.setattr(ac, "CONNECT_BASE_URL", "")
with patch.object(ac, "_fetch_atlassian_public_key", new=AsyncMock(return_value=pub)):
result = asyncio.run(ac.verify_asymmetric_install_jwt(_install_req(_install_token(priv))))
assert result is None