Skip to content

OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security

refactor(workbench): share the latest remediation attempt query (#2215)

Michael D'Angelof952e59c0548
diff --git a/plugins/codex-security/scripts/workbench_db.py b/plugins/codex-security/scripts/workbench_db.py
index 44fb3b0ed..b6bb5a96d 100644
--- a/plugins/codex-security/scripts/workbench_db.py
+++ b/plugins/codex-security/scripts/workbench_db.py
@@ -1685,16 +1685,7 @@ def set_finding_triage(connection: sqlite3.Connection, args: argparse.Namespace)
timestamp = now()
occurrence = require_occurrence(connection, args.occurrence_id)
if args.status == "closed":
- remediation = connection.execute(
- """
- SELECT *
- FROM finding_remediation_attempts
- WHERE occurrence_id = ?
- ORDER BY created_at DESC, rowid DESC
- LIMIT 1
- """,
- (occurrence["id"],),
- ).fetchone()
+ remediation = remediation_state.latest_attempt(connection, occurrence["id"])
if (
remediation is not None
and remediation["pending_action"] is not None
@@ -1796,16 +1787,7 @@ def request_finding_remediation(
raise SystemExit("This remediation request belongs to a different finding.")
connection.commit()
return scan_context(connection, occurrence["scan_id"])
- latest = connection.execute(
- """
- SELECT *
- FROM finding_remediation_attempts
- WHERE occurrence_id = ?
- ORDER BY created_at DESC, rowid DESC
- LIMIT 1
- """,
- (occurrence["id"],),
- ).fetchone()
+ latest = remediation_state.latest_attempt(connection, occurrence["id"])
if latest is not None:
active_operation = latest["pending_action"] is not None or latest["state"] in {
"requested",
diff --git a/plugins/codex-security/scripts/workbench_remediation.py b/plugins/codex-security/scripts/workbench_remediation.py
index 4fea9793f..d26d8d9da 100644
--- a/plugins/codex-security/scripts/workbench_remediation.py
+++ b/plugins/codex-security/scripts/workbench_remediation.py
@@ -46,6 +46,18 @@ def require_request(
return current
+def latest_attempt(connection: sqlite3.Connection, occurrence_id: str) -> sqlite3.Row | None:
+ return connection.execute(
+ """
+ SELECT * FROM finding_remediation_attempts
+ WHERE occurrence_id = ?
+ ORDER BY created_at DESC, rowid DESC
+ LIMIT 1
+ """,
+ (occurrence_id,),
+ ).fetchone()
+
+
def remediation_claim_is_active(remediation: sqlite3.Row) -> bool:
if remediation["pending_action_claim_token"] is None:
return False
@@ -173,15 +185,7 @@ def _cancel_generation(
connection.execute(
"DELETE FROM finding_remediation_attempts WHERE request_id = ?", (request_id,)
)
- previous = connection.execute(
- """
- SELECT * FROM finding_remediation_attempts
- WHERE occurrence_id = ?
- ORDER BY created_at DESC, rowid DESC
- LIMIT 1
- """,
- (occurrence_id,),
- ).fetchone()
+ previous = latest_attempt(connection, occurrence_id)
if previous is None or previous["state"] != "superseded":
return
restored_state = "applied" if previous["applied_content_digest"] is not None else "generated"