fix(work): fence repeated approval intents and audit state changes atomically
This commit is contained in:
@@ -12,6 +12,7 @@ import re
|
||||
import secrets
|
||||
import time
|
||||
from .crypto import canonical
|
||||
from .approval_audit import ApprovalAudit
|
||||
|
||||
|
||||
class ApprovalError(ValueError):
|
||||
@@ -43,6 +44,7 @@ class ApprovalStore:
|
||||
self.state,self.db,self.keyring,self.clock=state,state.db,keyring,clock
|
||||
self.enforce_execution_state=enforce_execution_state
|
||||
self._sweep_after=''
|
||||
self._retention_after=''
|
||||
with self.db:
|
||||
self.db.execute('''CREATE TABLE IF NOT EXISTS work_approvals_v3(
|
||||
approval_id TEXT PRIMARY KEY,environment TEXT NOT NULL,app_id TEXT NOT NULL,
|
||||
@@ -63,6 +65,9 @@ class ApprovalStore:
|
||||
updated_at DOUBLE PRECISION NOT NULL)''')
|
||||
self.db.execute('''CREATE INDEX IF NOT EXISTS work_approvals_expiry_v3
|
||||
ON work_approvals_v3(environment,app_id,state,expires_at)''')
|
||||
self.db.execute('''CREATE TABLE IF NOT EXISTS work_approval_retention_v1(
|
||||
approval_id TEXT PRIMARY KEY,purged_at DOUBLE PRECISION NOT NULL)''')
|
||||
self.audit=ApprovalAudit(self.db,self.clock)
|
||||
|
||||
def _task(self,task_id,owner,host,generation):
|
||||
if type(generation)is not int or generation<1:
|
||||
@@ -83,6 +88,21 @@ class ApprovalStore:
|
||||
return canonical(['work-approval-v3',*[row[k]for k in ('environment','app_id','task_id',
|
||||
'owner','host_id','binding_generation','operation_id','operation_digest','approval_id')]])
|
||||
|
||||
@staticmethod
|
||||
def _intent(action,owner,operation_id):
|
||||
normalized=json.loads(json.dumps(action,sort_keys=True,ensure_ascii=True,allow_nan=False))
|
||||
# The calendar key is generated by our PC boundary from owner+op ID;
|
||||
# changing that generated key must not turn a denied action into a new
|
||||
# business intent. No arbitrary caller field is discarded otherwise.
|
||||
if (normalized.get('kind')=='work-api-v1'and normalized.get('method')=='POST'
|
||||
and isinstance(normalized.get('path'),str)
|
||||
and re.fullmatch(r'/open-apis/calendar/v4/calendars/[A-Za-z0-9_.@!:$-]+/events',normalized['path'])
|
||||
and isinstance(normalized.get('params'),dict)):
|
||||
expected=hashlib.sha256(canonical([owner,operation_id])).hexdigest()
|
||||
if normalized['params'].get('idempotency_key')==expected:
|
||||
normalized['params'].pop('idempotency_key')
|
||||
return hashlib.sha256(canonical(normalized)).hexdigest()
|
||||
|
||||
def _row(self,approval_id):
|
||||
if not isinstance(approval_id,str)or not re.fullmatch(r'apr_[a-f0-9]{64}',approval_id):
|
||||
raise ApprovalError('invalid_approval_reference')
|
||||
@@ -96,6 +116,7 @@ class ApprovalStore:
|
||||
self.db.execute("UPDATE work_approvals_v3 SET state='expired',updated_at=? WHERE approval_id=? AND state IN ('pending','approved')",
|
||||
(self.clock(),row['approval_id']))
|
||||
row=self._row(row['approval_id'])
|
||||
self.audit.record(row,'expired')
|
||||
return row
|
||||
|
||||
@staticmethod
|
||||
@@ -121,6 +142,20 @@ class ApprovalStore:
|
||||
if (row['owner'],row['host_id'],row['binding_generation'],row['operation_digest'])!=(owner,host,generation,digest):
|
||||
raise ApprovalError('operation_identity_conflict')
|
||||
return self._status(row)
|
||||
# Scope to the SAME authenticated task. Legitimate subsequent user
|
||||
# tasks are independent; changing a model-chosen operation ID inside
|
||||
# this task cannot erase a rejection, expiry or consumed grant.
|
||||
intent=self._intent(action,owner,operation_id)
|
||||
previous=self.db.execute('''SELECT * FROM work_approvals_v3
|
||||
WHERE environment=? AND app_id=? AND task_id=? LIMIT 51''',
|
||||
(self.state.environment,self.state.app_id,task_id)).fetchall()
|
||||
if len(previous)>=50:raise ApprovalError('approval_task_budget_exceeded')
|
||||
for prior in previous:
|
||||
prior=dict(prior)
|
||||
if not prior['ciphertext']:raise ApprovalError('approval_intent_unavailable')
|
||||
original=json.loads(self.keyring.decrypt(prior['key_id'],prior['ciphertext'],self._aad(prior)))
|
||||
if hmac.compare_digest(intent,self._intent(original['action'],prior['owner'],prior['operation_id'])):
|
||||
raise ApprovalError('approval_intent_already_registered')
|
||||
nonce=secrets.token_urlsafe(32)
|
||||
row={'approval_id':approval_id,'environment':task['environment'],'app_id':task['app_id'],
|
||||
'task_id':task_id,'owner':owner,'host_id':host,'binding_generation':generation,
|
||||
@@ -131,6 +166,9 @@ class ApprovalStore:
|
||||
self.db.execute('INSERT INTO work_approvals_v3 VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
|
||||
(approval_id,row['environment'],row['app_id'],task_id,owner,host,generation,operation_id,digest,
|
||||
hashlib.sha256(nonce.encode()).hexdigest(),key,cipher,'','pending',expires,self.clock()))
|
||||
action_class=('work_api_delete'if action.get('method')=='DELETE'else
|
||||
'work_api_read'if action.get('method')=='GET'else'work_api_write')if action.get('kind')=='work-api-v1'else'unknown'
|
||||
self.audit.record(self._row(approval_id),'created',action_class)
|
||||
return self._status(self._row(approval_id))
|
||||
|
||||
def card_material(self,approval_id):
|
||||
@@ -152,6 +190,7 @@ class ApprovalStore:
|
||||
task=self.state.task(row['task_id'])
|
||||
if row['state']in {'pending','approved'}and(not self.state.task_current(task)or task['status']!='inflight'or self._execution_closed(row['task_id'])):
|
||||
self.db.execute("UPDATE work_approvals_v3 SET state='cancelled',updated_at=? WHERE approval_id=?",(self.clock(),approval_id))
|
||||
self.audit.record(self._row(approval_id),'cancelled')
|
||||
if not self.db.execute('SELECT approval_id FROM work_approval_card_outbox_v1 WHERE approval_id=?',(approval_id,)).fetchone():
|
||||
raise ApprovalError('approval_send_intent_required')
|
||||
if row['card_message_id']not in ('',message_id):raise ApprovalError('approval_card_conflict')
|
||||
@@ -159,6 +198,7 @@ class ApprovalStore:
|
||||
(message_id,self.clock(),approval_id))
|
||||
self.db.execute("UPDATE work_approval_card_outbox_v1 SET state='sent',updated_at=? WHERE approval_id=?",
|
||||
(self.clock(),approval_id))
|
||||
self.audit.record(self._row(approval_id),'card_bound')
|
||||
|
||||
def claim_card(self,approval_id):
|
||||
"""Persist send intent before network I/O; lost receipt is not resendable."""
|
||||
@@ -174,8 +214,9 @@ class ApprovalStore:
|
||||
|
||||
def card_send_unknown(self,approval_id):
|
||||
with self.db:
|
||||
self.db.execute("UPDATE work_approval_card_outbox_v1 SET state='unknown',updated_at=? WHERE approval_id=? AND state='sending'",
|
||||
(self.clock(),approval_id))
|
||||
changed=self.db.execute("UPDATE work_approval_card_outbox_v1 SET state='unknown',updated_at=? WHERE approval_id=? AND state='sending'",
|
||||
(self.clock(),approval_id)).rowcount
|
||||
if changed:self.audit.record(self._row(approval_id),'card_send_unknown')
|
||||
|
||||
def close_unavailable(self,limit=100):
|
||||
"""Future bounded maintenance: expiry or invalid task never grants consent."""
|
||||
@@ -199,6 +240,7 @@ class ApprovalStore:
|
||||
self.db.execute("UPDATE work_approvals_v3 SET state=?,updated_at=? WHERE approval_id=? AND state IN ('pending','approved')",
|
||||
(state,self.clock(),row['approval_id']))
|
||||
closed.append({'approval_id':row['approval_id'],'state':state})
|
||||
self.audit.record(self._row(row['approval_id']),state)
|
||||
self._sweep_after=candidate['approval_id']
|
||||
return closed
|
||||
|
||||
@@ -269,6 +311,7 @@ class ApprovalStore:
|
||||
(row['environment'],row['app_id'],decision.event_id,row['approval_id'],decision.event_digest,self.clock()))
|
||||
self.db.execute("UPDATE work_approvals_v3 SET state=?,updated_at=? WHERE approval_id=? AND state='pending'",
|
||||
(target,self.clock(),row['approval_id']))
|
||||
self.audit.record(self._row(row['approval_id']),target)
|
||||
return self._status(self._row(row['approval_id']))
|
||||
|
||||
def status(self,approval_id,task_id,owner,host,generation,operation_digest):
|
||||
@@ -292,6 +335,7 @@ class ApprovalStore:
|
||||
changed=self.db.execute("UPDATE work_approvals_v3 SET state='consumed',updated_at=? WHERE approval_id=? AND state='approved'",
|
||||
(self.clock(),approval_id)).rowcount
|
||||
if changed!=1:return {**self._status(self._row(approval_id)),'execute':False}
|
||||
self.audit.record(self._row(approval_id),'consumed')
|
||||
return {**self._status(self._row(approval_id)),'execute':True,'action':material['action']}
|
||||
|
||||
def cancel(self,approval_id,task_id,owner,host,generation):
|
||||
@@ -299,6 +343,43 @@ class ApprovalStore:
|
||||
self.state._owner_lock(owner);row=self._row(approval_id)
|
||||
self._task(task_id,owner,host,generation)
|
||||
if (row['task_id'],row['owner'],row['host_id'],row['binding_generation'])!=(task_id,owner,host,generation):raise ApprovalError('approval_identity_conflict')
|
||||
self.db.execute("UPDATE work_approvals_v3 SET state='cancelled',updated_at=? WHERE approval_id=? AND state IN ('pending','approved')",
|
||||
(self.clock(),approval_id))
|
||||
changed=self.db.execute("UPDATE work_approvals_v3 SET state='cancelled',updated_at=? WHERE approval_id=? AND state IN ('pending','approved')",
|
||||
(self.clock(),approval_id)).rowcount
|
||||
if changed:self.audit.record(self._row(approval_id),'cancelled')
|
||||
return self._status(self._row(approval_id))
|
||||
|
||||
def maintain_retention(self,payload_days=30,audit_days=90,limit=10):
|
||||
"""Prune CLOSED payloads/audit only. Durable tombstones fence replay."""
|
||||
if (type(payload_days)is not int or type(audit_days)is not int
|
||||
or not 1<=payload_days<=audit_days<=365 or type(limit)is not int or not 1<=limit<=20):
|
||||
raise ApprovalError('invalid_approval_retention')
|
||||
cutoff=self.clock()-payload_days*86400
|
||||
rows=self.db.execute('''SELECT approval_id FROM work_approvals_v3 a WHERE environment=? AND app_id=?
|
||||
AND state IN ('rejected','expired','cancelled','consumed') AND updated_at<?
|
||||
AND approval_id>?
|
||||
AND NOT EXISTS(SELECT 1 FROM work_approval_retention_v1 r WHERE r.approval_id=a.approval_id)
|
||||
ORDER BY approval_id LIMIT ?''',(self.state.environment,self.state.app_id,cutoff,self._retention_after,limit)).fetchall()
|
||||
if not rows:self._retention_after=''
|
||||
purged=0;started=time.monotonic()
|
||||
for item in rows:
|
||||
if time.monotonic()-started>.5:break
|
||||
self._retention_after=item['approval_id']
|
||||
with self.db:
|
||||
row=self._row(item['approval_id']);self.state._owner_lock(row['owner']);row=self._row(row['approval_id'])
|
||||
if row['state']not in {'rejected','expired','cancelled','consumed'}or row['updated_at']>=cutoff:continue
|
||||
if row['state']=='consumed':
|
||||
task=self.state.task(row['task_id'])
|
||||
if not task or task['status']in {'inflight','unknown'}:continue
|
||||
marked=self.db.execute('INSERT INTO work_approval_retention_v1 VALUES(?,?) ON CONFLICT DO NOTHING',
|
||||
(row['approval_id'],self.clock())).rowcount
|
||||
if not marked:continue
|
||||
self.db.execute("UPDATE work_approvals_v3 SET ciphertext='',key_id='',nonce_digest='' WHERE approval_id=?",(row['approval_id'],))
|
||||
self.audit.record(row,'payload_purged');purged+=1
|
||||
# Audit removal is bounded too; approval and operation tombstones stay.
|
||||
with self.db:
|
||||
removed=self.db.execute('''DELETE FROM work_approval_audit_v1 WHERE event_key IN (
|
||||
SELECT x.event_key FROM work_approval_audit_v1 x JOIN work_approval_retention_v1 r
|
||||
ON r.approval_id=x.approval_id WHERE x.environment=? AND x.app_id=? AND x.created_at<?
|
||||
ORDER BY x.created_at LIMIT ?)''',
|
||||
(self.state.environment,self.state.app_id,self.clock()-audit_days*86400,limit)).rowcount
|
||||
return {'payloads_purged':purged,'audit_events_removed':removed,'tombstones_preserved':True}
|
||||
|
||||
Reference in New Issue
Block a user