feat(jira): pause/hold status mapping, RT/BT dates, TTP, attack_success 3-value field, hours

2026-07-06 16:19:39 +02:00
parent 19c4866103
commit 022c1c756a
13 changed files with 433 additions and 22 deletions
@@ -37,6 +37,143 @@ def test_sync_aegis_to_jira_adds_comment(mock_get_client, db):
    assert link.last_synced_at is not None


+def _make_link(entity_id, issue_key="SEC-100"):
+    return JiraLink(
+        entity_type=JiraLinkEntityType.test,
+        entity_id=entity_id,
+        jira_issue_key=issue_key,
+    )
+
+
+def _make_test(**overrides):
+    from app.models.test import Test
+    t = MagicMock(spec=Test)
+    t.id = uuid4()
+    t.name = "Test"
+    t.attack_success = None
+    t.detection_result = None
+    t.execution_end_time = None
+    t.detection_time = None
+    t.containment_time = None
+    for k, v in overrides.items():
+        setattr(t, k, v)
+    return t
+
+
+@patch("app.services.jira_service.has_admin_jira_configured", return_value=True)
+@patch("app.services.jira_service.get_admin_jira_client")
+def test_push_pause_event_sets_on_hold(mock_get_client, mock_configured, db):
+    mock_jira = MagicMock()
+    mock_get_client.return_value = mock_jira
+    test = _make_test()
+    link = _make_link(test.id)
+    db.add(link)
+    db.commit()
+
+    jira_service.push_pause_event(db, test, MagicMock(username="alice"), resuming=False)
+
+    mock_jira.set_issue_status.assert_called_once_with(link.jira_issue_key, "On Hold")
+    mock_jira.issue_add_comment.assert_called_once()
+
+
+@patch("app.services.jira_service.has_admin_jira_configured", return_value=True)
+@patch("app.services.jira_service.get_admin_jira_client")
+def test_push_pause_event_resume_sets_in_progress(mock_get_client, mock_configured, db):
+    mock_jira = MagicMock()
+    mock_get_client.return_value = mock_jira
+    test = _make_test()
+    link = _make_link(test.id)
+    db.add(link)
+    db.commit()
+
+    jira_service.push_pause_event(db, test, MagicMock(username="alice"), resuming=True)
+
+    mock_jira.set_issue_status.assert_called_once_with(link.jira_issue_key, "In Progress")
+
+
+@patch("app.services.jira_service.has_admin_jira_configured", return_value=True)
+@patch("app.services.jira_service.get_admin_jira_client")
+def test_push_hold_event_sets_blocked(mock_get_client, mock_configured, db):
+    mock_jira = MagicMock()
+    mock_get_client.return_value = mock_jira
+    test = _make_test()
+    link = _make_link(test.id)
+    db.add(link)
+    db.commit()
+
+    jira_service.push_hold_event(db, test, MagicMock(username="alice"), resuming=False, reason="waiting on approval")
+
+    mock_jira.set_issue_status.assert_called_once_with(link.jira_issue_key, "Blocked")
+
+
+@patch("app.services.jira_service.has_admin_jira_configured", return_value=True)
+@patch("app.services.jira_service.get_admin_jira_client")
+def test_push_rt_started_sets_date_field(mock_get_client, mock_configured, db):
+    mock_jira = MagicMock()
+    mock_get_client.return_value = mock_jira
+    test = _make_test()
+    link = _make_link(test.id)
+    db.add(link)
+    db.commit()
+
+    jira_service.push_rt_started(db, test)
+
+    mock_jira.update_issue_field.assert_called_once()
+    args, kwargs = mock_jira.update_issue_field.call_args
+    assert args[0] == link.jira_issue_key
+    assert jira_service.JIRA_FIELD_RT_START_DATE in kwargs["fields"]
+
+
+@patch("app.services.jira_service.has_admin_jira_configured", return_value=True)
+@patch("app.services.jira_service.get_admin_jira_client")
+def test_push_rt_submitted_includes_attack_success(mock_get_client, mock_configured, db):
+    mock_jira = MagicMock()
+    mock_get_client.return_value = mock_jira
+    test = _make_test(attack_success=MagicMock(value="successful"))
+    link = _make_link(test.id)
+    db.add(link)
+    db.commit()
+
+    jira_service.push_rt_submitted(db, test)
+
+    fields = mock_jira.update_issue_field.call_args[1]["fields"]
+    assert fields[jira_service.JIRA_FIELD_RT_END_DATE]
+    assert fields[jira_service.JIRA_FIELD_ATTACK_SUCCESS] == "Yes"
+
+
+@patch("app.services.jira_service.has_admin_jira_configured", return_value=True)
+@patch("app.services.jira_service.get_admin_jira_client")
+def test_push_bt_submitted_includes_detection_and_hours(mock_get_client, mock_configured, db):
+    mock_jira = MagicMock()
+    mock_get_client.return_value = mock_jira
+    exec_end = datetime(2026, 1, 1, 10, 0, 0)
+    detect = datetime(2026, 1, 1, 12, 0, 0)
+    contain = datetime(2026, 1, 1, 13, 30, 0)
+    test = _make_test(
+        detection_result=MagicMock(value="detected"),
+        execution_end_time=exec_end,
+        detection_time=detect,
+        containment_time=contain,
+    )
+    link = _make_link(test.id)
+    db.add(link)
+    db.commit()
+
+    jira_service.push_bt_submitted(db, test)
+
+    fields = mock_jira.update_issue_field.call_args[1]["fields"]
+    assert fields[jira_service.JIRA_FIELD_ATTACK_DETECTED] == "Yes"
+    assert fields[jira_service.JIRA_FIELD_TIME_TO_DETECT] == 2.0
+    assert fields[jira_service.JIRA_FIELD_TIME_TO_CONTAIN] == 1.5
+
+
+def test_update_test_fields_noop_when_not_configured(db):
+    test = _make_test()
+    # has_admin_jira_configured defaults to False without mocking — should
+    # silently no-op rather than raise.
+    jira_service._update_test_fields(db, test, {"customfield_1": "x"})
+
+
@patch("app.services.jira_service.get_jira_client")
 def test_search_jira_issues_maps_fields(mock_get_client):
    mock_jira = MagicMock()