feat(tests): execution start/end times on red team, detection/containment times on blue team
Aegis CI / lint-and-test (push) Has been cancelled
Snyk Security Scan / Python vulnerabilities (backend) (push) Has been cancelled
Snyk Security Scan / npm vulnerabilities (frontend) (push) Has been cancelled
Snyk Security Scan / Docker image vulnerabilities (backend) (push) Has been cancelled
Aegis CI / lint-and-test (push) Has been cancelled
Snyk Security Scan / Python vulnerabilities (backend) (push) Has been cancelled
Snyk Security Scan / npm vulnerabilities (frontend) (push) Has been cancelled
Snyk Security Scan / Docker image vulnerabilities (backend) (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,27 @@
|
|||||||
|
"""Add execution_start_time, execution_end_time, detection_time, containment_time to tests.
|
||||||
|
|
||||||
|
Revision ID: b053
|
||||||
|
Revises: b052
|
||||||
|
Create Date: 2026-06-24
|
||||||
|
"""
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
revision = "b053"
|
||||||
|
down_revision = "b052"
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
op.add_column("tests", sa.Column("execution_start_time", sa.DateTime(), nullable=True))
|
||||||
|
op.add_column("tests", sa.Column("execution_end_time", sa.DateTime(), nullable=True))
|
||||||
|
op.add_column("tests", sa.Column("detection_time", sa.DateTime(), nullable=True))
|
||||||
|
op.add_column("tests", sa.Column("containment_time", sa.DateTime(), nullable=True))
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
op.drop_column("tests", "containment_time")
|
||||||
|
op.drop_column("tests", "detection_time")
|
||||||
|
op.drop_column("tests", "execution_end_time")
|
||||||
|
op.drop_column("tests", "execution_start_time")
|
||||||
@@ -70,6 +70,8 @@ class Test(Base):
|
|||||||
red_summary = Column(Text, nullable=True)
|
red_summary = Column(Text, nullable=True)
|
||||||
# Assign attack_success = Column(Boolean, nullable=True)
|
# Assign attack_success = Column(Boolean, nullable=True)
|
||||||
attack_success = Column(Boolean, nullable=True)
|
attack_success = Column(Boolean, nullable=True)
|
||||||
|
execution_start_time = Column(DateTime, nullable=True)
|
||||||
|
execution_end_time = Column(DateTime, nullable=True)
|
||||||
# Assign red_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
# Assign red_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
||||||
red_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
red_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
||||||
# Assign red_validated_at = Column(DateTime, nullable=True)
|
# Assign red_validated_at = Column(DateTime, nullable=True)
|
||||||
@@ -84,6 +86,8 @@ class Test(Base):
|
|||||||
# Assign detection_result = Column(Enum(TestResult, name="testresult"), nullable=True)
|
# Assign detection_result = Column(Enum(TestResult, name="testresult"), nullable=True)
|
||||||
detection_result = Column(Enum(TestResult, name="testresult"), nullable=True)
|
detection_result = Column(Enum(TestResult, name="testresult"), nullable=True)
|
||||||
containment_result = Column(Enum(ContainmentResult, name="containmentresult"), nullable=True)
|
containment_result = Column(Enum(ContainmentResult, name="containmentresult"), nullable=True)
|
||||||
|
detection_time = Column(DateTime, nullable=True)
|
||||||
|
containment_time = Column(DateTime, nullable=True)
|
||||||
# Assign blue_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
# Assign blue_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
||||||
blue_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
blue_validated_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
||||||
# Assign blue_validated_at = Column(DateTime, nullable=True)
|
# Assign blue_validated_at = Column(DateTime, nullable=True)
|
||||||
|
|||||||
@@ -82,6 +82,8 @@ class TestRedUpdate(BaseModel):
|
|||||||
attack_success: bool | None = None
|
attack_success: bool | None = None
|
||||||
# Assign red_summary = None
|
# Assign red_summary = None
|
||||||
red_summary: str | None = None
|
red_summary: str | None = None
|
||||||
|
execution_start_time: datetime | None = None
|
||||||
|
execution_end_time: datetime | None = None
|
||||||
|
|
||||||
|
|
||||||
# ── Blue Team update ───────────────────────────────────────────────
|
# ── Blue Team update ───────────────────────────────────────────────
|
||||||
@@ -93,6 +95,8 @@ class TestBlueUpdate(BaseModel):
|
|||||||
# Assign detection_result = None
|
# Assign detection_result = None
|
||||||
detection_result: TestResult | None = None
|
detection_result: TestResult | None = None
|
||||||
containment_result: ContainmentResult | None = None
|
containment_result: ContainmentResult | None = None
|
||||||
|
detection_time: datetime | None = None
|
||||||
|
containment_time: datetime | None = None
|
||||||
# Assign blue_summary = None
|
# Assign blue_summary = None
|
||||||
blue_summary: str | None = None
|
blue_summary: str | None = None
|
||||||
|
|
||||||
@@ -195,6 +199,8 @@ class TestOut(BaseModel):
|
|||||||
red_summary: str | None = None
|
red_summary: str | None = None
|
||||||
# Assign attack_success = None
|
# Assign attack_success = None
|
||||||
attack_success: bool | None = None
|
attack_success: bool | None = None
|
||||||
|
execution_start_time: datetime | None = None
|
||||||
|
execution_end_time: datetime | None = None
|
||||||
# Assign red_validated_by = None
|
# Assign red_validated_by = None
|
||||||
red_validated_by: uuid.UUID | None = None
|
red_validated_by: uuid.UUID | None = None
|
||||||
# Assign red_validated_at = None
|
# Assign red_validated_at = None
|
||||||
@@ -209,6 +215,8 @@ class TestOut(BaseModel):
|
|||||||
# Assign detection_result = None
|
# Assign detection_result = None
|
||||||
detection_result: TestResult | None = None
|
detection_result: TestResult | None = None
|
||||||
containment_result: ContainmentResult | None = None
|
containment_result: ContainmentResult | None = None
|
||||||
|
detection_time: datetime | None = None
|
||||||
|
containment_time: datetime | None = None
|
||||||
# Assign blue_validated_by = None
|
# Assign blue_validated_by = None
|
||||||
blue_validated_by: uuid.UUID | None = None
|
blue_validated_by: uuid.UUID | None = None
|
||||||
# Assign blue_validated_at = None
|
# Assign blue_validated_at = None
|
||||||
|
|||||||
@@ -34,11 +34,15 @@ export interface RedUpdatePayload {
|
|||||||
tool_used?: string;
|
tool_used?: string;
|
||||||
attack_success?: boolean;
|
attack_success?: boolean;
|
||||||
red_summary?: string;
|
red_summary?: string;
|
||||||
|
execution_start_time?: string;
|
||||||
|
execution_end_time?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface BlueUpdatePayload {
|
export interface BlueUpdatePayload {
|
||||||
detection_result?: TestResult;
|
detection_result?: TestResult;
|
||||||
containment_result?: ContainmentResult;
|
containment_result?: ContainmentResult;
|
||||||
|
detection_time?: string;
|
||||||
|
containment_time?: string;
|
||||||
blue_summary?: string;
|
blue_summary?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -83,6 +83,8 @@ interface TeamTabsProps {
|
|||||||
tool_used: string;
|
tool_used: string;
|
||||||
attack_success: boolean;
|
attack_success: boolean;
|
||||||
red_summary: string;
|
red_summary: string;
|
||||||
|
execution_start_time: string;
|
||||||
|
execution_end_time: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Blue Team field handlers
|
// Blue Team field handlers
|
||||||
@@ -90,6 +92,8 @@ interface TeamTabsProps {
|
|||||||
blueDraft: {
|
blueDraft: {
|
||||||
detection_result: TestResult | "";
|
detection_result: TestResult | "";
|
||||||
containment_result: ContainmentResult | "";
|
containment_result: ContainmentResult | "";
|
||||||
|
detection_time: string;
|
||||||
|
containment_time: string;
|
||||||
blue_summary: string;
|
blue_summary: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -230,6 +234,44 @@ export default function TeamTabs({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Execution times */}
|
||||||
|
<div className="grid grid-cols-2 gap-4">
|
||||||
|
<div>
|
||||||
|
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
||||||
|
Execution Start (UTC)
|
||||||
|
</label>
|
||||||
|
{canEditRed ? (
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
value={redDraft.execution_start_time}
|
||||||
|
onChange={(e) => onRedFieldChange("execution_start_time", e.target.value)}
|
||||||
|
className="w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-2 text-sm text-gray-200 focus:border-cyan-500 focus:outline-none focus:ring-1 focus:ring-cyan-500"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<p className="text-sm text-gray-400">
|
||||||
|
{test.execution_start_time ? new Date(test.execution_start_time + "Z").toUTCString().replace(" GMT", " UTC") : "—"}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
||||||
|
Execution End (UTC)
|
||||||
|
</label>
|
||||||
|
{canEditRed ? (
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
value={redDraft.execution_end_time}
|
||||||
|
onChange={(e) => onRedFieldChange("execution_end_time", e.target.value)}
|
||||||
|
className="w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-2 text-sm text-gray-200 focus:border-cyan-500 focus:outline-none focus:ring-1 focus:ring-cyan-500"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<p className="text-sm text-gray-400">
|
||||||
|
{test.execution_end_time ? new Date(test.execution_end_time + "Z").toUTCString().replace(" GMT", " UTC") : "—"}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Red Summary */}
|
{/* Red Summary */}
|
||||||
<div>
|
<div>
|
||||||
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
||||||
@@ -396,6 +438,46 @@ export default function TeamTabs({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Detection & Containment times — only relevant when detected */}
|
||||||
|
{(canEditBlue || test.detection_result === "detected" || test.detection_result === "partially_detected") && (
|
||||||
|
<div className="grid grid-cols-2 gap-4">
|
||||||
|
<div>
|
||||||
|
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
||||||
|
Detection Time (UTC)
|
||||||
|
</label>
|
||||||
|
{canEditBlue ? (
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
value={blueDraft.detection_time}
|
||||||
|
onChange={(e) => onBlueFieldChange("detection_time", e.target.value)}
|
||||||
|
className="w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-2 text-sm text-gray-200 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<p className="text-sm text-gray-400">
|
||||||
|
{test.detection_time ? new Date(test.detection_time + "Z").toUTCString().replace(" GMT", " UTC") : "—"}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
||||||
|
Containment Time (UTC)
|
||||||
|
</label>
|
||||||
|
{canEditBlue ? (
|
||||||
|
<input
|
||||||
|
type="datetime-local"
|
||||||
|
value={blueDraft.containment_time}
|
||||||
|
onChange={(e) => onBlueFieldChange("containment_time", e.target.value)}
|
||||||
|
className="w-full rounded-lg border border-gray-700 bg-gray-800 px-3 py-2 text-sm text-gray-200 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<p className="text-sm text-gray-400">
|
||||||
|
{test.containment_time ? new Date(test.containment_time + "Z").toUTCString().replace(" GMT", " UTC") : "—"}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Blue Summary */}
|
{/* Blue Summary */}
|
||||||
<div>
|
<div>
|
||||||
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
<label className="mb-1.5 block text-sm font-medium text-gray-300">
|
||||||
|
|||||||
@@ -34,6 +34,13 @@ import JiraLinkPanel from "../components/JiraLinkPanel";
|
|||||||
import TestPhaseTimeline from "../components/TestPhaseTimeline";
|
import TestPhaseTimeline from "../components/TestPhaseTimeline";
|
||||||
import { createTemplate } from "../api/test-templates";
|
import { createTemplate } from "../api/test-templates";
|
||||||
|
|
||||||
|
// ── Helpers ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function isoToDatetimeLocal(iso: string | null): string {
|
||||||
|
if (!iso) return "";
|
||||||
|
return iso.replace("Z", "").replace(/\.\d+$/, "").slice(0, 16);
|
||||||
|
}
|
||||||
|
|
||||||
// ── Page Component ─────────────────────────────────────────────────
|
// ── Page Component ─────────────────────────────────────────────────
|
||||||
|
|
||||||
export default function TestDetailPage() {
|
export default function TestDetailPage() {
|
||||||
@@ -58,15 +65,21 @@ export default function TestDetailPage() {
|
|||||||
tool_used: "",
|
tool_used: "",
|
||||||
attack_success: false,
|
attack_success: false,
|
||||||
red_summary: "",
|
red_summary: "",
|
||||||
|
execution_start_time: "",
|
||||||
|
execution_end_time: "",
|
||||||
});
|
});
|
||||||
|
|
||||||
const [blueDraft, setBlueDraft] = useState<{
|
const [blueDraft, setBlueDraft] = useState<{
|
||||||
detection_result: TestResult | "";
|
detection_result: TestResult | "";
|
||||||
containment_result: ContainmentResult | "";
|
containment_result: ContainmentResult | "";
|
||||||
|
detection_time: string;
|
||||||
|
containment_time: string;
|
||||||
blue_summary: string;
|
blue_summary: string;
|
||||||
}>({
|
}>({
|
||||||
detection_result: "",
|
detection_result: "",
|
||||||
containment_result: "",
|
containment_result: "",
|
||||||
|
detection_time: "",
|
||||||
|
containment_time: "",
|
||||||
blue_summary: "",
|
blue_summary: "",
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -108,10 +121,14 @@ export default function TestDetailPage() {
|
|||||||
tool_used: test.tool_used || "",
|
tool_used: test.tool_used || "",
|
||||||
attack_success: test.attack_success ?? false,
|
attack_success: test.attack_success ?? false,
|
||||||
red_summary: test.red_summary || "",
|
red_summary: test.red_summary || "",
|
||||||
|
execution_start_time: isoToDatetimeLocal(test.execution_start_time),
|
||||||
|
execution_end_time: isoToDatetimeLocal(test.execution_end_time),
|
||||||
});
|
});
|
||||||
setBlueDraft({
|
setBlueDraft({
|
||||||
detection_result: test.detection_result || "",
|
detection_result: test.detection_result || "",
|
||||||
containment_result: test.containment_result || "",
|
containment_result: test.containment_result || "",
|
||||||
|
detection_time: isoToDatetimeLocal(test.detection_time),
|
||||||
|
containment_time: isoToDatetimeLocal(test.containment_time),
|
||||||
blue_summary: test.blue_summary || "",
|
blue_summary: test.blue_summary || "",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -152,6 +169,8 @@ export default function TestDetailPage() {
|
|||||||
tool_used: redDraft.tool_used || undefined,
|
tool_used: redDraft.tool_used || undefined,
|
||||||
attack_success: redDraft.attack_success,
|
attack_success: redDraft.attack_success,
|
||||||
red_summary: redDraft.red_summary || undefined,
|
red_summary: redDraft.red_summary || undefined,
|
||||||
|
execution_start_time: redDraft.execution_start_time || undefined,
|
||||||
|
execution_end_time: redDraft.execution_end_time || undefined,
|
||||||
}),
|
}),
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
invalidateAll();
|
invalidateAll();
|
||||||
@@ -165,6 +184,8 @@ export default function TestDetailPage() {
|
|||||||
updateTestBlue(testId!, {
|
updateTestBlue(testId!, {
|
||||||
detection_result: (blueDraft.detection_result as TestResult) || undefined,
|
detection_result: (blueDraft.detection_result as TestResult) || undefined,
|
||||||
containment_result: (blueDraft.containment_result as ContainmentResult) || undefined,
|
containment_result: (blueDraft.containment_result as ContainmentResult) || undefined,
|
||||||
|
detection_time: blueDraft.detection_time || undefined,
|
||||||
|
containment_time: blueDraft.containment_time || undefined,
|
||||||
blue_summary: blueDraft.blue_summary || undefined,
|
blue_summary: blueDraft.blue_summary || undefined,
|
||||||
}),
|
}),
|
||||||
onSuccess: () => {
|
onSuccess: () => {
|
||||||
|
|||||||
@@ -86,6 +86,8 @@ export interface Test {
|
|||||||
// Red Team fields
|
// Red Team fields
|
||||||
red_summary: string | null;
|
red_summary: string | null;
|
||||||
attack_success: boolean | null;
|
attack_success: boolean | null;
|
||||||
|
execution_start_time: string | null;
|
||||||
|
execution_end_time: string | null;
|
||||||
red_validated_by: string | null;
|
red_validated_by: string | null;
|
||||||
red_validated_at: string | null;
|
red_validated_at: string | null;
|
||||||
red_validation_status: ValidationStatus | null;
|
red_validation_status: ValidationStatus | null;
|
||||||
@@ -95,6 +97,8 @@ export interface Test {
|
|||||||
blue_summary: string | null;
|
blue_summary: string | null;
|
||||||
detection_result: TestResult | null;
|
detection_result: TestResult | null;
|
||||||
containment_result: ContainmentResult | null;
|
containment_result: ContainmentResult | null;
|
||||||
|
detection_time: string | null;
|
||||||
|
containment_time: string | null;
|
||||||
blue_validated_by: string | null;
|
blue_validated_by: string | null;
|
||||||
blue_validated_at: string | null;
|
blue_validated_at: string | null;
|
||||||
blue_validation_status: ValidationStatus | null;
|
blue_validation_status: ValidationStatus | null;
|
||||||
|
|||||||
Reference in New Issue
Block a user