Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61db139c72 | ||
|
|
7d2a15eaba |
@@ -5,7 +5,7 @@ from fastapi.responses import JSONResponse
|
||||
from pydantic import Field
|
||||
|
||||
from .approval_callback import ApprovalCallbackVerifier,decision_toast
|
||||
from .approval_cards import ApprovalCardSender
|
||||
from .approval_cards import ApprovalCardSender,decision_response_card
|
||||
from .approval_policy import describe_action
|
||||
from .approval_store import ApprovalError
|
||||
from .common import no_cache,require_secret
|
||||
@@ -95,7 +95,12 @@ class ApprovalAPI:
|
||||
return no_cache(JSONResponse({'toast':{'type':'warning',
|
||||
'content':'确认未完成或结果待核对,请查看原任务状态,勿重复发起操作。'}}))
|
||||
self._schedule('close',decision.approval_id)
|
||||
return no_cache(JSONResponse(decision_toast(result)))
|
||||
# The callback response updates the clicked private card immediately;
|
||||
# background PATCH remains only for other views/list state convergence.
|
||||
response=decision_toast(result)
|
||||
if result.get('state')in {'approved','rejected','expired','cancelled','consumed'}:
|
||||
response['card']={'type':'raw','data':decision_response_card(result['state'])}
|
||||
return no_cache(JSONResponse(response))
|
||||
|
||||
async def maintain(self):
|
||||
await self.worker.call('close_unavailable')
|
||||
|
||||
@@ -24,7 +24,7 @@ def approval_card(material, clock=time.time):
|
||||
buttons.append({'tag': 'button', 'text': {'tag': 'plain_text', 'content': label},
|
||||
'type': style, 'value': {'kind': 'hainuo.approval.v1', 'approval_id': reference,
|
||||
'nonce': nonce, 'choice': choice}})
|
||||
return {'config': {'wide_screen_mode': True, 'enable_forward': False},
|
||||
return {'config': {'wide_screen_mode': True, 'enable_forward': False, 'update_multi': True},
|
||||
'header': {'template': 'orange', 'title': {'tag': 'plain_text', 'content': '海诺操作确认'}},
|
||||
'elements': [
|
||||
{'tag': 'div', 'text': {'tag': 'plain_text', 'content': '准备做什么:' + summary}},
|
||||
@@ -57,8 +57,8 @@ class ApprovalCardSender:
|
||||
raise
|
||||
return {'state': 'sent'}
|
||||
|
||||
async def update_closed(self,approval_id):
|
||||
receipt=await self.approvals.call('closed_card_receipt',approval_id)
|
||||
async def update_closed(self,approval_id,refresh=False):
|
||||
receipt=await self.approvals.call('closed_card_receipt',approval_id,refresh)
|
||||
if not receipt:return {'state':'no_closed_card'}
|
||||
card=closed_approval_card(receipt['state'])
|
||||
token=await self.platform.tenant_token()
|
||||
@@ -76,6 +76,15 @@ def closed_approval_card(state):
|
||||
'cancelled':'本次确认已取消,不能再通过这张卡片批准。',
|
||||
'consumed':'本次许可已交给客户端;是否执行及执行结果请查看任务进度。'}
|
||||
if state not in messages:raise ApprovalError('approval_not_closed')
|
||||
return {'config':{'wide_screen_mode':True,'enable_forward':False},
|
||||
return {'config':{'wide_screen_mode':True,'enable_forward':False,'update_multi':True},
|
||||
'header':{'template':'grey','title':{'tag':'plain_text','content':'海诺操作确认已结束'}},
|
||||
'elements':[{'tag':'div','text':{'tag':'plain_text','content':messages[state]}}]}
|
||||
|
||||
|
||||
def decision_response_card(state):
|
||||
if state=='approved':
|
||||
return {'config':{'wide_screen_mode':True,'enable_forward':False,'update_multi':True},
|
||||
'header':{'template':'blue','title':{'tag':'plain_text','content':'海诺操作已允许'}},
|
||||
'elements':[{'tag':'div','text':{'tag':'plain_text',
|
||||
'content':'你已允许本次操作,等待客户端继续。执行结果请查看任务进度。'}}]}
|
||||
return closed_approval_card(state)
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
"""Docker-console repair of known CLOSED cards only. No public route or send."""
|
||||
import argparse
|
||||
import asyncio
|
||||
import json
|
||||
import re
|
||||
from .config import Settings
|
||||
from .credential_store import CredentialKeyring
|
||||
from .approval_worker import ApprovalWorker
|
||||
from .approval_cards import ApprovalCardSender
|
||||
from .platform import Feishu
|
||||
|
||||
|
||||
async def repair(task,apply=False):
|
||||
s=Settings(role='connector')
|
||||
if not s.work_remote_approvals_enabled:raise ValueError('approvals_disabled')
|
||||
worker=ApprovalWorker(s,CredentialKeyring.from_file(s.credential_keyring_file))
|
||||
await worker.start();platform=Feishu(s)
|
||||
try:
|
||||
# Dedicated worker serializes SQL. This lookup is constrained to a known
|
||||
# task plus fixed app/environment; no user SQL or arbitrary message ID.
|
||||
ids=await worker.call('closed_for_task',task)
|
||||
if not apply:return {'state':'preview','closed_cards':len(ids)}
|
||||
sender=ApprovalCardSender(worker,platform);updated=0
|
||||
for approval_id in ids:
|
||||
result=await sender.update_closed(approval_id,refresh=True)
|
||||
updated+=result['state']=='updated'
|
||||
return {'state':'updated','closed_cards':len(ids),'updated':updated,'new_cards_sent':0}
|
||||
finally:
|
||||
await platform.close();await worker.close()
|
||||
|
||||
|
||||
def main():
|
||||
parser=argparse.ArgumentParser();parser.add_argument('--task',required=True);parser.add_argument('--apply',action='store_true')
|
||||
args=parser.parse_args()
|
||||
if not re.fullmatch(r'msg_[a-f0-9]{64}',args.task):raise SystemExit('invalid task reference')
|
||||
try:print(json.dumps(asyncio.run(repair(args.task,args.apply))))
|
||||
except Exception as error:
|
||||
print(json.dumps({'state':'repair_unconfirmed','error_class':type(error).__name__}))
|
||||
raise SystemExit(1)from None
|
||||
|
||||
|
||||
if __name__=='__main__':main()
|
||||
@@ -244,14 +244,15 @@ class ApprovalStore:
|
||||
self._sweep_after=candidate['approval_id']
|
||||
return closed
|
||||
|
||||
def closed_card_receipt(self,approval_id):
|
||||
def closed_card_receipt(self,approval_id,refresh=False):
|
||||
"""Internal renderer only. Never return action/nonce or imply execution success."""
|
||||
if type(refresh)is not bool:raise ApprovalError('invalid_card_refresh')
|
||||
with self.db:
|
||||
row=self._row(approval_id);self.state._owner_lock(row['owner']);row=self._expire(self._row(approval_id))
|
||||
if row['state']not in {'rejected','expired','cancelled','consumed'}or not row['card_message_id']:
|
||||
return None
|
||||
sent=self.db.execute('SELECT state FROM work_approval_card_outbox_v1 WHERE approval_id=?',(approval_id,)).fetchone()
|
||||
if sent and sent['state']=='closed':return None
|
||||
if sent and sent['state']=='closed'and not refresh:return None
|
||||
self.db.execute('UPDATE work_approval_card_outbox_v1 SET updated_at=? WHERE approval_id=?',
|
||||
(self.clock(),approval_id))
|
||||
return {'message_id':row['card_message_id'],'state':row['state']}
|
||||
@@ -279,6 +280,14 @@ class ApprovalStore:
|
||||
(self.state.environment,self.state.app_id)).fetchall()
|
||||
return [row['approval_id']for row in rows]
|
||||
|
||||
def closed_for_task(self,task_id):
|
||||
if not isinstance(task_id,str)or not re.fullmatch(r'msg_[a-f0-9]{64}',task_id):
|
||||
raise ApprovalError('invalid_task_reference')
|
||||
rows=self.db.execute('''SELECT approval_id FROM work_approvals_v3 WHERE environment=? AND app_id=?
|
||||
AND task_id=? AND state IN ('rejected','expired','cancelled','consumed') AND card_message_id<>'' LIMIT 10''',
|
||||
(self.state.environment,self.state.app_id,task_id)).fetchall()
|
||||
return [row['approval_id']for row in rows]
|
||||
|
||||
def decide(self,decision):
|
||||
if not isinstance(decision,VerifiedDecision):raise ApprovalError('verified_callback_required')
|
||||
if decision.choice not in {'allow','deny'}:raise ApprovalError('invalid_approval_choice')
|
||||
|
||||
@@ -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','maintain_retention'}
|
||||
'mark_card_closed','cards_to_send','cards_to_close','maintain_retention','closed_for_task'}
|
||||
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
|
||||
|
||||
@@ -11,6 +11,24 @@ import redis
|
||||
from .config import Settings
|
||||
|
||||
|
||||
def safe_card_callback_response(payload):
|
||||
"""Forward only code-owned terminal cards returned after verified decisions."""
|
||||
from .approval_cards import decision_response_card
|
||||
fallback={'toast':{'type':'warning','content':'确认结果待核对,请查看任务状态。'}}
|
||||
if not isinstance(payload,dict):return fallback
|
||||
toast=payload.get('toast')
|
||||
if (not isinstance(toast,dict)or toast.get('type')not in {'info','success','warning','error'}
|
||||
or not isinstance(toast.get('content'),str)or len(toast['content'])>200):return fallback
|
||||
response={'toast':{'type':toast['type'],'content':toast['content']}}
|
||||
card=payload.get('card')
|
||||
if card is not None:
|
||||
allowed=[{'type':'raw','data':decision_response_card(state)}for state in
|
||||
('approved','rejected','expired','cancelled','consumed')]
|
||||
if card not in allowed:return fallback
|
||||
response['card']=card
|
||||
return response
|
||||
|
||||
|
||||
def disable_proxy_environment():
|
||||
"""This dedicated SDK worker must connect directly, including discovery and WS."""
|
||||
for key in ("HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY", "http_proxy", "https_proxy", "all_proxy"):
|
||||
@@ -90,11 +108,7 @@ def main():
|
||||
future.add_done_callback(settled)
|
||||
try:payload=future.result(timeout=2.3)
|
||||
except FutureTimeout:return P2CardActionTriggerResponse(fallback)
|
||||
toast=payload.get('toast')if isinstance(payload,dict)else None
|
||||
if (not isinstance(toast,dict)or toast.get('type')not in {'info','success','warning','error'}
|
||||
or not isinstance(toast.get('content'),str)or len(toast['content'])>200):
|
||||
return P2CardActionTriggerResponse(fallback)
|
||||
return P2CardActionTriggerResponse({'toast':toast})
|
||||
return P2CardActionTriggerResponse(safe_card_callback_response(payload))
|
||||
except Exception:return P2CardActionTriggerResponse(fallback)
|
||||
builder=builder.register_p2_card_action_trigger(decision)
|
||||
handler=builder.build()
|
||||
|
||||
@@ -13,6 +13,7 @@ DELIVERY={None:'尚未接收结果','ready':'已接收结果,等待投递','se
|
||||
def card_content(task_id,execution,delivery,files=None,connection_lost=False,remote_approvals=False):
|
||||
execution=execution if execution in EXECUTION else 'unknown'
|
||||
color='green' if execution=='completed' else 'red' if execution in {'failed','interrupted'} else 'orange' if execution in {'waiting_for_approval','unknown'} else 'blue'
|
||||
if execution=='cancelled':color='grey'
|
||||
label=EXECUTION[execution]
|
||||
if connection_lost and execution not in {'completed','failed','cancelled','interrupted'}:
|
||||
color='red';label='客户端失联,任务结果待核对'
|
||||
|
||||
@@ -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']
|
||||
|
||||
Reference in New Issue
Block a user