fix(work): return approval state cards directly from callbacks

This commit is contained in:
ex_tianzy
2026-11-18 10:00:55 +08:00
parent 7d2a15eaba
commit 61db139c72
11 changed files with 165 additions and 25 deletions
+4 -4
View File
@@ -29,7 +29,7 @@ async def test_closed_payload_purge_keeps_replay_tombstone_and_active_payload(pa
e=p['env'];now=__import__('time').time()
with e['store'].db:e['store'].db.execute('UPDATE work_approvals_v3 SET updated_at=?',(now-31*86400,))
api=ApprovalStore(e['store'].lifecycle,e['api'].broker.store.keyring,clock=lambda:now)
active=api.create('task-approval','ou_a','a'*32,1,'operation-active',{'kind':'synthetic'},'合成动作','仅测试')
active=api.create(('msg_'+'a'*64),'ou_a','a'*32,1,'operation-active',{'kind':'synthetic'},'合成动作','仅测试')
with e['store'].db:e['store'].db.execute('UPDATE work_approvals_v3 SET updated_at=? WHERE approval_id=?',
(now-32*86400,active['approval_id']))
result=api.maintain_retention()
@@ -37,11 +37,11 @@ async def test_closed_payload_purge_keeps_replay_tombstone_and_active_payload(pa
saved=e['store'].db.execute('SELECT * FROM work_approvals_v3').fetchone()
assert saved['state']=='rejected'and saved['ciphertext']==''and saved['nonce_digest']==''
assert api.maintain_retention()['payloads_purged']==0
status=api.status(row['approval_id'],'task-approval','ou_a','a'*32,1,row['operation_digest'])
status=api.status(row['approval_id'],('msg_'+'a'*64),'ou_a','a'*32,1,row['operation_digest'])
assert status['state']=='rejected'
assert api.consume(row['approval_id'],'task-approval','ou_a','a'*32,1,row['operation_digest'])['execute']is False
assert api.consume(row['approval_id'],('msg_'+'a'*64),'ou_a','a'*32,1,row['operation_digest'])['execute']is False
action=json.loads(e['api'].broker.store.keyring.decrypt(row['key_id'],row['ciphertext'],api._aad(row)))['action']
assert api.create('task-approval','ou_a','a'*32,1,'operation-synthetic',action,'同动作','不得重新放行')['state']=='rejected'
assert api.create(('msg_'+'a'*64),'ou_a','a'*32,1,'operation-synthetic',action,'同动作','不得重新放行')['state']=='rejected'
# A pre-existing pending approval is not selected even when timestamp is old.
assert api.maintain_retention()['payloads_purged']==0
assert e['store'].db.execute('SELECT ciphertext FROM work_approvals_v3 WHERE approval_id=?',
@@ -0,0 +1,60 @@
import json
import pytest
from test_credential_api import env
from test_approval_integration import approval_env, pair, pc_errors
from relay.approval_cards import decision_response_card
from relay.longconn import safe_card_callback_response
@pytest.mark.parametrize(('choice','state'),[('deny','rejected'),('allow','approved')])
async def test_callback_returns_no_button_terminal_card_to_clicked_view(pair,choice,state):
p=pair
job=p['launch']()
response,_=await p['click'](choice)
assert response.status_code==200
payload=response.json()
assert payload['toast']['type']=='info'
forwarded=safe_card_callback_response(payload)
assert forwarded['card']==payload['card']
assert forwarded['card']=={'type':'raw','data':decision_response_card(state)}
card=forwarded['card']['data']
assert card['config']['update_multi'] is True
assert '"button"' not in json.dumps(card)
if choice=='deny':
with pytest.raises(pc_errors.ApprovalRejected):await job
assert not p['calls']
else:
assert (await job)['status']=='completed'
assert len(p['calls'])==1
def test_callback_proxy_discards_untrusted_card_payload():
result=safe_card_callback_response({'toast':{'type':'info','content':'ok'},
'card':{'type':'raw','data':{'secret':'do-not-forward'}}})
assert result=={'toast':{'type':'warning','content':'确认结果待核对,请查看任务状态。'}}
assert 'do-not-forward' not in json.dumps(result)
async def test_explicit_refresh_repairs_a_known_closed_card_without_new_message(pair):
p=pair
job=p['launch']();row=await p['card']();await p['click']('deny')
with pytest.raises(pc_errors.ApprovalRejected):await job
e=p['env'];sender=e['app'].state.approvals.sender
await sender.update_closed(row['approval_id'])
assert await sender.update_closed(row['approval_id'])=={'state':'no_closed_card'}
assert await sender.update_closed(row['approval_id'],refresh=True)=={'state':'updated'}
assert len(e['platform'].cards)==1
assert e['store'].db.execute('SELECT state FROM work_approvals_v3').fetchone()['state']=='rejected'
assert not p['calls']
async def test_admin_repair_preview_is_scoped_and_never_sends_card(pair):
p=pair
job=p['launch']();row=await p['card']();await p['click']('deny')
with pytest.raises(pc_errors.ApprovalRejected):await job
api=p['env']['app'].state.approvals
before=len(p['env']['platform'].cards)
ids=await api.worker.call('closed_for_task',p['context']['task_id'])
assert ids==[row['approval_id']]
assert len(p['env']['platform'].cards)==before
@@ -101,7 +101,7 @@ async def pair(approval_env,tmp_path,monkeypatch):
if 'business_receipt_lost'in faults:raise httpx.ReadTimeout('synthetic lost business response')
return httpx.Response(200,json={'code':0,'data':{'event':{'event_id':'synthetic-event'}}})
client=pc_broker.BrokerWorkClient(directory,transport=transport,api_transport=httpx.MockTransport(platform))
task=e['store'].lifecycle.create_task('task-approval','ou_a',host,device['binding_generation'],
task=e['store'].lifecycle.create_task(('msg_'+'a'*64),'ou_a',host,device['binding_generation'],
'synthetic-session',e['app'].state.broker.worker_id,time.time()+600,'oc_synthetic','om_source')
context={k:task[k]for k in ('environment','app_id','owner','host_id','binding_generation',
'conversation_id','chat_id','source_message_id')}
@@ -203,7 +203,7 @@ async def test_stop_binding_terminal_and_expiry_do_not_execute(pair,failure):
(p['directory']/'device.json').write_text(json.dumps(value))
elif failure=='terminal':
with e['store'].db:e['store'].db.execute('INSERT INTO work_execution_state_v3 VALUES(?,?,?,?)',
('task-approval','failed',1,time.time()))
(('msg_'+'a'*64),'failed',1,time.time()))
else:
with e['store'].db:e['store'].db.execute('UPDATE work_approvals_v3 SET expires_at=0')
if failure in {'terminal','expired'}:await p['click']()
@@ -240,7 +240,7 @@ async def test_card_send_receipt_loss_never_sends_second_card(pair):
async def test_unsigned_rpc_proof_replay_and_other_task_are_rejected(pair):
p=pair;job=p['launch']();row=await p['card']();e=p['env'];path='/work/v2/approvals/status'
fields=dict(task_id='task-approval',approval_id=row['approval_id'],operation_digest=row['operation_digest'])
fields=dict(task_id=('msg_'+'a'*64),approval_id=row['approval_id'],operation_digest=row['operation_digest'])
unsigned=await e['client'].post(path,json=fields);assert unsigned.status_code==422
signed=wire(e,path,**fields)
assert (await e['client'].post(path,json=signed)).status_code==200
@@ -279,7 +279,7 @@ async def test_conflicting_clicks_and_concurrent_consume_grant_at_most_once(pair
assert response.json()['toast']['type']=='info'
assert conflict.json()['toast']['type']=='warning'
e=p['env'];path='/work/v2/approvals/consume'
fields=dict(task_id='task-approval',approval_id=row['approval_id'],operation_digest=row['operation_digest'])
fields=dict(task_id=('msg_'+'a'*64),approval_id=row['approval_id'],operation_digest=row['operation_digest'])
responses=await asyncio.gather(*(e['client'].post(path,json=wire(e,path,**fields))for _ in range(2)))
assert sum(r.json().get('execute')is True for r in responses)<=1
try:result=await asyncio.wait_for(job,10)
@@ -22,7 +22,7 @@ async def test_same_intent_cannot_get_new_card_by_changing_operation_id(pair,cho
other='new-operation-id'
action['params']['idempotency_key']=hashlib.sha256(canonical(['ou_a',other])).hexdigest()
path='/work/v2/approvals/create'
response=await e['client'].post(path,json=wire(e,path,task_id='task-approval',operation_id=other,action=action,ttl=120))
response=await e['client'].post(path,json=wire(e,path,task_id=('msg_'+'a'*64),operation_id=other,action=action,ttl=120))
assert response.status_code==409
assert e['store'].db.execute('SELECT COUNT(*) n FROM work_approvals_v3').fetchone()['n']==1
assert len(p['calls'])==(1 if choice=='allow'else 0)
@@ -51,12 +51,12 @@ async def test_changed_action_same_id_rejected_but_distinct_new_action_can_confi
action=json.loads(ledger.keyring.decrypt(row['key_id'],row['ciphertext'],ledger._aad(row)))['action']
action['body']['summary']='真正不同的合成动作'
path='/work/v2/approvals/create'
same=await e['client'].post(path,json=wire(e,path,task_id='task-approval',
same=await e['client'].post(path,json=wire(e,path,task_id=('msg_'+'a'*64),
operation_id='operation-synthetic',action=action,ttl=120))
assert same.status_code==409
other='distinct-operation'
action['params']['idempotency_key']=hashlib.sha256(canonical(['ou_a',other])).hexdigest()
distinct=await e['client'].post(path,json=wire(e,path,task_id='task-approval',
distinct=await e['client'].post(path,json=wire(e,path,task_id=('msg_'+'a'*64),
operation_id=other,action=action,ttl=120))
assert distinct.status_code==200 and distinct.json()['state']=='pending'
assert not p['calls']