fix(work): fence repeated approval intents and audit state changes atomically

This commit is contained in:
ex_tianzy
2026-11-17 15:21:54 +08:00
parent 03d34f1d55
commit 75c609ded6
15 changed files with 638 additions and 10 deletions
+3
View File
@@ -101,3 +101,6 @@ class ApprovalAPI:
await self.worker.call('close_unavailable')
for approval_id in await self.worker.call('cards_to_send'):self._schedule('send',approval_id)
for approval_id in await self.worker.call('cards_to_close'):self._schedule('close',approval_id)
if self.auth.s.approval_retention_enabled:
await self.worker.call('maintain_retention',self.auth.s.approval_payload_retention_days,
self.auth.s.approval_audit_retention_days)
+40
View File
@@ -0,0 +1,40 @@
"""Minimal approval audit; no action bodies, tokens, names or card text."""
import hashlib
from .crypto import canonical
EVENTS={'created','approved','rejected','consumed','expired','cancelled','card_bound',
'card_send_unknown','payload_purged'}
STATES={'pending','approved','rejected','consumed','expired','cancelled'}
ACTION_CLASSES={'work_api_read','work_api_write','work_api_delete','unknown'}
class ApprovalAudit:
def __init__(self,db,clock):
self.db,self.clock=db,clock
with db:
db.execute('''CREATE TABLE IF NOT EXISTS work_approval_audit_v1(
event_key TEXT PRIMARY KEY,environment TEXT NOT NULL,app_id TEXT NOT NULL,
approval_id TEXT NOT NULL,task_scope TEXT NOT NULL,actor_scope TEXT NOT NULL,
device_scope TEXT NOT NULL,binding_generation BIGINT NOT NULL,
operation_digest TEXT NOT NULL,event TEXT NOT NULL,state TEXT NOT NULL,action_class TEXT NOT NULL,
created_at DOUBLE PRECISION NOT NULL)''')
db.execute('''CREATE INDEX IF NOT EXISTS work_approval_audit_time_v1
ON work_approval_audit_v1(environment,app_id,created_at)''')
def record(self,row,event,action_class=None):
# Caller owns the approval transaction and owner lock. Failure rolls
# back the associated decision/consume instead of losing its audit.
if event not in EVENTS or row['state']not in STATES:raise ValueError('invalid_approval_audit')
scope=[row['environment'],row['app_id']]
if action_class is None:
created=self.db.execute('''SELECT action_class FROM work_approval_audit_v1
WHERE environment=? AND app_id=? AND approval_id=? AND event='created' ''',
(*scope,row['approval_id'])).fetchone()
action_class=created['action_class']if created else'unknown'
if action_class not in ACTION_CLASSES:raise ValueError('invalid_approval_audit_class')
def digest(kind,value):return hashlib.sha256(canonical([*scope,kind,value])).hexdigest()
key=digest('audit',[row['approval_id'],event])
self.db.execute('''INSERT INTO work_approval_audit_v1 VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
ON CONFLICT DO NOTHING''',(key,*scope,row['approval_id'],digest('task',row['task_id']),
digest('actor',row['owner']),digest('device',row['host_id']),row['binding_generation'],
row['operation_digest'],event,row['state'],action_class,self.clock()))
+2 -1
View File
@@ -24,7 +24,8 @@ def describe_action(action):
if isinstance(action['body'].get(key),str)and action['body'][key].strip()),'')
if any(ord(char)<32 for char in subject):subject=''
summary=verb+label+'中的指定数据'+(':'+subject if subject else'')
resource=parts[-1][:100]
resource='/'.join(parts[4:])
if len(resource)>300:raise ApprovalError('approval_target_display_budget_exceeded')
impact=('本次是查询,但该接口尚未列入自动放行范围。'if method=='GET'else
'可能修改平台数据或触发通知;已经发生的操作不能保证自动撤销。')
if method=='DELETE':impact='会删除指定数据或移除关联,可能影响其他人,且不一定能够恢复。'
+85 -4
View File
@@ -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}
+1 -1
View File
@@ -45,7 +45,7 @@ class ApprovalWorker:
async def call(self,method,*args):
allowed={'create','status','consume','cancel','decide','card_material','claim_card',
'bind_card','card_send_unknown','close_unavailable','closed_card_receipt',
'mark_card_closed','cards_to_send','cards_to_close'}
'mark_card_closed','cards_to_send','cards_to_close','maintain_retention'}
if method not in allowed:raise ApprovalError('unsupported_approval_operation')
try:await asyncio.wait_for(self.slots.acquire(),timeout=.05)
except asyncio.TimeoutError:raise ApprovalError('approval_temporarily_unavailable')from None
+7
View File
@@ -44,6 +44,9 @@ class Settings(BaseSettings):
work_task_cards_enabled: bool = False
work_remote_approvals_enabled: bool = False
feishu_tenant_key: str = ''
approval_retention_enabled: bool = False
approval_payload_retention_days: int = 30
approval_audit_retention_days: int = 90
work_file_max_bytes: int = 10*1024*1024
work_file_batch_limit: int = 20
work_file_retention: int = 86400
@@ -59,6 +62,10 @@ class Settings(BaseSettings):
@model_validator(mode="after")
def validate_runtime(self):
if not 1<=self.approval_payload_retention_days<=self.approval_audit_retention_days<=365:
raise ValueError('approval retention requires 1 <= payload days <= audit days <= 365')
if self.approval_retention_enabled and not self.work_remote_approvals_enabled:
raise ValueError('approval retention requires remote approvals')
if self.work_remote_approvals_enabled:
if (self.credential_mode!='broker'or self.feishu_event_source!='longconn'
or not self.feishu_enabled or not self.feishu_verification_token