feat(work): stage authenticated remote approvals with scoped execution fencing
This commit is contained in:
@@ -0,0 +1,60 @@
|
|||||||
|
# 审批闭环与异常恢复:本地联调记录
|
||||||
|
|
||||||
|
日期:2026-11-17。范围:客户端feat/phase-A-local-20261116与ECS feat/approval-foundation-local-20261117,均为本地未提交改动。不代表master或已安装产品具备此能力。
|
||||||
|
|
||||||
|
## 结果
|
||||||
|
|
||||||
|
最终针对性测试:162项通过,1项跳过。ECS/两仓联合100项通过、1项跳过;客户端62项通过。联合测试自身25项通过,其余是认证、任务交接、卡片及客户端既有行为回归。
|
||||||
|
|
||||||
|
跳过项:test_postgres_authorization_and_binding_generation,原因是没有提供真实测试PostgreSQL地址。本轮审批账本使用临时SQLite;不声称PostgreSQL审批并发已通过。
|
||||||
|
|
||||||
|
## 已核对行为
|
||||||
|
|
||||||
|
| 场景 | 实测结果 |
|
||||||
|
| --- | --- |
|
||||||
|
| 手机决定的合成回调允许 | 业务MockTransport收到一次请求,审批消费为consumed |
|
||||||
|
| 拒绝 | 未发送业务请求,同操作再次提交不生成第二次执行 |
|
||||||
|
| 重复按钮、重复操作、并发消费 | 仅一次许可可消费,业务请求无重复 |
|
||||||
|
| 消费响应丢失、轮询断线 | 客户端未发送业务请求;重建客户端仍读原操作记录,不重新执行 |
|
||||||
|
| 业务响应丢失 | 原请求计数为1,返回unknown;重建客户端不重放 |
|
||||||
|
| 本机停止、绑定变化、服务端执行终态、过期 | 不发送业务请求 |
|
||||||
|
| 假操作者/应用/租户/Verification Token/时效/会话/卡片/nonce/自报身份 | 未形成批准,原审批保持pending |
|
||||||
|
| 缺设备签名、签名重放、错任务 | 请求被拒绝,不发送业务请求 |
|
||||||
|
| 卡片创建响应不明 | 不重发第二张确认卡 |
|
||||||
|
| 过期卡片更新响应不明 | 只重试更新已知原卡片,删除按钮后不再更新;不新发卡 |
|
||||||
|
| 审批worker及数据库连接重建 | 查询原审批/卡片继续处理,不重新发卡或替换操作ID |
|
||||||
|
| 已核定只读 | 不生成审批卡片,沿正常读取流程 |
|
||||||
|
| 默认关闭 | 没有审批/内部回调路由,不创建审批表,协议不宣称启用 |
|
||||||
|
| 原生run状态投影 | 仅当前任务运行态投影waiting_for_approval;completed不回退 |
|
||||||
|
|
||||||
|
## 方法与边界
|
||||||
|
|
||||||
|
使用真实客户端BrokerWorkClient、设备Ed25519签名、ECS ASGI路由、临时数据库与专用审批worker。Redis使用fakeredis,平台卡片及业务API使用合成服务,不连接正式Work,不创建真实日程、不发邮件。
|
||||||
|
|
||||||
|
客户端新增可注入的http_transport仅供构造测试;网络和模型不能覆盖传输目标。测试中的原生请求补齐loopback来源/Host,模拟Agent补停止回调,没有放宽正式安全检查。
|
||||||
|
|
||||||
|
测试曾因固定轮数的轮询窗口过早读取发送中间态失败,改为单调时钟的实际期限后完整重跑通过。正式“回执不明不重发”规则未修改。
|
||||||
|
|
||||||
|
未覆盖:正式长连接SDK传递真人点击、平台三秒响应上限的现场表现、手机卡片呈现、完整ECS进程/主机重启、正式PostgreSQL和所有工具统一审批。这里的worker重建测试不等于服务器重启验收。
|
||||||
|
|
||||||
|
## 复现与证据
|
||||||
|
|
||||||
|
ECS deployable目录使用现有测试Python执行:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
python -m pytest tests/test_approval_integration.py tests/test_task_delivery.py tests/test_credential_api.py tests/test_task_cards.py -q --junitxml=build-support/approval-integration-20261117.xml
|
||||||
|
```
|
||||||
|
|
||||||
|
客户端仓库根目录:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
python -m pytest integrations/work-relay/tests/test_broker_client.py integrations/work-relay/tests/test_task_journal.py integrations/work-relay/tests/test_task_executor_context.py integrations/work-relay/tests/test_broker_task_context.py -q --junitxml=build-support/approval-client-regression-20261117.xml
|
||||||
|
```
|
||||||
|
|
||||||
|
若成对客户端源码不在同级默认目录,通过HAINUO_APPROVAL_PC_SOURCE指定其仓库根目录。缺源码时联合模块明确skip,不能用跳过代替通过。
|
||||||
|
|
||||||
|
两端XML保留具体测试名、结果与耗时;git diff --check通过。本轮没有提交、推送、部署、出包或修改已安装客户端。两端审批开关仍默认关闭。
|
||||||
|
|
||||||
|
## 下一步
|
||||||
|
|
||||||
|
准备独立测试ECS和客户端版本,复用唯一机器人长连接,核对应用回调订阅后做真人允许/拒绝和断线测试。部署需覆盖原longconn及connector,不能照旧只升级connector/router,也不能增加第二个机器人连接。此步骤需要测试环境和平台配置配合;本轮未擅自执行部署。
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# C2远程确认本地接入记录
|
||||||
|
|
||||||
|
基线d2881b8,分支feat/approval-foundation-local-20261117。此前按用户要求仅开发源码;用户随后明确要求“审批闭环与异常恢复联调”,本轮已开始本地合成联调。不修改线上订阅、不申请权限、不发真实卡片、不部署或推送。条件路由注册与执行闸门开关默认关闭;本地通过不能代替平台真人验收。
|
||||||
|
|
||||||
|
approval_store.py为独立审批账本基础:绑定本人、任务、设备、代次与动作摘要;动作、显示文案与随机按钮nonce采用现有keyring加密。审批有效期30—600秒且不超过任务期限;相同操作不能换动作;仅pending允许决定,approved只能消费一次;拒绝、过期、取消及已消费不再允许执行。已消费回执丢失不自动再执行,后续仍需PC操作账本保护。
|
||||||
|
|
||||||
|
VerifiedDecision仅由approval_callback.py在核对可信SDK内部通道、应用、租户、Verification Token、时效、真实操作者/会话/卡片字段后构造。必须继续经账本核对原任务与nonce,不接受按钮自报身份。
|
||||||
|
|
||||||
|
用户提供的内网文档已读取:[更新消息流卡片按钮](https://open.w.cnooc.com.cn/document/uAjLw4CM/ukTMukTMukTM/group/im-v2/chat_button/update),PUT /open-apis/im/v2/chat_button,使用tenant_access_token,权限im:app_feed_card:write,10次/秒,最多2个按钮,action_type支持webhook及url_page,action_map为字符串字典。这是消息流卡片快捷操作接口,不能直接替代当前消息回复卡片的交互协议,也未为本功能申请这一权限。
|
||||||
|
|
||||||
|
已从同一平台目录继续核对以下协议:
|
||||||
|
|
||||||
|
- [卡片回传交互回调](https://open.w.cnooc.com.cn/document/uAjLw4CM/ukzMukzMukzM/feishu-cards/card-callback-communication):schema 2.0、card.action.trigger;header包含app_id、tenant_key、Verification Token、event_id和微秒create_time;真实操作者来自event.operator.open_id,卡片/会话来自event.context.open_message_id/open_chat_id。event.token仅为更新卡片凭证,不用作身份认证。
|
||||||
|
- [长连接接收回调](https://open.w.cnooc.com.cn/document/uAjLw4CM/ukTMukTMukTM/event-subscription-guide/callback-subscription/step-1-choose-a-subscription-mode/send-callbacks-to-developers-server):官方Python SDK register_p2_card_action_trigger,返回P2CardActionTriggerResponse;响应必须在3秒内完成。复用现有唯一SDK连接,不增加第二个长连接消费者。
|
||||||
|
- [接收并处理回调](https://open.w.cnooc.com.cn/document/uAjLw4CM/ukTMukTMukTM/event-subscription-guide/callback-subscription/receive-and-handle-callbacks):签名为SHA256(timestamp + nonce + Encrypt Key的UTF-8字节 + 原始body);先验签再用SHA256(Encrypt Key)作为AES-256-CBC密钥解密,密文前16字节为IV,PKCS7去填充。
|
||||||
|
|
||||||
|
approval_callback.py提供严格边界:限制64KB、拒绝重复JSON键、应用/租户/Verification Token校验、事件5分钟时效、仅im_message/button。按钮只携带审批引用、随机nonce和选择,不携带本人或设备身份。当前路由只接现有SDK长连接的内部密钥通道;签名加密Webhook验证方法保留为独立实现,没有接入公开Webhook路由或URL challenge。
|
||||||
|
|
||||||
|
审批事件摘要与event_id在同一决定事务中记账;相同回调返回原状态,事件ID换动作/换审批拒绝。确认文案由服务端从实际动作生成,客户端不能用自拟“低风险”文案改变内容。卡片使用plain_text;发送前持久化意图,超时/取消/回执丢失后不自动重发;实际回复卡片ID必须绑定成功才能接受点击。已知卡片可重试PATCH去掉过期按钮,不用新卡代替未知发送结果。
|
||||||
|
|
||||||
|
approval_worker.py使用专用单线程及该线程独享的数据库连接,不共享connector主连接事务。工作槽最多8个,排队50ms、调用等待1.5秒,工作开始前核对排队期限;SQLite busy_timeout 500ms,PostgreSQL lock_timeout 500ms/statement_timeout 800ms。超时不声称事务已回滚,也不批准客户端重试执行。SDK回调使用最多2个独立内部请求worker,等待2.3秒后返回待核对toast;卡片发送/更新不放在回调等待链上。3秒平台时限尚未实测,数据库/网络故障下的预算仍需验收。
|
||||||
|
|
||||||
|
条件路由为POST /work/v2/approvals/create、status、consume、cancel;复用现有设备证书签名、请求正文摘要、90秒proof期限、Redis nonce去重与绑定认证。每次操作同时核对任务ID/本人/设备/代次/动作摘要;任务已终止、失联未知、解绑或超期时不准消费。内部回调为POST /internal/approval-callback,仅接所选longconn来源及内部密钥。创建与回调各自限制body大小。
|
||||||
|
|
||||||
|
客户端对应分支feat/phase-A-local-20261116已在BrokerWorkClient.api的真实平台HTTP发送前接入approval_transport.py。已核定只读沿用读取;需要确认的请求先冻结参数,等待本人决定,消费前登记本地意图;只有收到本次消费成功且动作逐字节相同,任务未停止、绑定未变时才继续原请求。原写操作账本仍保留,重复操作不会因重新审批而重放。同步执行入口不能安全等待、接口404、断网、无停止控制或回执不明均停止,不回退为免确认发送。此闸门覆盖该Work API边界,不等于终端、execute_code等所有工具已完成统一风险接入;OpenCLI仍禁用。
|
||||||
|
|
||||||
|
等待状态通过可信任务作用域在原生run查询中投影为waiting_for_approval,沿原进度协议传至卡片;不覆盖终态。取消/拒绝/过期/已消费卡片删除按钮,consumed仅说明许可已交PC,不冒充业务成功。维护任务只补尚未登记发送意图的卡片、重试已知原卡片更新,每轮各5项;进程内最多32个去重卡片作业。审批审计保留期清理尚未实现。
|
||||||
|
|
||||||
|
配置约束:ECS的HN_WORK_REMOTE_APPROVALS_ENABLED默认false;启用需broker模式、现有longconn、明确的HN_FEISHU_TENANT_KEY和HN_FEISHU_VERIFICATION_TOKEN。客户端可信release.json中remote_approvals默认false。没有修改现有release/Compose/安装实例。后续部署若启用,需要同步更新原唯一longconn容器的源码和配置,不能只更新connector/router,也不能额外启动第二个机器人连接。应用回调订阅仍需在独立验收时核对;本轮没有操作应用后台。
|
||||||
|
|
||||||
|
此前检查仅为AST/diff;本轮增加tests/test_approval_integration.py,成对加载客户端源码,使用真实Ed25519设备签名、ASGI认证路由、Redis合成服务及临时SQLite数据库连接审批worker;平台发卡和业务HTTP均由合成服务替代。测试不是正式Work长连接、真实手机按钮或线上数据库验收。
|
||||||
|
|
||||||
|
已覆盖:允许/拒绝、重复按钮与重复请求、并发决定/消费、未经签名及签名重放、跨任务、假操作者/应用/租户/token/时效/会话/卡片/nonce、停止/本机绑定变化/执行终态/过期、审批消费回执丢失/轮询断线/业务回执丢失后的客户端重建、确认卡创建回执不明不重发、已知过期卡片去按钮更新回执不明可重试、已核定只读免确认、默认关闭无审批路由。客户端既有模拟请求补全真实入口要求的loopback Host/remote,模拟Agent补停止回调,没有放宽正式入口。
|
||||||
|
|
||||||
|
测试XML:deployable/build-support/approval-integration-20261117.xml。成对源码可通过HAINUO_APPROVAL_PC_SOURCE指定客户端仓库根目录;缺少时明确skip,不能将缺少跨仓执行当通过。独立PostgreSQL用例因未提供测试地址仍跳过;完整服务重启、SDK三秒响应、手机UI显示及真实平台回调需后续隔离环境验收。不能据此标记C201—C204全部完成或可上线。
|
||||||
|
|
||||||
|
最终本轮ECS/联合回归100项通过、1项跳过,客户端62项通过(合计162通过、1跳过);详细范围与复现见APPROVAL_ACCEPTANCE_LOCAL_20261117.md。没有提交、推送、部署或出包。
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
# 新ECS审批候选部署
|
||||||
|
|
||||||
|
目标经用户2026-11-17贴回的docker inspect核对为ecs-fd74,当前镜像hainuo-relay:broker-update-6c8b7ecfc8976fcc。父计划:/home/cnooc/hainuo-broker-work-20261116。Compose基线:/home/cnooc/ecs-relay-source/deployable/compose.yaml和该父计划compose.broker.json。不要使用旧ECS的20261112计划。
|
||||||
|
|
||||||
|
候选来自feat/approval-foundation-local-20261117,未经合并;执行时应使用交付命令中固定的提交。客户端保持原状,之后单独准备配套测试代码。测试包不包含本机密钥或服务端身份文件。
|
||||||
|
|
||||||
|
## 执行前必须具备
|
||||||
|
|
||||||
|
1. 应用事件与回调中支持并配置长连接接收card.action.trigger。复用当前唯一longconn,不能新开第二个连接。
|
||||||
|
2. 本应用租户tenant_key和Verification Token。不是App ID、user token、App Secret或Encrypt Key。脚本优先在当前connector环境中本地复用字段,缺项才在ECS交互输入,token不回显;不要贴回私有配置。
|
||||||
|
3. 当前客户端具备broker v2协议。本轮先升级ECS,手机审批实际请求需要后续客户端开启remote_approvals;该客户端开关仍默认关闭,服务端升级不等于真人审批已可用。
|
||||||
|
|
||||||
|
## 准备与切换
|
||||||
|
|
||||||
|
从当前源码仓库fetch候选后,在新的独立worktree执行,不覆盖/home/cnooc/ecs-relay-source。候选worktree:/home/cnooc/ecs-relay-approvals-20261117;新计划:/home/cnooc/hainuo-broker-approvals-20261117。
|
||||||
|
|
||||||
|
在候选worktree中:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo python3 deployable/scripts/approval_identity.py \
|
||||||
|
--output /home/cnooc/hainuo-approval-callback-20261117.json
|
||||||
|
|
||||||
|
sudo python3 deployable/scripts/broker_deploy.py prepare-update \
|
||||||
|
--plan /home/cnooc/hainuo-broker-work-20261116 \
|
||||||
|
--output /home/cnooc/hainuo-broker-approvals-20261117 \
|
||||||
|
--enable-remote-approvals \
|
||||||
|
--callback-identity /home/cnooc/hainuo-approval-callback-20261117.json
|
||||||
|
|
||||||
|
sudo python3 deployable/scripts/broker_deploy.py build \
|
||||||
|
--plan /home/cnooc/hainuo-broker-approvals-20261117
|
||||||
|
|
||||||
|
sudo python3 deployable/scripts/broker_deploy.py activate \
|
||||||
|
--plan /home/cnooc/hainuo-broker-approvals-20261117 \
|
||||||
|
--client-v2-ready
|
||||||
|
|
||||||
|
sudo python3 deployable/scripts/broker_deploy.py state \
|
||||||
|
--plan /home/cnooc/hainuo-broker-approvals-20261117
|
||||||
|
```
|
||||||
|
|
||||||
|
输出目录或私有身份文件已经存在时停止,不覆盖或删除原计划来重来。构建失败后保留现场,未激活前服务不变。切换失败可能部分生效,先运行state;不要自动重复activate。
|
||||||
|
|
||||||
|
本次仅重建connector/router/原longconn。数据库、edge、signer、绑定、工作材料及既有凭据keyring保留。connector/router复用当前connector候选运行时;longconn使用自己的原镜像作基础,分别构建并保存摘要。两种镜像都不在线下载依赖,候选预检不接网络;任一SDK/密钥/配置预检失败即停止。
|
||||||
|
|
||||||
|
## 状态核对
|
||||||
|
|
||||||
|
connector/router应为candidate、running、healthy;longconn应为candidate、running,platform_connected observed应为yes。longconn无healthcheck时health=none不是独立通过证据。启动租约最多会等待旧租约失效,稍后再次state只读检查,不启动其他消费者。启动信号仅导出固定类别,不直接贴含令牌的原始日志。
|
||||||
|
|
||||||
|
随后进行配套客户端和手机允许/拒绝/超时/重复点击/断线的合成动作验收,不能用真实发送邮件作为第一项。
|
||||||
|
|
||||||
|
## 回滚
|
||||||
|
|
||||||
|
停止正在进行的审批测试/任务后,在同一候选worktree运行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo python3 deployable/scripts/broker_deploy.py rollback \
|
||||||
|
--plan /home/cnooc/hainuo-broker-approvals-20261117 \
|
||||||
|
--stop-broker-use
|
||||||
|
|
||||||
|
sudo python3 deployable/scripts/broker_deploy.py state \
|
||||||
|
--plan /home/cnooc/hainuo-broker-approvals-20261117
|
||||||
|
```
|
||||||
|
|
||||||
|
--stop-broker-use是操作者已经停止测试的声明,脚本不替你停止电脑。恢复三服务原镜像和父配置,不回滚数据库、不覆盖refresh token、不重新生成身份密钥。新审批表保留,回滚不承诺撤销已发生业务操作;配套客户端须同时关闭remote_approvals。不要运行父计划的rollback,那会回到更早基线。
|
||||||
|
|
||||||
|
## 保密与边界
|
||||||
|
|
||||||
|
身份JSON、plan.json、compose.broker.json含私有信息,只保存在ECS受限目录,勿发聊天或提交Git。缺少tenant_key或Verification Token时只需本人在平台本地核对,不需要把账号密码交给助手。真实PostgreSQL/SDK回调/手机UI尚待本次环境验收,不能凭本地测试数宣称上线。
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
"""Opt-in device-authenticated approval API, with no business execution route."""
|
||||||
|
import asyncio
|
||||||
|
from fastapi import APIRouter,HTTPException,Request
|
||||||
|
from fastapi.responses import JSONResponse
|
||||||
|
from pydantic import Field
|
||||||
|
|
||||||
|
from .approval_callback import ApprovalCallbackVerifier,decision_toast
|
||||||
|
from .approval_cards import ApprovalCardSender
|
||||||
|
from .approval_policy import describe_action
|
||||||
|
from .approval_store import ApprovalError
|
||||||
|
from .common import no_cache,require_secret
|
||||||
|
from .task_delivery import TaskRequest
|
||||||
|
|
||||||
|
|
||||||
|
class CreateApproval(TaskRequest):
|
||||||
|
operation_id:str=Field(pattern=r'^[A-Za-z0-9_-]{8,100}$')
|
||||||
|
action:dict=Field(repr=False)
|
||||||
|
ttl:int=Field(default=120,strict=True,ge=30,le=600)
|
||||||
|
|
||||||
|
|
||||||
|
class ApprovalReference(TaskRequest):
|
||||||
|
approval_id:str=Field(pattern=r'^apr_[a-f0-9]{64}$')
|
||||||
|
operation_digest:str=Field(pattern=r'^[a-f0-9]{64}$')
|
||||||
|
|
||||||
|
|
||||||
|
class ApprovalAPI:
|
||||||
|
def __init__(self,auth,worker,platform,spawn):
|
||||||
|
self.auth,self.worker,self.spawn=auth,worker,spawn
|
||||||
|
self.sender=ApprovalCardSender(worker,platform)
|
||||||
|
self.scheduled=set()
|
||||||
|
s=auth.s
|
||||||
|
self.verifier=ApprovalCallbackVerifier(environment=s.environment,app_id=s.feishu_app_id,
|
||||||
|
tenant_key=s.feishu_tenant_key,verification_token=s.feishu_verification_token,
|
||||||
|
internal_secret=s.internal_secret,encrypt_key=s.feishu_encrypt_key)
|
||||||
|
self.router=APIRouter()
|
||||||
|
for name in ('create','status','consume','cancel'):
|
||||||
|
self.router.add_api_route('/work/v2/approvals/'+name,getattr(self,name),methods=['POST'])
|
||||||
|
self.router.add_api_route('/internal/approval-callback',self.callback,methods=['POST'])
|
||||||
|
|
||||||
|
async def _call(self,method,*args):
|
||||||
|
try:return await self.worker.call(method,*args)
|
||||||
|
except ApprovalError:
|
||||||
|
raise HTTPException(409,'approval_unavailable_or_unconfirmed')from None
|
||||||
|
|
||||||
|
def _schedule(self,kind,approval_id):
|
||||||
|
key=(kind,approval_id)
|
||||||
|
if key in self.scheduled or len(self.scheduled)>=32:return
|
||||||
|
self.scheduled.add(key)
|
||||||
|
async def deliver():
|
||||||
|
try:
|
||||||
|
if kind=='send':await self.sender.send(approval_id)
|
||||||
|
else:await self.sender.update_closed(approval_id)
|
||||||
|
finally:self.scheduled.discard(key)
|
||||||
|
self.spawn(deliver())
|
||||||
|
|
||||||
|
async def create(self,body:CreateApproval,request:Request):
|
||||||
|
await self.auth.authenticate(body,request)
|
||||||
|
try:summary,impact=describe_action(body.action)
|
||||||
|
except (ApprovalError,TypeError,ValueError,RecursionError):
|
||||||
|
raise HTTPException(400,'unsupported_approval_action')from None
|
||||||
|
result=await self._call('create',body.task_id,body.binding_owner,body.host_id,
|
||||||
|
body.binding_generation,body.operation_id,body.action,summary,impact,body.ttl)
|
||||||
|
self._schedule('send',result['approval_id'])
|
||||||
|
return no_cache(JSONResponse(result))
|
||||||
|
|
||||||
|
async def _reference(self,method,body,request):
|
||||||
|
await self.auth.authenticate(body,request)
|
||||||
|
args=(body.approval_id,body.task_id,body.binding_owner,body.host_id,body.binding_generation)
|
||||||
|
# Cancel requires the same request digest too, not just visibility of an ID.
|
||||||
|
if method=='cancel':
|
||||||
|
await self._call('status',*args,body.operation_digest)
|
||||||
|
result=await self._call('cancel',*args)
|
||||||
|
else:result=await self._call(method,*args,body.operation_digest)
|
||||||
|
if method in {'consume','cancel'}:self._schedule('close',body.approval_id)
|
||||||
|
return no_cache(JSONResponse(result))
|
||||||
|
|
||||||
|
async def status(self,body:ApprovalReference,request:Request):
|
||||||
|
return await self._reference('status',body,request)
|
||||||
|
|
||||||
|
async def consume(self,body:ApprovalReference,request:Request):
|
||||||
|
return await self._reference('consume',body,request)
|
||||||
|
|
||||||
|
async def cancel(self,body:ApprovalReference,request:Request):
|
||||||
|
return await self._reference('cancel',body,request)
|
||||||
|
|
||||||
|
async def callback(self,request:Request):
|
||||||
|
if self.auth.s.feishu_event_source!='longconn':raise HTTPException(404,'not_found')
|
||||||
|
supplied=request.headers.get('X-Internal-Secret','')
|
||||||
|
require_secret(supplied,self.auth.s.internal_secret)
|
||||||
|
try:
|
||||||
|
raw=await asyncio.wait_for(request.body(),timeout=.2)
|
||||||
|
decision=self.verifier.from_sdk_channel(raw,supplied)
|
||||||
|
result=await self.worker.call('decide',decision)
|
||||||
|
except (ApprovalError,asyncio.TimeoutError):
|
||||||
|
return no_cache(JSONResponse({'toast':{'type':'warning',
|
||||||
|
'content':'确认未完成或结果待核对,请查看原任务状态,勿重复发起操作。'}}))
|
||||||
|
self._schedule('close',decision.approval_id)
|
||||||
|
return no_cache(JSONResponse(decision_toast(result)))
|
||||||
|
|
||||||
|
async def maintain(self):
|
||||||
|
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)
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
"""C2 callback verifier; HTTP registration is opt-in in approval_api.
|
||||||
|
|
||||||
|
Only the SDK worker's authenticated internal channel or a signed platform
|
||||||
|
webhook may enter here. action.value is a reference, never actor identity.
|
||||||
|
"""
|
||||||
|
import base64
|
||||||
|
import hashlib
|
||||||
|
import hmac
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
import time
|
||||||
|
|
||||||
|
from cryptography.hazmat.primitives import padding
|
||||||
|
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
|
||||||
|
|
||||||
|
from .approval_store import ApprovalError, VerifiedDecision
|
||||||
|
from .crypto import canonical
|
||||||
|
|
||||||
|
|
||||||
|
class CallbackError(ApprovalError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def _pairs(pairs):
|
||||||
|
result = {}
|
||||||
|
for key, value in pairs:
|
||||||
|
if key in result:
|
||||||
|
raise CallbackError('ambiguous_callback')
|
||||||
|
result[key] = value
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def _json(raw):
|
||||||
|
if not isinstance(raw, bytes) or not 0 < len(raw) <= 65536:
|
||||||
|
raise CallbackError('invalid_callback_budget')
|
||||||
|
try:
|
||||||
|
data = json.loads(raw, object_pairs_hook=_pairs,
|
||||||
|
parse_constant=lambda _: (_ for _ in ()).throw(ValueError()))
|
||||||
|
if not isinstance(data, dict):
|
||||||
|
raise ValueError()
|
||||||
|
return data
|
||||||
|
except (ValueError, RecursionError, UnicodeError):
|
||||||
|
raise CallbackError('invalid_callback_json') from None
|
||||||
|
|
||||||
|
|
||||||
|
def _text(value, pattern=r'[A-Za-z0-9_-]{1,128}'):
|
||||||
|
if not isinstance(value, str) or not re.fullmatch(pattern, value):
|
||||||
|
raise CallbackError('invalid_callback_field')
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
def _equal_secret(actual, expected):
|
||||||
|
return (isinstance(actual, str) and isinstance(expected, str) and bool(expected)
|
||||||
|
and hmac.compare_digest(actual.encode(), expected.encode()))
|
||||||
|
|
||||||
|
|
||||||
|
class ApprovalCallbackVerifier:
|
||||||
|
def __init__(self, *, environment, app_id, tenant_key, verification_token,
|
||||||
|
internal_secret='', encrypt_key='', clock=time.time):
|
||||||
|
self.environment = _text(environment)
|
||||||
|
self.app_id = _text(app_id)
|
||||||
|
self.tenant_key = _text(tenant_key)
|
||||||
|
if not isinstance(verification_token, str) or not verification_token:
|
||||||
|
raise CallbackError('callback_verifier_not_configured')
|
||||||
|
self.verification_token = verification_token
|
||||||
|
self.internal_secret = internal_secret
|
||||||
|
self.encrypt_key = encrypt_key
|
||||||
|
self.clock = clock
|
||||||
|
|
||||||
|
def from_sdk_channel(self, raw, supplied_secret):
|
||||||
|
"""Future internal handler only; never expose as an unauthenticated API.
|
||||||
|
|
||||||
|
Caller must enforce selected event source, a bounded body and the
|
||||||
|
private network boundary. The secret is not read from callback JSON.
|
||||||
|
"""
|
||||||
|
if len(self.internal_secret) < 32 or not _equal_secret(supplied_secret, self.internal_secret):
|
||||||
|
raise CallbackError('unauthenticated_callback_channel')
|
||||||
|
return self._decision(_json(raw))
|
||||||
|
|
||||||
|
def from_webhook(self, raw, *, timestamp, nonce, signature):
|
||||||
|
"""Verify the original bytes before decrypting. No token-only fallback."""
|
||||||
|
if not self.encrypt_key:
|
||||||
|
raise CallbackError('callback_verifier_not_configured')
|
||||||
|
_text(timestamp, r'[0-9]{1,12}')
|
||||||
|
_text(nonce)
|
||||||
|
_text(signature, r'[a-f0-9]{64}')
|
||||||
|
if abs(self.clock() - int(timestamp)) > 300:
|
||||||
|
raise CallbackError('stale_callback')
|
||||||
|
if not isinstance(raw, bytes) or not 0 < len(raw) <= 65536:
|
||||||
|
raise CallbackError('invalid_callback_budget')
|
||||||
|
expected = hashlib.sha256((timestamp + nonce + self.encrypt_key).encode() + raw).hexdigest()
|
||||||
|
if not hmac.compare_digest(expected, signature):
|
||||||
|
raise CallbackError('unauthenticated_callback_channel')
|
||||||
|
envelope = _json(raw)
|
||||||
|
try:
|
||||||
|
if set(envelope) != {'encrypt'} or not isinstance(envelope['encrypt'], str):
|
||||||
|
raise ValueError()
|
||||||
|
ciphertext = base64.b64decode(envelope['encrypt'], validate=True)
|
||||||
|
if len(ciphertext) < 32 or len(ciphertext) % 16:
|
||||||
|
raise ValueError()
|
||||||
|
decryptor = Cipher(algorithms.AES(hashlib.sha256(self.encrypt_key.encode()).digest()),
|
||||||
|
modes.CBC(ciphertext[:16])).decryptor()
|
||||||
|
padded = decryptor.update(ciphertext[16:]) + decryptor.finalize()
|
||||||
|
unpadder = padding.PKCS7(128).unpadder()
|
||||||
|
plaintext = unpadder.update(padded) + unpadder.finalize()
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
raise CallbackError('invalid_callback_ciphertext') from None
|
||||||
|
return self._decision(_json(plaintext))
|
||||||
|
|
||||||
|
def _decision(self, data):
|
||||||
|
header, event = data.get('header'), data.get('event')
|
||||||
|
if data.get('schema') != '2.0' or not isinstance(header, dict) or not isinstance(event, dict):
|
||||||
|
raise CallbackError('unsupported_callback')
|
||||||
|
if (header.get('event_type') != 'card.action.trigger'
|
||||||
|
or header.get('app_id') != self.app_id
|
||||||
|
or header.get('tenant_key') != self.tenant_key
|
||||||
|
or not _equal_secret(header.get('token'), self.verification_token)):
|
||||||
|
raise CallbackError('callback_application_conflict')
|
||||||
|
event_id = _text(header.get('event_id'))
|
||||||
|
created = _text(header.get('create_time'), r'[0-9]{1,20}')
|
||||||
|
if abs(self.clock() - int(created) / 1000000) > 300:
|
||||||
|
raise CallbackError('stale_callback')
|
||||||
|
operator, context, action = event.get('operator'), event.get('context'), event.get('action')
|
||||||
|
if not all(isinstance(item, dict) for item in (operator, context, action)):
|
||||||
|
raise CallbackError('invalid_callback_context')
|
||||||
|
if (event.get('host') != 'im_message' or action.get('tag') != 'button'
|
||||||
|
or operator.get('tenant_key') != self.tenant_key):
|
||||||
|
raise CallbackError('unsupported_callback_context')
|
||||||
|
value = action.get('value')
|
||||||
|
if isinstance(value, str):
|
||||||
|
value = _json(value.encode())
|
||||||
|
if not isinstance(value, dict) or set(value) != {'kind', 'approval_id', 'nonce', 'choice'}:
|
||||||
|
raise CallbackError('invalid_approval_reference')
|
||||||
|
if value['kind'] != 'hainuo.approval.v1' or value['choice'] not in ('allow', 'deny'):
|
||||||
|
raise CallbackError('invalid_approval_choice')
|
||||||
|
fields = dict(environment=self.environment, app_id=self.app_id,
|
||||||
|
actor_open_id=_text(operator.get('open_id'), r'ou_[A-Za-z0-9_-]{1,120}'),
|
||||||
|
chat_id=_text(context.get('open_chat_id'), r'oc_[A-Za-z0-9_-]{1,120}'),
|
||||||
|
card_message_id=_text(context.get('open_message_id'), r'om_[A-Za-z0-9_-]{1,120}'),
|
||||||
|
approval_id=_text(value['approval_id'], r'apr_[a-f0-9]{64}'),
|
||||||
|
nonce=_text(value['nonce'], r'[A-Za-z0-9_-]{43}'), choice=value['choice'])
|
||||||
|
# No token, raw callback or user text is persisted in the receipt.
|
||||||
|
digest = hashlib.sha256(canonical(fields)).hexdigest()
|
||||||
|
return VerifiedDecision(**fields, event_id=event_id, event_digest=digest)
|
||||||
|
|
||||||
|
|
||||||
|
def decision_toast(status):
|
||||||
|
"""Bounded platform response; never starts a task or executes an action."""
|
||||||
|
state = status.get('state') if isinstance(status, dict) else None
|
||||||
|
messages = {'approved': '已允许本次操作,等待客户端继续。',
|
||||||
|
'rejected': '已拒绝本次操作。', 'expired': '确认已过期,请重新发起。',
|
||||||
|
'consumed': '本次确认已使用,请勿重复操作。', 'cancelled': '本次操作已取消。'}
|
||||||
|
return {'toast': {'type': 'info', 'content': messages.get(state, '确认未完成,请核对任务状态。')}}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
"""C2 approval presentation and delivery through the dedicated DB worker."""
|
||||||
|
import asyncio
|
||||||
|
import hashlib
|
||||||
|
import math
|
||||||
|
import re
|
||||||
|
import time
|
||||||
|
|
||||||
|
from .approval_store import ApprovalError, _public_text
|
||||||
|
|
||||||
|
|
||||||
|
def approval_card(material, clock=time.time):
|
||||||
|
reference, nonce = material.get('approval_id'), material.get('nonce')
|
||||||
|
if (not isinstance(reference, str) or not re.fullmatch(r'apr_[a-f0-9]{64}', reference)
|
||||||
|
or not isinstance(nonce, str) or not re.fullmatch(r'[A-Za-z0-9_-]{43}', nonce)):
|
||||||
|
raise ApprovalError('invalid_approval_reference')
|
||||||
|
summary = _public_text(material.get('summary'), 200)
|
||||||
|
impact = _public_text(material.get('impact'), 500)
|
||||||
|
expiry = material.get('expires_at')
|
||||||
|
if type(expiry) not in (int, float) or not math.isfinite(expiry) or expiry <= clock():
|
||||||
|
raise ApprovalError('approval_task_expired')
|
||||||
|
seconds = min(600, max(1, math.ceil(expiry - clock())))
|
||||||
|
buttons = []
|
||||||
|
for choice, label, style in (('allow', '允许本次', 'primary'), ('deny', '拒绝', 'default')):
|
||||||
|
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},
|
||||||
|
'header': {'template': 'orange', 'title': {'tag': 'plain_text', 'content': '海诺操作确认'}},
|
||||||
|
'elements': [
|
||||||
|
{'tag': 'div', 'text': {'tag': 'plain_text', 'content': '准备做什么:' + summary}},
|
||||||
|
{'tag': 'div', 'text': {'tag': 'plain_text', 'content': '可能的影响:' + impact}},
|
||||||
|
{'tag': 'div', 'text': {'tag': 'plain_text', 'content': '仅允许本次操作;约' + str(seconds) + '秒后失效。'}},
|
||||||
|
{'tag': 'action', 'actions': buttons}]}
|
||||||
|
|
||||||
|
|
||||||
|
class ApprovalCardSender:
|
||||||
|
def __init__(self, approvals, platform):
|
||||||
|
self.approvals, self.platform = approvals, platform
|
||||||
|
|
||||||
|
async def send(self, approval_id):
|
||||||
|
material = await self.approvals.call('card_material',approval_id)
|
||||||
|
# Prepare before claiming: invalid presentation must not consume an intent.
|
||||||
|
card = approval_card(material, self.approvals.clock)
|
||||||
|
token = await self.platform.tenant_token()
|
||||||
|
if not await self.approvals.call('claim_card',approval_id):
|
||||||
|
return {'state': 'already_sent_or_unconfirmed'}
|
||||||
|
delivery_id = hashlib.sha256(('approval-card-v1\0' + approval_id).encode()).hexdigest()[:32]
|
||||||
|
try:
|
||||||
|
# Receipt is the actual reply card ID, never the source user message.
|
||||||
|
message_id = await asyncio.wait_for(self.platform.reply_task_card(
|
||||||
|
material['source_message_id'], card, delivery_id, token=token), timeout=10)
|
||||||
|
await self.approvals.call('bind_card',approval_id, message_id)
|
||||||
|
except BaseException:
|
||||||
|
# Cancellation/timeout can occur after platform acceptance. Never
|
||||||
|
# infer "not sent" and automatically issue another confirmation.
|
||||||
|
await self.approvals.call('card_send_unknown',approval_id)
|
||||||
|
raise
|
||||||
|
return {'state': 'sent'}
|
||||||
|
|
||||||
|
async def update_closed(self,approval_id):
|
||||||
|
receipt=await self.approvals.call('closed_card_receipt',approval_id)
|
||||||
|
if not receipt:return {'state':'no_closed_card'}
|
||||||
|
card=closed_approval_card(receipt['state'])
|
||||||
|
token=await self.platform.tenant_token()
|
||||||
|
# Updating the known original message is retryable; sending a new
|
||||||
|
# confirmation card after a lost create receipt is not.
|
||||||
|
await asyncio.wait_for(self.platform.update_task_card(
|
||||||
|
receipt['message_id'],card,token=token),timeout=5)
|
||||||
|
await self.approvals.call('mark_card_closed',approval_id,receipt['state'])
|
||||||
|
return {'state':'updated'}
|
||||||
|
|
||||||
|
|
||||||
|
def closed_approval_card(state):
|
||||||
|
messages={'rejected':'你已拒绝本次操作。',
|
||||||
|
'expired':'本次确认已过期,未获得新的执行许可;需要时请重新发起任务。',
|
||||||
|
'cancelled':'本次确认已取消,不能再通过这张卡片批准。',
|
||||||
|
'consumed':'本次许可已交给客户端;是否执行及执行结果请查看任务进度。'}
|
||||||
|
if state not in messages:raise ApprovalError('approval_not_closed')
|
||||||
|
return {'config':{'wide_screen_mode':True,'enable_forward':False},
|
||||||
|
'header':{'template':'grey','title':{'tag':'plain_text','content':'海诺操作确认已结束'}},
|
||||||
|
'elements':[{'tag':'div','text':{'tag':'plain_text','content':messages[state]}}]}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
"""Describe exactly the request being approved; never trust model risk prose."""
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
from .approval_store import ApprovalError
|
||||||
|
|
||||||
|
|
||||||
|
def describe_action(action):
|
||||||
|
if (not isinstance(action,dict)or set(action)!={'kind','method','path','params','body'}
|
||||||
|
or action['kind']!='work-api-v1' or action['method']not in ('GET','POST','PUT','PATCH','DELETE')
|
||||||
|
or not isinstance(action['path'],str)or len(action['path'])>1500
|
||||||
|
or not re.fullmatch(r'/open-apis/[A-Za-z0-9_./@!:$-]+',action['path'])
|
||||||
|
or '..'in action['path']or '//'in action['path']
|
||||||
|
or not isinstance(action['params'],dict)or not isinstance(action['body'],dict)):
|
||||||
|
raise ApprovalError('unsupported_approval_action')
|
||||||
|
encoded=json.dumps(action,sort_keys=True,ensure_ascii=True,separators=(',',':'),allow_nan=False).encode()
|
||||||
|
if len(encoded)>32000:raise ApprovalError('operation_budget_exceeded')
|
||||||
|
parts=action['path'].split('/');namespace=parts[2]
|
||||||
|
targets={'calendar':'日历','contact':'通讯录','search':'搜索','drive':'云盘',
|
||||||
|
'docx':'文档','wiki':'知识库','bitable':'多维表格','task':'任务','sheets':'电子表格','vc':'会议'}
|
||||||
|
if namespace not in targets:raise ApprovalError('unsupported_approval_action')
|
||||||
|
method=action['method'];label=targets[namespace]
|
||||||
|
verb={'GET':'查询','POST':'提交','PUT':'更新','PATCH':'修改','DELETE':'删除'}[method]
|
||||||
|
subject=next((action['body'][key].strip()[:80]for key in ('summary','title','name')
|
||||||
|
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]
|
||||||
|
impact=('本次是查询,但该接口尚未列入自动放行范围。'if method=='GET'else
|
||||||
|
'可能修改平台数据或触发通知;已经发生的操作不能保证自动撤销。')
|
||||||
|
if method=='DELETE':impact='会删除指定数据或移除关联,可能影响其他人,且不一定能够恢复。'
|
||||||
|
if re.search(r'/(permissions|members|collaborators|share)(/|$)',action['path']):
|
||||||
|
impact='可能改变其他人的访问权限或成员关系,请核对授权范围。'
|
||||||
|
return summary,impact+'\n目标范围:'+label+';目标标识:'+resource
|
||||||
@@ -0,0 +1,304 @@
|
|||||||
|
"""Offline foundation for C2: task-scoped approvals with one-time consumption.
|
||||||
|
|
||||||
|
No HTTP routes, event subscription, platform message or execution adapter is
|
||||||
|
registered by this module. VerifiedDecision must only be constructed by a
|
||||||
|
platform callback verifier; a browser/button payload alone is not evidence.
|
||||||
|
"""
|
||||||
|
from dataclasses import dataclass
|
||||||
|
import hashlib
|
||||||
|
import hmac
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
import secrets
|
||||||
|
import time
|
||||||
|
from .crypto import canonical
|
||||||
|
|
||||||
|
|
||||||
|
class ApprovalError(ValueError):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class VerifiedDecision:
|
||||||
|
environment: str
|
||||||
|
app_id: str
|
||||||
|
actor_open_id: str
|
||||||
|
chat_id: str
|
||||||
|
card_message_id: str
|
||||||
|
approval_id: str
|
||||||
|
nonce: str
|
||||||
|
choice: str
|
||||||
|
event_id: str
|
||||||
|
event_digest: str
|
||||||
|
|
||||||
|
|
||||||
|
def _public_text(value,limit):
|
||||||
|
if not isinstance(value,str)or not value.strip()or len(value)>limit or any(ord(c)<32 and c!='\n'for c in value):
|
||||||
|
raise ApprovalError('invalid_approval_text')
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
class ApprovalStore:
|
||||||
|
def __init__(self,state,keyring,clock=time.time,enforce_execution_state=False):
|
||||||
|
self.state,self.db,self.keyring,self.clock=state,state.db,keyring,clock
|
||||||
|
self.enforce_execution_state=enforce_execution_state
|
||||||
|
self._sweep_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,
|
||||||
|
task_id TEXT NOT NULL,owner TEXT NOT NULL,host_id TEXT NOT NULL,
|
||||||
|
binding_generation BIGINT NOT NULL,operation_id TEXT NOT NULL,
|
||||||
|
operation_digest TEXT NOT NULL,nonce_digest TEXT NOT NULL,
|
||||||
|
key_id TEXT NOT NULL,ciphertext TEXT NOT NULL,card_message_id TEXT NOT NULL,
|
||||||
|
state TEXT NOT NULL,expires_at DOUBLE PRECISION NOT NULL,
|
||||||
|
updated_at DOUBLE PRECISION NOT NULL,
|
||||||
|
UNIQUE(environment,app_id,task_id,operation_id))''')
|
||||||
|
self.db.execute('''CREATE TABLE IF NOT EXISTS work_approval_callbacks_v1(
|
||||||
|
environment TEXT NOT NULL,app_id TEXT NOT NULL,event_id TEXT NOT NULL,
|
||||||
|
approval_id TEXT NOT NULL,event_digest TEXT NOT NULL,
|
||||||
|
received_at DOUBLE PRECISION NOT NULL,
|
||||||
|
PRIMARY KEY(environment,app_id,event_id))''')
|
||||||
|
self.db.execute('''CREATE TABLE IF NOT EXISTS work_approval_card_outbox_v1(
|
||||||
|
approval_id TEXT PRIMARY KEY,state TEXT NOT NULL,
|
||||||
|
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)''')
|
||||||
|
|
||||||
|
def _task(self,task_id,owner,host,generation):
|
||||||
|
if type(generation)is not int or generation<1:
|
||||||
|
raise ApprovalError('invalid_binding_generation')
|
||||||
|
task=self.state.task(task_id)
|
||||||
|
if (not self.state.task_current(task)or not task['chat_id']or not task['source_message_id']or
|
||||||
|
(task['owner'],task['host_id'],task['binding_generation'])!=(owner,host,generation)or
|
||||||
|
task['status']!='inflight'or self._execution_closed(task_id)):
|
||||||
|
raise ApprovalError('approval_task_unavailable')
|
||||||
|
return task
|
||||||
|
|
||||||
|
def _execution_closed(self,task_id):
|
||||||
|
if not self.enforce_execution_state:return False
|
||||||
|
row=self.db.execute('SELECT execution_state FROM work_execution_state_v3 WHERE task_id=?',(task_id,)).fetchone()
|
||||||
|
return bool(row and row['execution_state']in {'completed','failed','cancelled','interrupted','unknown'})
|
||||||
|
|
||||||
|
def _aad(self,row):
|
||||||
|
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')]])
|
||||||
|
|
||||||
|
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')
|
||||||
|
row=self.db.execute('SELECT * FROM work_approvals_v3 WHERE approval_id=? AND environment=? AND app_id=?',
|
||||||
|
(approval_id,self.state.environment,self.state.app_id)).fetchone()
|
||||||
|
if not row:raise ApprovalError('approval_not_found')
|
||||||
|
return dict(row)
|
||||||
|
|
||||||
|
def _expire(self,row):
|
||||||
|
if row['expires_at']<=self.clock()and row['state']in {'pending','approved'}:
|
||||||
|
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'])
|
||||||
|
return row
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _status(row):
|
||||||
|
return {k:row[k]for k in ('approval_id','state','expires_at','operation_digest')}
|
||||||
|
|
||||||
|
def create(self,task_id,owner,host,generation,operation_id,action,summary,impact,ttl=120):
|
||||||
|
if not isinstance(operation_id,str)or not re.fullmatch(r'[A-Za-z0-9_-]{8,100}',operation_id):
|
||||||
|
raise ApprovalError('invalid_operation_id')
|
||||||
|
if type(ttl)is not int or not 30<=ttl<=600:raise ApprovalError('invalid_approval_lifetime')
|
||||||
|
if not isinstance(action,dict)or not action:raise ApprovalError('invalid_operation')
|
||||||
|
encoded=json.dumps(action,sort_keys=True,ensure_ascii=True,separators=(',',':'),allow_nan=False).encode()
|
||||||
|
if len(encoded)>32000:raise ApprovalError('operation_budget_exceeded')
|
||||||
|
summary=_public_text(summary,200);impact=_public_text(impact,500)
|
||||||
|
digest=hashlib.sha256(encoded).hexdigest()
|
||||||
|
approval_id='apr_'+hashlib.sha256(canonical([self.state.environment,self.state.app_id,task_id,operation_id])).hexdigest()
|
||||||
|
with self.db:
|
||||||
|
self.state._owner_lock(owner)
|
||||||
|
task=self._task(task_id,owner,host,generation)
|
||||||
|
old=self.db.execute('SELECT * FROM work_approvals_v3 WHERE approval_id=?',(approval_id,)).fetchone()
|
||||||
|
if old:
|
||||||
|
row=self._expire(dict(old))
|
||||||
|
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)
|
||||||
|
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,
|
||||||
|
'operation_id':operation_id,'operation_digest':digest}
|
||||||
|
key,cipher=self.keyring.encrypt(canonical({'action':action,'summary':summary,'impact':impact,'nonce':nonce}),self._aad(row))
|
||||||
|
expires=min(self.clock()+ttl,task['deadline'])
|
||||||
|
if expires<=self.clock():raise ApprovalError('approval_task_expired')
|
||||||
|
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()))
|
||||||
|
return self._status(self._row(approval_id))
|
||||||
|
|
||||||
|
def card_material(self,approval_id):
|
||||||
|
"""Internal sender only: private task origin + fixed confirmation text."""
|
||||||
|
with self.db:
|
||||||
|
row=self._row(approval_id);self.state._owner_lock(row['owner']);row=self._expire(self._row(approval_id))
|
||||||
|
task=self._task(row['task_id'],row['owner'],row['host_id'],row['binding_generation'])
|
||||||
|
if row['state']!='pending':raise ApprovalError('approval_not_pending')
|
||||||
|
material=json.loads(self.keyring.decrypt(row['key_id'],row['ciphertext'],self._aad(row)))
|
||||||
|
return {'source_message_id':task['source_message_id'],'chat_id':task['chat_id'],
|
||||||
|
'approval_id':approval_id,'summary':material['summary'],'impact':material['impact'],
|
||||||
|
'nonce':material['nonce'],'expires_at':row['expires_at']}
|
||||||
|
|
||||||
|
def bind_card(self,approval_id,message_id):
|
||||||
|
if not isinstance(message_id,str)or not re.fullmatch(r'om_[A-Za-z0-9_-]{1,120}',message_id):
|
||||||
|
raise ApprovalError('invalid_card_receipt')
|
||||||
|
with self.db:
|
||||||
|
row=self._row(approval_id);self.state._owner_lock(row['owner']);row=self._expire(self._row(approval_id))
|
||||||
|
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))
|
||||||
|
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')
|
||||||
|
self.db.execute('UPDATE work_approvals_v3 SET card_message_id=?,updated_at=? WHERE approval_id=?',
|
||||||
|
(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))
|
||||||
|
|
||||||
|
def claim_card(self,approval_id):
|
||||||
|
"""Persist send intent before network I/O; lost receipt is not resendable."""
|
||||||
|
with self.db:
|
||||||
|
row=self._row(approval_id);self.state._owner_lock(row['owner']);row=self._expire(self._row(approval_id))
|
||||||
|
self._task(row['task_id'],row['owner'],row['host_id'],row['binding_generation'])
|
||||||
|
if row['state']!='pending':raise ApprovalError('approval_not_pending')
|
||||||
|
if row['card_message_id']:return False
|
||||||
|
previous=self.db.execute('SELECT state FROM work_approval_card_outbox_v1 WHERE approval_id=?',(approval_id,)).fetchone()
|
||||||
|
if previous:return False
|
||||||
|
self.db.execute("INSERT INTO work_approval_card_outbox_v1 VALUES(?,'sending',?)",(approval_id,self.clock()))
|
||||||
|
return True
|
||||||
|
|
||||||
|
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))
|
||||||
|
|
||||||
|
def close_unavailable(self,limit=100):
|
||||||
|
"""Future bounded maintenance: expiry or invalid task never grants consent."""
|
||||||
|
if type(limit)is not int or not 1<=limit<=100:raise ApprovalError('invalid_approval_budget')
|
||||||
|
rows=self.db.execute("SELECT approval_id FROM work_approvals_v3 WHERE environment=? AND app_id=? AND state IN ('pending','approved') AND approval_id>? ORDER BY approval_id LIMIT ?",
|
||||||
|
(self.state.environment,self.state.app_id,self._sweep_after,limit)).fetchall()
|
||||||
|
if not rows:self._sweep_after=''
|
||||||
|
closed=[];started=time.monotonic()
|
||||||
|
for candidate in rows:
|
||||||
|
if time.monotonic()-started>=.5:break
|
||||||
|
with self.db:
|
||||||
|
row=self._row(candidate['approval_id']);self.state._owner_lock(row['owner']);row=self._row(row['approval_id'])
|
||||||
|
if row['state']not in {'pending','approved'}:continue
|
||||||
|
task=self.state.task(row['task_id'])
|
||||||
|
expired=row['expires_at']<=self.clock()or bool(task and task['deadline']<=self.clock())
|
||||||
|
invalid=(not self.state.task_current(task)or task['status']!='inflight'or self._execution_closed(row['task_id'])or
|
||||||
|
(task['owner'],task['host_id'],task['binding_generation'])!=
|
||||||
|
(row['owner'],row['host_id'],row['binding_generation']))
|
||||||
|
if expired or invalid:
|
||||||
|
state='expired'if expired else'cancelled'
|
||||||
|
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._sweep_after=candidate['approval_id']
|
||||||
|
return closed
|
||||||
|
|
||||||
|
def closed_card_receipt(self,approval_id):
|
||||||
|
"""Internal renderer only. Never return action/nonce or imply execution success."""
|
||||||
|
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
|
||||||
|
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']}
|
||||||
|
|
||||||
|
def mark_card_closed(self,approval_id,state):
|
||||||
|
with self.db:
|
||||||
|
row=self._row(approval_id);self.state._owner_lock(row['owner']);row=self._row(approval_id)
|
||||||
|
if row['state']!=state or state not in {'rejected','expired','cancelled','consumed'}:
|
||||||
|
raise ApprovalError('approval_state_changed')
|
||||||
|
self.db.execute("UPDATE work_approval_card_outbox_v1 SET state='closed',updated_at=? WHERE approval_id=?",
|
||||||
|
(self.clock(),approval_id))
|
||||||
|
|
||||||
|
def cards_to_send(self):
|
||||||
|
rows=self.db.execute("""SELECT a.approval_id FROM work_approvals_v3 a
|
||||||
|
WHERE a.environment=? AND a.app_id=? AND a.state='pending' AND a.expires_at>?
|
||||||
|
AND a.card_message_id='' AND NOT EXISTS(SELECT 1 FROM work_approval_card_outbox_v1 o WHERE o.approval_id=a.approval_id)
|
||||||
|
ORDER BY a.updated_at LIMIT 5""",(self.state.environment,self.state.app_id,self.clock())).fetchall()
|
||||||
|
return [row['approval_id']for row in rows]
|
||||||
|
|
||||||
|
def cards_to_close(self):
|
||||||
|
rows=self.db.execute("""SELECT a.approval_id FROM work_approvals_v3 a
|
||||||
|
JOIN work_approval_card_outbox_v1 o ON o.approval_id=a.approval_id
|
||||||
|
WHERE a.environment=? AND a.app_id=? AND a.state IN ('rejected','expired','cancelled','consumed')
|
||||||
|
AND a.card_message_id<>'' AND o.state<>'closed' ORDER BY o.updated_at LIMIT 5""",
|
||||||
|
(self.state.environment,self.state.app_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')
|
||||||
|
if (not isinstance(decision.event_id,str)or not re.fullmatch(r'[A-Za-z0-9_-]{1,128}',decision.event_id)
|
||||||
|
or not isinstance(decision.event_digest,str)or not re.fullmatch(r'[a-f0-9]{64}',decision.event_digest)):
|
||||||
|
raise ApprovalError('invalid_callback_receipt')
|
||||||
|
fields={key:getattr(decision,key)for key in ('environment','app_id','actor_open_id',
|
||||||
|
'chat_id','card_message_id','approval_id','nonce','choice')}
|
||||||
|
if not hmac.compare_digest(hashlib.sha256(canonical(fields)).hexdigest(),decision.event_digest):
|
||||||
|
raise ApprovalError('callback_receipt_conflict')
|
||||||
|
with self.db:
|
||||||
|
row=self._row(decision.approval_id);self.state._owner_lock(row['owner']);row=self._expire(self._row(decision.approval_id))
|
||||||
|
task=self._task(row['task_id'],row['owner'],row['host_id'],row['binding_generation'])
|
||||||
|
if (decision.environment,decision.app_id,decision.actor_open_id,decision.chat_id,decision.card_message_id)!=\
|
||||||
|
(row['environment'],row['app_id'],row['owner'],task['chat_id'],row['card_message_id'])or not row['card_message_id']:
|
||||||
|
raise ApprovalError('callback_identity_conflict')
|
||||||
|
if not isinstance(decision.nonce,str)or len(decision.nonce)>128 or not hmac.compare_digest(hashlib.sha256(decision.nonce.encode()).hexdigest(),row['nonce_digest']):
|
||||||
|
raise ApprovalError('invalid_approval_nonce')
|
||||||
|
# Owner lock serializes duplicate clicks for this approval. Reused
|
||||||
|
# event IDs for a different approval also fail the database PK.
|
||||||
|
receipt=self.db.execute('SELECT approval_id,event_digest FROM work_approval_callbacks_v1 WHERE environment=? AND app_id=? AND event_id=?',
|
||||||
|
(row['environment'],row['app_id'],decision.event_id)).fetchone()
|
||||||
|
if receipt:
|
||||||
|
if (receipt['approval_id'],receipt['event_digest'])!=(row['approval_id'],decision.event_digest):
|
||||||
|
raise ApprovalError('callback_receipt_conflict')
|
||||||
|
return self._status(row)
|
||||||
|
target='approved'if decision.choice=='allow'else'rejected'
|
||||||
|
if row['state']not in {'pending',target}:raise ApprovalError('approval_already_closed')
|
||||||
|
self.db.execute('INSERT INTO work_approval_callbacks_v1 VALUES(?,?,?,?,?,?)',
|
||||||
|
(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']))
|
||||||
|
return self._status(self._row(row['approval_id']))
|
||||||
|
|
||||||
|
def status(self,approval_id,task_id,owner,host,generation,operation_digest):
|
||||||
|
"""Future device-authenticated polling endpoint; no nonce/action returned."""
|
||||||
|
with self.db:
|
||||||
|
self.state._owner_lock(owner);row=self._expire(self._row(approval_id))
|
||||||
|
self._task(task_id,owner,host,generation)
|
||||||
|
if (row['task_id'],row['owner'],row['host_id'],row['binding_generation'],row['operation_digest'])!=\
|
||||||
|
(task_id,owner,host,generation,operation_digest):raise ApprovalError('operation_identity_conflict')
|
||||||
|
return self._status(row)
|
||||||
|
|
||||||
|
def consume(self,approval_id,task_id,owner,host,generation,operation_digest):
|
||||||
|
with self.db:
|
||||||
|
self.state._owner_lock(owner)
|
||||||
|
row=self._expire(self._row(approval_id))
|
||||||
|
self._task(task_id,owner,host,generation)
|
||||||
|
if (row['task_id'],row['owner'],row['host_id'],row['binding_generation'],row['operation_digest'])!=(task_id,owner,host,generation,operation_digest):
|
||||||
|
raise ApprovalError('operation_identity_conflict')
|
||||||
|
if row['state']!='approved':return {**self._status(row),'execute':False}
|
||||||
|
material=json.loads(self.keyring.decrypt(row['key_id'],row['ciphertext'],self._aad(row)))
|
||||||
|
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}
|
||||||
|
return {**self._status(self._row(approval_id)),'execute':True,'action':material['action']}
|
||||||
|
|
||||||
|
def cancel(self,approval_id,task_id,owner,host,generation):
|
||||||
|
with self.db:
|
||||||
|
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))
|
||||||
|
return self._status(self._row(approval_id))
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
"""Single bounded approval worker with its own database connection."""
|
||||||
|
import asyncio
|
||||||
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
|
import time
|
||||||
|
|
||||||
|
from .approval_store import ApprovalError, ApprovalStore
|
||||||
|
|
||||||
|
|
||||||
|
class ApprovalWorker:
|
||||||
|
def __init__(self,settings,keyring):
|
||||||
|
self.settings,self.keyring,self.clock=settings,keyring,time.time
|
||||||
|
self.executor=ThreadPoolExecutor(max_workers=1,thread_name_prefix='work-approval')
|
||||||
|
self.slots=asyncio.Semaphore(8)
|
||||||
|
self.store=None
|
||||||
|
|
||||||
|
def _start(self):
|
||||||
|
from .store import Store
|
||||||
|
from .binding_state import BindingState
|
||||||
|
self.connection=Store(self.settings.data_dir/'metadata.sqlite',self.settings.database_url)
|
||||||
|
if self.settings.database_url:
|
||||||
|
self.connection.db.execute("SET lock_timeout TO '500ms'")
|
||||||
|
self.connection.db.execute("SET statement_timeout TO '800ms'")
|
||||||
|
else:self.connection.db.execute('PRAGMA busy_timeout=500')
|
||||||
|
self.store=ApprovalStore(BindingState(self.connection,self.settings.environment,
|
||||||
|
self.settings.feishu_app_id),self.keyring,enforce_execution_state=True)
|
||||||
|
|
||||||
|
async def start(self):
|
||||||
|
await asyncio.get_running_loop().run_in_executor(self.executor,self._start)
|
||||||
|
|
||||||
|
def _invoke(self,deadline,method,args):
|
||||||
|
if time.monotonic()>deadline or self.store is None:
|
||||||
|
raise ApprovalError('approval_temporarily_unavailable')
|
||||||
|
try:
|
||||||
|
# Postgres may reconnect after a lost connection. Reapply this
|
||||||
|
# worker's limits before opening a new approval transaction.
|
||||||
|
if self.settings.database_url:
|
||||||
|
db=self.connection.db
|
||||||
|
if db.conn.closed or db.conn.broken:
|
||||||
|
db.execute("SET lock_timeout TO '500ms'")
|
||||||
|
db.execute("SET statement_timeout TO '800ms'")
|
||||||
|
return getattr(self.store,method)(*args)
|
||||||
|
except ApprovalError:raise
|
||||||
|
except Exception:raise ApprovalError('approval_temporarily_unavailable')from None
|
||||||
|
|
||||||
|
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'}
|
||||||
|
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
|
||||||
|
future=asyncio.get_running_loop().run_in_executor(self.executor,self._invoke,
|
||||||
|
time.monotonic()+1.2,method,args)
|
||||||
|
# Keep the queue slot until the worker really stops, even when a caller
|
||||||
|
# times out. A timeout is not proof that a database commit did not occur.
|
||||||
|
def settled(completed):
|
||||||
|
self.slots.release()
|
||||||
|
if not completed.cancelled():completed.exception()
|
||||||
|
future.add_done_callback(settled)
|
||||||
|
try:return await asyncio.wait_for(asyncio.shield(future),timeout=1.5)
|
||||||
|
except asyncio.TimeoutError:raise ApprovalError('approval_result_unconfirmed')from None
|
||||||
|
|
||||||
|
async def close(self):
|
||||||
|
def finish():
|
||||||
|
if self.store is not None:self.connection.close()
|
||||||
|
self.store=None
|
||||||
|
try:await asyncio.get_running_loop().run_in_executor(self.executor,finish)
|
||||||
|
finally:self.executor.shutdown(wait=False,cancel_futures=True)
|
||||||
@@ -42,6 +42,8 @@ class Settings(BaseSettings):
|
|||||||
max_result: int = 16000
|
max_result: int = 16000
|
||||||
work_files_enabled: bool = False
|
work_files_enabled: bool = False
|
||||||
work_task_cards_enabled: bool = False
|
work_task_cards_enabled: bool = False
|
||||||
|
work_remote_approvals_enabled: bool = False
|
||||||
|
feishu_tenant_key: str = ''
|
||||||
work_file_max_bytes: int = 10*1024*1024
|
work_file_max_bytes: int = 10*1024*1024
|
||||||
work_file_batch_limit: int = 20
|
work_file_batch_limit: int = 20
|
||||||
work_file_retention: int = 86400
|
work_file_retention: int = 86400
|
||||||
@@ -57,6 +59,11 @@ class Settings(BaseSettings):
|
|||||||
|
|
||||||
@model_validator(mode="after")
|
@model_validator(mode="after")
|
||||||
def validate_runtime(self):
|
def validate_runtime(self):
|
||||||
|
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
|
||||||
|
or not re.fullmatch(r'[A-Za-z0-9_-]{1,128}',self.feishu_tenant_key)):
|
||||||
|
raise ValueError('remote approvals require broker, longconn and explicit callback identity')
|
||||||
if self.work_task_cards_enabled and self.credential_mode!='broker':raise ValueError('task cards require broker mode')
|
if self.work_task_cards_enabled and self.credential_mode!='broker':raise ValueError('task cards require broker mode')
|
||||||
if not 1024<=self.work_file_max_bytes<=100*1024*1024 or not 1<=self.work_file_batch_limit<=50 or not 300<=self.work_file_retention<=7*86400:
|
if not 1024<=self.work_file_max_bytes<=100*1024*1024 or not 1<=self.work_file_batch_limit<=50 or not 300<=self.work_file_retention<=7*86400:
|
||||||
raise ValueError('invalid work file deployment limits')
|
raise ValueError('invalid work file deployment limits')
|
||||||
|
|||||||
@@ -265,6 +265,8 @@ def create_app(settings=None, redis=None, platform=None):
|
|||||||
lifecycle = None
|
lifecycle = None
|
||||||
from .notifications import router as notification_router
|
from .notifications import router as notification_router
|
||||||
background = set()
|
background = set()
|
||||||
|
approvals = None
|
||||||
|
approval_worker = None
|
||||||
|
|
||||||
def spawn(coro):
|
def spawn(coro):
|
||||||
task = asyncio.create_task(coro)
|
task = asyncio.create_task(coro)
|
||||||
@@ -273,9 +275,16 @@ def create_app(settings=None, redis=None, platform=None):
|
|||||||
# Retrieve errors without displaying possibly sensitive exception text.
|
# Retrieve errors without displaying possibly sensitive exception text.
|
||||||
task.add_done_callback(lambda t: t.exception() if not t.cancelled() else None)
|
task.add_done_callback(lambda t: t.exception() if not t.cancelled() else None)
|
||||||
|
|
||||||
|
if s.work_remote_approvals_enabled:
|
||||||
|
from .approval_api import ApprovalAPI
|
||||||
|
from .approval_worker import ApprovalWorker
|
||||||
|
approval_worker=ApprovalWorker(s,credential_store.keyring)
|
||||||
|
approvals=ApprovalAPI(oauth,approval_worker,f,spawn)
|
||||||
|
|
||||||
@asynccontextmanager
|
@asynccontextmanager
|
||||||
async def lifespan(app):
|
async def lifespan(app):
|
||||||
await r.ping()
|
await r.ping()
|
||||||
|
if approval_worker:await approval_worker.start()
|
||||||
if lifecycle:
|
if lifecycle:
|
||||||
await lifecycle.maintain()
|
await lifecycle.maintain()
|
||||||
await deliveries.recover_interrupted_sends()
|
await deliveries.recover_interrupted_sends()
|
||||||
@@ -302,6 +311,7 @@ def create_app(settings=None, redis=None, platform=None):
|
|||||||
await deliveries.recover_interrupted_sends()
|
await deliveries.recover_interrupted_sends()
|
||||||
if broker.files:await broker.files.flush()
|
if broker.files:await broker.files.flush()
|
||||||
await deliveries.flush()
|
await deliveries.flush()
|
||||||
|
if approvals:await approvals.maintain()
|
||||||
except Exception:
|
except Exception:
|
||||||
# No credentials or raw exception text in background logs.
|
# No credentials or raw exception text in background logs.
|
||||||
pass
|
pass
|
||||||
@@ -323,14 +333,19 @@ def create_app(settings=None, redis=None, platform=None):
|
|||||||
await r.delete("hn:task-worker:"+broker.worker_id)
|
await r.delete("hn:task-worker:"+broker.worker_id)
|
||||||
await pub.aclose()
|
await pub.aclose()
|
||||||
await f.close()
|
await f.close()
|
||||||
|
if approval_worker:await approval_worker.close()
|
||||||
store.close()
|
store.close()
|
||||||
if redis is None:
|
if redis is None:
|
||||||
await r.aclose()
|
await r.aclose()
|
||||||
|
|
||||||
app = FastAPI(title="Hainuo B1 connector", lifespan=lifespan, docs_url=None, redoc_url=None)
|
app = FastAPI(title="Hainuo B1 connector", lifespan=lifespan, docs_url=None, redoc_url=None)
|
||||||
app.add_middleware(BodyLimitMiddleware, max_body=s.max_body,
|
app.add_middleware(BodyLimitMiddleware, max_body=s.max_body,
|
||||||
path_limits={'/work/v2/files/upload':s.work_file_max_bytes}if broker.files else {})
|
path_limits={**({'/work/v2/files/upload':s.work_file_max_bytes}if broker.files else {}),
|
||||||
|
**({'/internal/approval-callback':65536,'/work/v2/approvals/create':49152}if approvals else {})})
|
||||||
app.include_router(oauth.router)
|
app.include_router(oauth.router)
|
||||||
|
if approvals:
|
||||||
|
app.include_router(approvals.router)
|
||||||
|
app.state.approvals=approvals
|
||||||
if lifecycle:
|
if lifecycle:
|
||||||
app.include_router(deliveries.router)
|
app.include_router(deliveries.router)
|
||||||
app.state.deliveries=deliveries
|
app.state.deliveries=deliveries
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ class CredentialAPI:
|
|||||||
raise HTTPException(503, "credential_temporarily_unavailable") from None
|
raise HTTPException(503, "credential_temporarily_unavailable") from None
|
||||||
self.require_binding(body.host_id, device["owner"], device["binding_generation"])
|
self.require_binding(body.host_id, device["owner"], device["binding_generation"])
|
||||||
return no_cache(JSONResponse({"credential_mode": "broker", "protocol_version": 2,
|
return no_cache(JSONResponse({"credential_mode": "broker", "protocol_version": 2,
|
||||||
|
"approval_protocol": "work-approval-v1" if self.s.work_remote_approvals_enabled else None,
|
||||||
"binding_owner": device["owner"],
|
"binding_owner": device["owner"],
|
||||||
"binding_generation": device["binding_generation"],
|
"binding_generation": device["binding_generation"],
|
||||||
"permission_profiles": sorted(self.s.credential_permission_profiles), **result}))
|
"permission_profiles": sorted(self.s.credential_permission_profiles), **result}))
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
|
from concurrent.futures import ThreadPoolExecutor,TimeoutError as FutureTimeout
|
||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
import redis
|
import redis
|
||||||
@@ -51,7 +52,52 @@ def main():
|
|||||||
raise RuntimeError("connector did not accept event")
|
raise RuntimeError("connector did not accept event")
|
||||||
print(json.dumps({"event": "platform_event_accepted", "type": data.get("header", {}).get("event_type")}), flush=True)
|
print(json.dumps({"event": "platform_event_accepted", "type": data.get("header", {}).get("event_type")}), flush=True)
|
||||||
|
|
||||||
handler = lark.EventDispatcherHandler.builder("", "").register_p2_im_message_receive_v1(received).build()
|
builder = lark.EventDispatcherHandler.builder("", "").register_p2_im_message_receive_v1(received)
|
||||||
|
callback_pool=None
|
||||||
|
if s.work_remote_approvals_enabled:
|
||||||
|
from lark_oapi.event.callback.model.p2_card_action_trigger import P2CardActionTriggerResponse
|
||||||
|
callback_pool=ThreadPoolExecutor(max_workers=2,thread_name_prefix='work-card-callback')
|
||||||
|
callback_slots=threading.BoundedSemaphore(2)
|
||||||
|
def forward_card(raw):
|
||||||
|
deadline=time.monotonic()+2.1
|
||||||
|
# Own this client until the worker ends. The SDK response deadline
|
||||||
|
# does not imply an in-flight authenticated decision was rolled back.
|
||||||
|
with httpx.Client(base_url=url,trust_env=False,follow_redirects=False,
|
||||||
|
timeout=httpx.Timeout(.8,connect=.2,pool=.1))as callback_http:
|
||||||
|
with callback_http.stream('POST','/internal/approval-callback',content=raw,
|
||||||
|
headers={'X-Internal-Secret':s.internal_secret,'Content-Type':'application/json'})as response:
|
||||||
|
if response.status_code!=200:raise ValueError()
|
||||||
|
body=bytearray()
|
||||||
|
for chunk in response.iter_bytes():
|
||||||
|
body.extend(chunk)
|
||||||
|
if len(body)>4096 or time.monotonic()>deadline:raise ValueError()
|
||||||
|
return json.loads(body)
|
||||||
|
def decision(event):
|
||||||
|
# Same authenticated SDK connection/lease, no second consumer.
|
||||||
|
# Never log callback bodies or the card-update credential.
|
||||||
|
fallback={'toast':{'type':'warning','content':'确认结果待核对,请查看原任务状态。'}}
|
||||||
|
try:
|
||||||
|
raw=lark.JSON.marshal(event).encode('utf-8')
|
||||||
|
if len(raw)>65536:return P2CardActionTriggerResponse(fallback)
|
||||||
|
if not callback_slots.acquire(blocking=False):return P2CardActionTriggerResponse(fallback)
|
||||||
|
try:future=callback_pool.submit(forward_card,raw)
|
||||||
|
except BaseException:
|
||||||
|
callback_slots.release()
|
||||||
|
raise
|
||||||
|
def settled(completed):
|
||||||
|
callback_slots.release()
|
||||||
|
if not completed.cancelled():completed.exception()
|
||||||
|
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})
|
||||||
|
except Exception:return P2CardActionTriggerResponse(fallback)
|
||||||
|
builder=builder.register_p2_card_action_trigger(decision)
|
||||||
|
handler=builder.build()
|
||||||
class ObservableClient(lark.ws.Client):
|
class ObservableClient(lark.ws.Client):
|
||||||
async def _connect(self):
|
async def _connect(self):
|
||||||
try:
|
try:
|
||||||
@@ -69,6 +115,7 @@ def main():
|
|||||||
finally:
|
finally:
|
||||||
done.set()
|
done.set()
|
||||||
client.close()
|
client.close()
|
||||||
|
if callback_pool:callback_pool.shutdown(wait=False,cancel_futures=True)
|
||||||
try:
|
try:
|
||||||
lease.release()
|
lease.release()
|
||||||
except redis.exceptions.LockError:
|
except redis.exceptions.LockError:
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ DELIVERY={None:'尚未接收结果','ready':'已接收结果,等待投递','se
|
|||||||
'replied':'结果已发送到当前会话','unknown':'结果投递待核对','discarded':'结果已停止交付'}
|
'replied':'结果已发送到当前会话','unknown':'结果投递待核对','discarded':'结果已停止交付'}
|
||||||
|
|
||||||
|
|
||||||
def card_content(task_id,execution,delivery,files=None,connection_lost=False):
|
def card_content(task_id,execution,delivery,files=None,connection_lost=False,remote_approvals=False):
|
||||||
execution=execution if execution in EXECUTION else 'unknown'
|
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'
|
color='green' if execution=='completed' else 'red' if execution in {'failed','interrupted'} else 'orange' if execution in {'waiting_for_approval','unknown'} else 'blue'
|
||||||
label=EXECUTION[execution]
|
label=EXECUTION[execution]
|
||||||
@@ -20,7 +20,9 @@ def card_content(task_id,execution,delivery,files=None,connection_lost=False):
|
|||||||
{'tag':'div','text':{'tag':'plain_text','content':'文字回复:'+DELIVERY.get(delivery,'状态待核对')}},
|
{'tag':'div','text':{'tag':'plain_text','content':'文字回复:'+DELIVERY.get(delivery,'状态待核对')}},
|
||||||
{'tag':'note','elements':[{'tag':'plain_text','content':'任务编号:'+task_id}]}]
|
{'tag':'note','elements':[{'tag':'plain_text','content':'任务编号:'+task_id}]}]
|
||||||
if execution=='waiting_for_approval':
|
if execution=='waiting_for_approval':
|
||||||
elements.insert(1,{'tag':'div','text':{'tag':'plain_text','content':'请在客户端查看并确认具体操作。本卡片暂不提供远程批准。'}})
|
hint=('请在本任务的操作确认卡片中核对动作和影响,选择允许本次或拒绝。'if remote_approvals else
|
||||||
|
'请在客户端查看并确认具体操作。本卡片暂不提供远程批准。')
|
||||||
|
elements.insert(1,{'tag':'div','text':{'tag':'plain_text','content':hint}})
|
||||||
if execution=='completed' and delivery!='replied':
|
if execution=='completed' and delivery!='replied':
|
||||||
elements.insert(1,{'tag':'div','text':{'tag':'plain_text','content':'任务已执行完成,结果交付请看下方状态。'}})
|
elements.insert(1,{'tag':'div','text':{'tag':'plain_text','content':'任务已执行完成,结果交付请看下方状态。'}})
|
||||||
return {'config':{'wide_screen_mode':True,'enable_forward':False},
|
return {'config':{'wide_screen_mode':True,'enable_forward':False},
|
||||||
@@ -28,9 +30,10 @@ def card_content(task_id,execution,delivery,files=None,connection_lost=False):
|
|||||||
|
|
||||||
|
|
||||||
class TaskCards:
|
class TaskCards:
|
||||||
def __init__(self,state,platform,worker_id,clock=time.time,files_enabled=False):
|
def __init__(self,state,platform,worker_id,clock=time.time,files_enabled=False,remote_approvals=False):
|
||||||
self.state,self.db,self.platform,self.worker_id,self.clock=state,state.db,platform,worker_id,clock
|
self.state,self.db,self.platform,self.worker_id,self.clock=state,state.db,platform,worker_id,clock
|
||||||
self.files_enabled=files_enabled
|
self.files_enabled=files_enabled
|
||||||
|
self.remote_approvals=remote_approvals
|
||||||
with self.db:
|
with self.db:
|
||||||
self.db.execute('''CREATE TABLE IF NOT EXISTS work_task_connection_v3(
|
self.db.execute('''CREATE TABLE IF NOT EXISTS work_task_connection_v3(
|
||||||
task_id TEXT PRIMARY KEY,reason TEXT NOT NULL)''')
|
task_id TEXT PRIMARY KEY,reason TEXT NOT NULL)''')
|
||||||
@@ -57,7 +60,8 @@ class TaskCards:
|
|||||||
if task['status']=='unknown' and execution not in {'completed','failed','cancelled','interrupted'}:execution='unknown'
|
if task['status']=='unknown' and execution not in {'completed','failed','cancelled','interrupted'}:execution='unknown'
|
||||||
if task['deadline']<=self.clock() and execution not in {'completed','failed','cancelled','interrupted'}:execution='unknown'
|
if task['deadline']<=self.clock() and execution not in {'completed','failed','cancelled','interrupted'}:execution='unknown'
|
||||||
lost=self.db.execute('SELECT reason FROM work_task_connection_v3 WHERE task_id=?',(task['turn_id'],)).fetchone()
|
lost=self.db.execute('SELECT reason FROM work_task_connection_v3 WHERE task_id=?',(task['turn_id'],)).fetchone()
|
||||||
return card_content(task['turn_id'],execution,delivery['status'] if delivery else None,connection_lost=bool(lost))
|
return card_content(task['turn_id'],execution,delivery['status'] if delivery else None,
|
||||||
|
connection_lost=bool(lost),remote_approvals=self.remote_approvals)
|
||||||
|
|
||||||
async def flush(self):
|
async def flush(self):
|
||||||
# Bound one maintenance pass; business result delivery remains independent.
|
# Bound one maintenance pass; business result delivery remains independent.
|
||||||
|
|||||||
@@ -43,7 +43,8 @@ class TaskDelivery:
|
|||||||
self.cards=None
|
self.cards=None
|
||||||
if auth.s.work_task_cards_enabled:
|
if auth.s.work_task_cards_enabled:
|
||||||
from .task_cards import TaskCards
|
from .task_cards import TaskCards
|
||||||
self.cards=TaskCards(state,platform,broker.worker_id,files_enabled=auth.s.work_files_enabled)
|
self.cards=TaskCards(state,platform,broker.worker_id,files_enabled=auth.s.work_files_enabled,
|
||||||
|
remote_approvals=auth.s.work_remote_approvals_enabled)
|
||||||
broker.task_cards=self.cards
|
broker.task_cards=self.cards
|
||||||
|
|
||||||
def current(self, body):
|
def current(self, body):
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Prepare a private callback identity file without printing the token."""
|
||||||
|
import argparse
|
||||||
|
import getpass
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser=argparse.ArgumentParser()
|
||||||
|
parser.add_argument('--output',required=True)
|
||||||
|
parser.add_argument('--container',default='hainuo-relay-connector-1')
|
||||||
|
args=parser.parse_args();path=Path(args.output)
|
||||||
|
if not path.is_absolute()or path.exists()or path.is_symlink():
|
||||||
|
raise ValueError('output must be a new absolute file')
|
||||||
|
# Keep existing fields in process; never print docker Env or token values.
|
||||||
|
result=subprocess.run(['docker','inspect',args.container,'--format','{{json .Config.Env}}'],
|
||||||
|
stdout=subprocess.PIPE,stderr=subprocess.PIPE,universal_newlines=True)
|
||||||
|
if result.returncode:raise ValueError('cannot inspect current connector')
|
||||||
|
env=dict(item.split('=',1)for item in json.loads(result.stdout)if '='in item)
|
||||||
|
tenant=env.get('HN_FEISHU_TENANT_KEY')or input('请输入本测试应用所属租户 tenant_key(不是 App ID):').strip()
|
||||||
|
token=env.get('HN_FEISHU_VERIFICATION_TOKEN')or getpass.getpass('请输入应用“事件与回调”中的 Verification Token(输入不显示):')
|
||||||
|
if (not re.fullmatch(r'[A-Za-z0-9_-]{1,128}',tenant)or not 8<=len(token)<=512
|
||||||
|
or any(ord(c)<33 or ord(c)>126 for c in token)):
|
||||||
|
raise ValueError('invalid callback identity; no values displayed')
|
||||||
|
fd=os.open(str(path),os.O_WRONLY|os.O_CREAT|os.O_EXCL,0o600)
|
||||||
|
with os.fdopen(fd,'w',encoding='utf-8')as stream:
|
||||||
|
json.dump({'tenant_key':tenant,'verification_token':token},stream)
|
||||||
|
stream.write('\n')
|
||||||
|
print('Callback identity prepared privately; no services changed. Token must match the platform application.')
|
||||||
|
|
||||||
|
|
||||||
|
if __name__=='__main__':
|
||||||
|
try:main()
|
||||||
|
except (ValueError,OSError,EOFError,KeyboardInterrupt):
|
||||||
|
raise SystemExit('STOP: callback identity preparation incomplete; values withheld')from None
|
||||||
@@ -180,14 +180,33 @@ def router_public_key(config):
|
|||||||
raise DeployError('router connector public key is not a verified read-only trust mount')
|
raise DeployError('router connector public key is not a verified read-only trust mount')
|
||||||
|
|
||||||
|
|
||||||
def validate_overlay(base, merged, candidate, router_key_required=True):
|
def targets(plan):
|
||||||
|
return ('connector','router','longconn')if plan.get('remote_approvals_managed')else('connector','router')
|
||||||
|
|
||||||
|
|
||||||
|
def target_tag(plan,name):
|
||||||
|
return plan['longconn_candidate_image']if name=='longconn'else plan['candidate_image']
|
||||||
|
|
||||||
|
|
||||||
|
def receipt_file(root,name):
|
||||||
|
return root/('candidate-longconn.json'if name=='longconn'else'candidate.json')
|
||||||
|
|
||||||
|
|
||||||
|
def validate_overlay(base, merged, candidate, router_key_required=True, approval_plan=None):
|
||||||
old, new = base["services"], merged["services"]
|
old, new = base["services"], merged["services"]
|
||||||
require_services(old)
|
require_services(old)
|
||||||
require_services(new)
|
require_services(new)
|
||||||
for name in set(old)-{"connector","router"}:
|
managed=targets(approval_plan or {})
|
||||||
|
for name in set(old)-set(managed):
|
||||||
if old[name] != new[name]:
|
if old[name] != new[name]:
|
||||||
raise DeployError("overlay changes an unrelated relay service: "+name)
|
raise DeployError("overlay changes an unrelated relay service: "+name)
|
||||||
for name in ("connector","router"):
|
for name in managed:
|
||||||
|
if name=='longconn':
|
||||||
|
expected_env=dict(old[name].get('environment',{}))
|
||||||
|
expected_env.update((approval_plan or {})['longconn_approval_environment'])
|
||||||
|
expected=dict(old[name]);expected.update(image=approval_plan['longconn_candidate_image'],environment=expected_env)
|
||||||
|
if new[name]!=expected:raise DeployError('approval overlay changes unrelated longconn settings')
|
||||||
|
continue
|
||||||
for field in set(old[name]) | set(new[name]):
|
for field in set(old[name]) | set(new[name]):
|
||||||
if field not in {"environment","image","volumes"} and old[name].get(field) != new[name].get(field):
|
if field not in {"environment","image","volumes"} and old[name].get(field) != new[name].get(field):
|
||||||
raise DeployError("overlay changes non-migration service settings")
|
raise DeployError("overlay changes non-migration service settings")
|
||||||
@@ -196,7 +215,7 @@ def validate_overlay(base, merged, candidate, router_key_required=True):
|
|||||||
env = new[name]["environment"]
|
env = new[name]["environment"]
|
||||||
for key, value in old[name].get("environment", {}).items():
|
for key, value in old[name].get("environment", {}).items():
|
||||||
if key not in {"HN_CREDENTIAL_MODE","HN_ROUTER_ADMISSION_SECRET","HN_CREDENTIAL_KEYRING_FILE",
|
if key not in {"HN_CREDENTIAL_MODE","HN_ROUTER_ADMISSION_SECRET","HN_CREDENTIAL_KEYRING_FILE",
|
||||||
"HN_CREDENTIAL_PERMISSION_PROFILES","HN_CONNECTOR_INTERNAL_URL","HN_FEISHU_APP_ID","HN_OAUTH_ENABLED","HN_WORK_FILES_ENABLED","HN_WORK_TASK_CARDS_ENABLED"}:
|
"HN_CREDENTIAL_PERMISSION_PROFILES","HN_CONNECTOR_INTERNAL_URL","HN_FEISHU_APP_ID","HN_OAUTH_ENABLED","HN_WORK_FILES_ENABLED","HN_WORK_TASK_CARDS_ENABLED","HN_WORK_REMOTE_APPROVALS_ENABLED","HN_FEISHU_TENANT_KEY","HN_FEISHU_VERIFICATION_TOKEN"}:
|
||||||
if env.get(key) != value:
|
if env.get(key) != value:
|
||||||
raise DeployError("existing environment changed: "+key)
|
raise DeployError("existing environment changed: "+key)
|
||||||
old_volumes = {v["target"]:v for v in old[name].get("volumes", [])}
|
old_volumes = {v["target"]:v for v in old[name].get("volumes", [])}
|
||||||
@@ -219,6 +238,14 @@ def validate_overlay(base, merged, candidate, router_key_required=True):
|
|||||||
# namespace rather than silently converting it to production. All modes still
|
# namespace rather than silently converting it to production. All modes still
|
||||||
# require PostgreSQL and HTTPS/WSS for this existing-server migration.
|
# require PostgreSQL and HTTPS/WSS for this existing-server migration.
|
||||||
require_platform(env)
|
require_platform(env)
|
||||||
|
approval_keys={'HN_WORK_REMOTE_APPROVALS_ENABLED','HN_FEISHU_TENANT_KEY','HN_FEISHU_VERIFICATION_TOKEN'}
|
||||||
|
for name in ('connector','router'):
|
||||||
|
before=old[name].get('environment',{});after=new[name]['environment']
|
||||||
|
if name=='connector'and approval_plan and approval_plan.get('remote_approvals_managed'):
|
||||||
|
wanted=approval_plan['connector_approval_environment']
|
||||||
|
if any(after.get(k)!=v for k,v in wanted.items()):raise DeployError('approval identity mismatch')
|
||||||
|
elif any(after.get(k)!=before.get(k)for k in approval_keys):
|
||||||
|
raise DeployError('unreviewed approval environment change')
|
||||||
for key in ("HN_ADMIN_SECRET","HN_INTERNAL_SECRET","HN_FEISHU_APP_SECRET"):
|
for key in ("HN_ADMIN_SECRET","HN_INTERNAL_SECRET","HN_FEISHU_APP_SECRET"):
|
||||||
if env["HN_ROUTER_ADMISSION_SECRET"] == env.get(key):
|
if env["HN_ROUTER_ADMISSION_SECRET"] == env.get(key):
|
||||||
raise DeployError("router admission credential must be independent")
|
raise DeployError("router admission credential must be independent")
|
||||||
@@ -377,6 +404,31 @@ def prepare_update(args):
|
|||||||
raise DeployError('work files implementation missing from update source')
|
raise DeployError('work files implementation missing from update source')
|
||||||
if getattr(args,'enable_task_cards',False)and not (source/'relay/task_cards.py').is_file():
|
if getattr(args,'enable_task_cards',False)and not (source/'relay/task_cards.py').is_file():
|
||||||
raise DeployError('task cards implementation missing from update source')
|
raise DeployError('task cards implementation missing from update source')
|
||||||
|
enable_approvals=bool(getattr(args,'enable_remote_approvals',False))
|
||||||
|
if parent.get('remote_approvals_managed')and not enable_approvals:
|
||||||
|
raise DeployError('approval parent requires explicit --enable-remote-approvals and callback identity on each update')
|
||||||
|
approval_identity=None
|
||||||
|
if enable_approvals:
|
||||||
|
if any(not (source/'relay'/name).is_file()for name in ('approval_api.py','approval_worker.py','approval_callback.py')):
|
||||||
|
raise DeployError('remote approval implementation missing')
|
||||||
|
identity_path=Path(args.callback_identity)
|
||||||
|
if identity_path.is_symlink()or not identity_path.is_file()or identity_path.stat().st_size>8192:
|
||||||
|
raise DeployError('invalid private callback identity file')
|
||||||
|
if os.name!='nt'and identity_path.stat().st_mode&0o077:
|
||||||
|
raise DeployError('callback identity file must be private (chmod 600)')
|
||||||
|
approval_identity=json.loads(identity_path.read_text(encoding='utf-8'))
|
||||||
|
if (not isinstance(approval_identity,dict)or set(approval_identity)!={'tenant_key','verification_token'}
|
||||||
|
or not isinstance(approval_identity['tenant_key'],str)
|
||||||
|
or not re.fullmatch(r'[A-Za-z0-9_-]{1,128}',approval_identity['tenant_key'])
|
||||||
|
or not isinstance(approval_identity['verification_token'],str)
|
||||||
|
or not 8<=len(approval_identity['verification_token'])<=512
|
||||||
|
or any(ord(c)<33 or ord(c)>126 for c in approval_identity['verification_token'])):
|
||||||
|
raise DeployError('invalid callback identity fields; values withheld')
|
||||||
|
live=run(compose(parent,root/'compose.broker.json')+['config','--format','json'],True)
|
||||||
|
a=live['services']['connector']['environment'];b=live['services']['longconn']['environment']
|
||||||
|
if (a.get('HN_FEISHU_APP_ID')!=b.get('HN_FEISHU_APP_ID')or a.get('HN_INTERNAL_SECRET')!=b.get('HN_INTERNAL_SECRET')
|
||||||
|
or b.get('HN_FEISHU_EVENT_SOURCE')!='longconn'):
|
||||||
|
raise DeployError('existing unique longconn does not match connector identity')
|
||||||
output=output.resolve()
|
output=output.resolve()
|
||||||
output.mkdir(mode=0o700)
|
output.mkdir(mode=0o700)
|
||||||
os.chmod(output,0o700)
|
os.chmod(output,0o700)
|
||||||
@@ -394,6 +446,26 @@ def prepare_update(args):
|
|||||||
if mount['target']=='/run/hainuo-credentials/keyring.json':
|
if mount['target']=='/run/hainuo-credentials/keyring.json':
|
||||||
mount['source']=str(output/'credential-keyring.json')
|
mount['source']=str(output/'credential-keyring.json')
|
||||||
rollback=json.loads(json.dumps(overlay))
|
rollback=json.loads(json.dumps(overlay))
|
||||||
|
if enable_approvals:
|
||||||
|
plan['remote_approvals_managed']=True
|
||||||
|
plan['longconn_candidate_image']='hainuo-relay:approval-longconn-'+plan_id
|
||||||
|
# Keep separate runtime ancestry: the connector image may lack lark-oapi.
|
||||||
|
plan['longconn_base_image']=roles['longconn']['image']
|
||||||
|
shared={'HN_WORK_REMOTE_APPROVALS_ENABLED':'true',
|
||||||
|
'HN_FEISHU_TENANT_KEY':approval_identity['tenant_key'],
|
||||||
|
'HN_FEISHU_VERIFICATION_TOKEN':approval_identity['verification_token']}
|
||||||
|
plan['connector_approval_environment']=shared
|
||||||
|
plan['longconn_approval_environment']={**shared,'HN_CREDENTIAL_MODE':'broker'}
|
||||||
|
overlay['services']['connector']['environment'].update(shared)
|
||||||
|
overlay['services']['connector']['environment']['HN_WORK_TASK_CARDS_ENABLED']='true'
|
||||||
|
plan['work_task_cards_enabled']=True
|
||||||
|
original_long=live['services']['longconn']
|
||||||
|
overlay['services']['longconn']={'image':plan['longconn_candidate_image'],
|
||||||
|
'environment':plan['longconn_approval_environment']}
|
||||||
|
defaults={'HN_WORK_REMOTE_APPROVALS_ENABLED':'false','HN_CREDENTIAL_MODE':'legacy',
|
||||||
|
'HN_FEISHU_TENANT_KEY':'','HN_FEISHU_VERIFICATION_TOKEN':''}
|
||||||
|
rollback['services']['longconn']={'image':roles['longconn']['image'],
|
||||||
|
'environment':{k:original_long.get('environment',{}).get(k,defaults[k])for k in plan['longconn_approval_environment']}}
|
||||||
if getattr(args,'enable_work_files',False):
|
if getattr(args,'enable_work_files',False):
|
||||||
overlay['services']['connector']['environment']['HN_WORK_FILES_ENABLED']='true'
|
overlay['services']['connector']['environment']['HN_WORK_FILES_ENABLED']='true'
|
||||||
plan['work_files_enabled']=True
|
plan['work_files_enabled']=True
|
||||||
@@ -474,14 +546,24 @@ def deployment_state(root,plan):
|
|||||||
state = entry.get("state",{})
|
state = entry.get("state",{})
|
||||||
status = state.get("status") if state.get("status") in {'created','running','paused','restarting','removing','exited','dead'} else 'unknown'
|
status = state.get("status") if state.get("status") in {'created','running','paused','restarting','removing','exited','dead'} else 'unknown'
|
||||||
health = state.get("health") if state.get("health") in {'none','starting','healthy','unhealthy'} else 'unknown'
|
health = state.get("health") if state.get("health") in {'none','starting','healthy','unhealthy'} else 'unknown'
|
||||||
image = 'candidate' if expected and entry['image']==expected else (
|
role_expected=expected
|
||||||
|
if name=='longconn'and plan.get('remote_approvals_managed')and receipt_file(root,name).is_file():
|
||||||
|
role_expected=json.loads(receipt_file(root,name).read_text(encoding='utf-8')).get('image')
|
||||||
|
image = 'candidate' if role_expected and entry['image']==role_expected else (
|
||||||
'original' if entry['image']==plan['roles'][name]['image'] else 'different')
|
'original' if entry['image']==plan['roles'][name]['image'] else 'different')
|
||||||
numbers = {k:v for k,v in state.items() if k in {'exit_code','restart_count'} and type(v) is int}
|
numbers = {k:v for k,v in state.items() if k in {'exit_code','restart_count'} and type(v) is int}
|
||||||
print(name+': image='+image+' status='+status+' health='+health+' '+json.dumps(numbers,sort_keys=True))
|
print(name+': image='+image+' status='+status+' health='+health+' '+json.dumps(numbers,sort_keys=True))
|
||||||
if name in {'connector','router'}:
|
if name in targets(plan):
|
||||||
raw = run(['docker','logs','--tail','100',entry['id']],optional=True)
|
raw = run(['docker','logs','--tail','100',entry['id']],optional=True)
|
||||||
if raw is not None:
|
if raw is not None:
|
||||||
print(' startup signals: '+(', '.join(log_signals(raw)) or 'no recognized error class; raw logs withheld'))
|
print(' startup signals: '+(', '.join(log_signals(raw)) or 'no recognized error class; raw logs withheld'))
|
||||||
|
if name=='longconn':
|
||||||
|
observed=False
|
||||||
|
for line in raw.splitlines():
|
||||||
|
try:record=json.loads(line)
|
||||||
|
except ValueError:continue
|
||||||
|
if isinstance(record,dict)and record.get('event')=='platform_connected':observed=True
|
||||||
|
print(' platform_connected observed: '+('yes'if observed else'not yet; inspect again after startup'))
|
||||||
print('STATE inspection only; no files, keys or containers changed. Healthy candidate services need no reactivation; inspect mixed/unhealthy states before further actions.')
|
print('STATE inspection only; no files, keys or containers changed. Healthy candidate services need no reactivation; inspect mixed/unhealthy states before further actions.')
|
||||||
|
|
||||||
|
|
||||||
@@ -504,18 +586,19 @@ def check(root, plan, baseline=True, router_key_required=True):
|
|||||||
if digest(root/path) != expected:
|
if digest(root/path) != expected:
|
||||||
raise DeployError("prepared keyring or overlay changed; do not regenerate credential keys")
|
raise DeployError("prepared keyring or overlay changed; do not regenerate credential keys")
|
||||||
for name, old in plan["roles"].items():
|
for name, old in plan["roles"].items():
|
||||||
current = service(plan["project"],name,include_stopped=not baseline and name in {"connector","router"})
|
current = service(plan["project"],name,include_stopped=not baseline and name in targets(plan))
|
||||||
if (baseline or name not in {"connector","router"}) and current["image"] != old["image"]:
|
if (baseline or name not in targets(plan)) and current["image"] != old["image"]:
|
||||||
raise DeployError("running service image changed since preparation: "+name+"; this plan may already be activated. Run state; do not rebuild or reactivate a healthy candidate")
|
raise DeployError("running service image changed since preparation: "+name+"; this plan may already be activated. Run state; do not rebuild or reactivate a healthy candidate")
|
||||||
if not baseline and name in {"connector","router"}:
|
if not baseline and name in targets(plan):
|
||||||
allowed = {old['image']}
|
allowed = {old['image']}
|
||||||
if (root/'candidate.json').is_file():
|
receipt=receipt_file(root,name)
|
||||||
allowed.add(json.loads((root/'candidate.json').read_text(encoding='utf-8'))['image'])
|
if receipt.is_file():
|
||||||
|
allowed.add(json.loads(receipt.read_text(encoding='utf-8'))['image'])
|
||||||
if current['image'] not in allowed:
|
if current['image'] not in allowed:
|
||||||
raise DeployError('unreviewed target image; selected parent plan does not match running '+name+'; use the latest successfully activated plan for a new update. No services changed')
|
raise DeployError('unreviewed target image; selected parent plan does not match running '+name+'; use the latest successfully activated plan for a new update. No services changed')
|
||||||
base = run(compose(plan)+["config","--format","json"],True)
|
base = run(compose(plan)+["config","--format","json"],True)
|
||||||
merged = run(compose(plan,root/"compose.broker.json")+["config","--format","json"],True)
|
merged = run(compose(plan,root/"compose.broker.json")+["config","--format","json"],True)
|
||||||
validate_overlay(base,merged,plan["candidate_image"],router_key_required=router_key_required)
|
validate_overlay(base,merged,plan["candidate_image"],router_key_required=router_key_required,approval_plan=plan)
|
||||||
# Require the current edge's explicit private-path block, before catch-all handling.
|
# Require the current edge's explicit private-path block, before catch-all handling.
|
||||||
mounts = base["services"]["edge"].get("volumes",[])
|
mounts = base["services"]["edge"].get("volumes",[])
|
||||||
caddy = next((v["source"] for v in mounts if v.get("target") == "/etc/caddy/Caddyfile" and v.get("type") == "bind"),None)
|
caddy = next((v["source"] for v in mounts if v.get("target") == "/etc/caddy/Caddyfile" and v.get("type") == "bind"),None)
|
||||||
@@ -541,8 +624,17 @@ def build(root,plan):
|
|||||||
image = run(["docker","image","inspect",plan["candidate_image"],"--format","{{.Id}}"])
|
image = run(["docker","image","inspect",plan["candidate_image"],"--format","{{.Id}}"])
|
||||||
run(["docker","run","--rm","--network","none","--read-only","--entrypoint","python",
|
run(["docker","run","--rm","--network","none","--read-only","--entrypoint","python",
|
||||||
plan["candidate_image"],"-c","import relay.credential_api, relay.binding_state, relay.device_lifecycle"])
|
plan["candidate_image"],"-c","import relay.credential_api, relay.binding_state, relay.device_lifecycle"])
|
||||||
|
long_image=None
|
||||||
|
if plan.get('remote_approvals_managed'):
|
||||||
|
tag=plan['longconn_candidate_image']
|
||||||
|
if run(['docker','image','inspect',tag],optional=True)is not None:
|
||||||
|
raise DeployError('longconn candidate already exists; do not overwrite')
|
||||||
|
run(['docker','build','--pull=false','--network','none','--build-arg',
|
||||||
|
'BASE_IMAGE='+plan['longconn_base_image'],'-t',tag,str(root/'build')])
|
||||||
|
long_image=run(['docker','image','inspect',tag,'--format','{{.Id}}'])
|
||||||
runtime_check(root,plan)
|
runtime_check(root,plan)
|
||||||
write_json(root/"candidate.json",{"image":image,"tag":plan["candidate_image"]})
|
write_json(root/"candidate.json",{"image":image,"tag":plan["candidate_image"]})
|
||||||
|
if long_image:write_json(root/'candidate-longconn.json',{'image':long_image,'tag':plan['longconn_candidate_image']})
|
||||||
print("BUILT: "+plan["candidate_image"]+" (offline runtime reuse; not activated)")
|
print("BUILT: "+plan["candidate_image"]+" (offline runtime reuse; not activated)")
|
||||||
|
|
||||||
|
|
||||||
@@ -558,12 +650,17 @@ def runtime_check(root,plan):
|
|||||||
" s=Settings(role=data['role'])\n"
|
" s=Settings(role=data['role'])\n"
|
||||||
" if data['role']=='connector': CredentialKeyring.from_file(s.credential_keyring_file)\n"
|
" if data['role']=='connector': CredentialKeyring.from_file(s.credential_keyring_file)\n"
|
||||||
" if data['role']=='router': load_public(s.connector_public_key)\n"
|
" if data['role']=='router': load_public(s.connector_public_key)\n"
|
||||||
|
" if data['role']=='connector' and s.work_remote_approvals_enabled: import relay.approval_api, relay.approval_worker\n"
|
||||||
|
" if data['role']=='longconn':\n"
|
||||||
|
" import lark_oapi as lark\n"
|
||||||
|
" from lark_oapi.event.callback.model.p2_card_action_trigger import P2CardActionTriggerResponse\n"
|
||||||
|
" lark.EventDispatcherHandler.builder('','').register_p2_card_action_trigger(lambda e:P2CardActionTriggerResponse({})).build()\n"
|
||||||
"except Exception:\n sys.exit(1)\n")
|
"except Exception:\n sys.exit(1)\n")
|
||||||
for role in ("connector","router"):
|
for role in targets(plan):
|
||||||
env = {key:str(value) for key,value in merged["services"][role]["environment"].items() if value is not None}
|
env = {key:str(value) for key,value in merged["services"][role]["environment"].items() if value is not None}
|
||||||
command=["docker","run","--rm","-i","--network","none","--read-only","--entrypoint","python",
|
command=["docker","run","--rm","-i","--network","none","--read-only","--entrypoint","python",
|
||||||
"-v",str(root/"credential-keyring.json")+":/run/hainuo-credentials/keyring.json:ro",
|
"-v",str(root/"credential-keyring.json")+":/run/hainuo-credentials/keyring.json:ro",
|
||||||
"-v",str(public_source)+":"+public_key+":ro",plan["candidate_image"],"-c",code]
|
"-v",str(public_source)+":"+public_key+":ro",target_tag(plan,role),"-c",code]
|
||||||
print('Runtime check: '+role+' configuration and required key files',flush=True)
|
print('Runtime check: '+role+' configuration and required key files',flush=True)
|
||||||
run(command,input_text=json.dumps({"role":role,"environment":env}))
|
run(command,input_text=json.dumps({"role":role,"environment":env}))
|
||||||
|
|
||||||
@@ -614,12 +711,17 @@ def activate(root,plan,ready):
|
|||||||
image = run(["docker","image","inspect",plan["candidate_image"],"--format","{{.Id}}"])
|
image = run(["docker","image","inspect",plan["candidate_image"],"--format","{{.Id}}"])
|
||||||
if built != {"image":image,"tag":plan["candidate_image"]}:
|
if built != {"image":image,"tag":plan["candidate_image"]}:
|
||||||
raise DeployError("candidate image identity changed")
|
raise DeployError("candidate image identity changed")
|
||||||
|
if plan.get('remote_approvals_managed'):
|
||||||
|
tag=plan['longconn_candidate_image']
|
||||||
|
saved=json.loads((root/'candidate-longconn.json').read_text(encoding='utf-8'))
|
||||||
|
actual=run(['docker','image','inspect',tag,'--format','{{.Id}}'])
|
||||||
|
if saved!={'image':actual,'tag':tag}:raise DeployError('longconn candidate image identity changed')
|
||||||
print('ACTIVATION step: isolated candidate configuration/keyring check (no service switch)',flush=True)
|
print('ACTIVATION step: isolated candidate configuration/keyring check (no service switch)',flush=True)
|
||||||
runtime_check(root,plan)
|
runtime_check(root,plan)
|
||||||
print('ACTIVATION step: recreate connector/router; failures may leave a partial switch, inspect state',flush=True)
|
print('ACTIVATION step: recreate '+','.join(targets(plan))+'; failures may leave a partial switch, inspect state',flush=True)
|
||||||
run(compose(plan,root/"compose.broker.json")+["up","-d","--no-deps","--no-build","--pull","never",
|
run(compose(plan,root/"compose.broker.json")+["up","-d","--no-deps","--no-build","--pull","never",
|
||||||
"--wait","--wait-timeout","180","connector","router"])
|
"--wait","--wait-timeout","180",*targets(plan)])
|
||||||
print("ACTIVATED: connector/router only. Verify real OAuth, v2 client, unbind and task routing.")
|
print('ACTIVATED: '+','.join(targets(plan))+' only. Verify real platform connection and task routing.')
|
||||||
|
|
||||||
|
|
||||||
def container_permission_profiles(container):
|
def container_permission_profiles(container):
|
||||||
@@ -720,6 +822,8 @@ def main():
|
|||||||
update.add_argument("--output",required=True)
|
update.add_argument("--output",required=True)
|
||||||
update.add_argument('--enable-work-files',action='store_true',help='Opt in after paired-client preparation; rollback retains the previous flag.')
|
update.add_argument('--enable-work-files',action='store_true',help='Opt in after paired-client preparation; rollback retains the previous flag.')
|
||||||
update.add_argument('--enable-task-cards',action='store_true',help='Opt in to paired-client status cards; rollback retains the previous flag.')
|
update.add_argument('--enable-task-cards',action='store_true',help='Opt in to paired-client status cards; rollback retains the previous flag.')
|
||||||
|
update.add_argument('--enable-remote-approvals',action='store_true',help='Update the existing longconn too; needs private callback identity file.')
|
||||||
|
update.add_argument('--callback-identity',help='Private JSON file with tenant_key and verification_token; never paste values into command arguments.')
|
||||||
permissions=sub.add_parser('update-permissions')
|
permissions=sub.add_parser('update-permissions')
|
||||||
permissions.add_argument('--plan',required=True)
|
permissions.add_argument('--plan',required=True)
|
||||||
permissions.add_argument('--profiles',required=True)
|
permissions.add_argument('--profiles',required=True)
|
||||||
@@ -764,7 +868,7 @@ def main():
|
|||||||
raise DeployError("rollback requires stopping broker clients; old refresh credentials are not restored")
|
raise DeployError("rollback requires stopping broker clients; old refresh credentials are not restored")
|
||||||
check(root,plan,baseline=False,router_key_required=False)
|
check(root,plan,baseline=False,router_key_required=False)
|
||||||
run(compose(plan,root/"compose.rollback.json")+["up","-d","--no-deps","--no-build","--pull","never",
|
run(compose(plan,root/"compose.rollback.json")+["up","-d","--no-deps","--no-build","--pull","never",
|
||||||
"--wait","--wait-timeout","180","connector","router"])
|
"--wait","--wait-timeout","180",*targets(plan)])
|
||||||
print("ROLLED BACK containers only; preserve keyring/database. Client mode and reauthorization must be coordinated.")
|
print("ROLLED BACK containers only; preserve keyring/database. Client mode and reauthorization must be coordinated.")
|
||||||
except (DeployError,OSError,ValueError,KeyError,TypeError):
|
except (DeployError,OSError,ValueError,KeyError,TypeError):
|
||||||
error = sys.exc_info()[1]
|
error = sys.exc_info()[1]
|
||||||
|
|||||||
@@ -0,0 +1,350 @@
|
|||||||
|
"""Two-repo offline approval integration: real proofs/SQL, synthetic platform only."""
|
||||||
|
import asyncio
|
||||||
|
import importlib
|
||||||
|
import importlib.util
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
import secrets
|
||||||
|
import sys
|
||||||
|
import threading
|
||||||
|
import time
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
import pytest
|
||||||
|
import pytest_asyncio
|
||||||
|
|
||||||
|
from test_credential_api import env,wire,authorize,Platform
|
||||||
|
from relay.connector import create_app
|
||||||
|
from relay.crypto import pem_private
|
||||||
|
from relay.approval_store import ApprovalStore
|
||||||
|
from relay.store import Store
|
||||||
|
from relay.binding_state import BindingState
|
||||||
|
from relay.approval_worker import ApprovalWorker
|
||||||
|
|
||||||
|
|
||||||
|
PC_SERVICE=Path(os.environ.get('HAINUO_APPROVAL_PC_SOURCE',str(
|
||||||
|
Path(__file__).resolve().parents[3]/'hainuo-build-phase-A-local-20261116')))/'integrations/work-relay/service/relay'
|
||||||
|
if not (PC_SERVICE/'approval_transport.py').is_file():
|
||||||
|
pytest.skip('paired PC source missing; set HAINUO_APPROVAL_PC_SOURCE to run joint acceptance',allow_module_level=True)
|
||||||
|
# An explicit checkout selection keeps imports independent of cwd and installed
|
||||||
|
# runtime. Missing paired sources are reported as skipped, never a joint pass.
|
||||||
|
spec=importlib.util.spec_from_file_location('approval_pc',PC_SERVICE/'__init__.py',
|
||||||
|
submodule_search_locations=[str(PC_SERVICE)])
|
||||||
|
pc=importlib.util.module_from_spec(spec);sys.modules['approval_pc']=pc;spec.loader.exec_module(pc)
|
||||||
|
pc_broker=importlib.import_module('approval_pc.broker_client')
|
||||||
|
pc_gate=importlib.import_module('approval_pc.approval_transport')
|
||||||
|
pc_config=importlib.import_module('approval_pc.release_config')
|
||||||
|
pc_context=importlib.import_module('approval_pc.task_context')
|
||||||
|
pc_errors=importlib.import_module('approval_pc.work_errors')
|
||||||
|
|
||||||
|
|
||||||
|
class CardPlatform(Platform):
|
||||||
|
def __init__(self):
|
||||||
|
super().__init__();self.cards=[];self.updates=[];self.lose_card_receipt=False
|
||||||
|
|
||||||
|
async def reply_task_card(self,source,card,delivery_id,*,token):
|
||||||
|
self.cards.append((source,card,delivery_id))
|
||||||
|
if self.lose_card_receipt:raise ConnectionError('synthetic lost card receipt')
|
||||||
|
return 'om_approval_'+str(len(self.cards))
|
||||||
|
|
||||||
|
async def update_task_card(self,message_id,card,*,token):
|
||||||
|
self.updates.append((message_id,card))
|
||||||
|
|
||||||
|
|
||||||
|
@pytest_asyncio.fixture
|
||||||
|
async def approval_env(env):
|
||||||
|
settings=env['settings'].model_copy(update=dict(work_remote_approvals_enabled=True,
|
||||||
|
feishu_tenant_key='tenant_synthetic',feishu_verification_token='verification-synthetic'))
|
||||||
|
platform=CardPlatform();app=create_app(settings,env['redis'],platform)
|
||||||
|
async with app.router.lifespan_context(app):
|
||||||
|
async with httpx.AsyncClient(transport=httpx.ASGITransport(app),base_url=settings.public_url)as client:
|
||||||
|
current={**env,'settings':settings,'platform':platform,'app':app,'client':client,
|
||||||
|
'store':app.state.store,'api':app.state.oauth}
|
||||||
|
await authorize(current)
|
||||||
|
yield current
|
||||||
|
|
||||||
|
|
||||||
|
@pytest_asyncio.fixture
|
||||||
|
async def pair(approval_env,tmp_path,monkeypatch):
|
||||||
|
e=approval_env;directory=tmp_path/'pc';directory.mkdir()
|
||||||
|
host='a'*32;device=e['store'].device(host)
|
||||||
|
(directory/'server.pem').write_bytes(e['settings'].ca_cert.read_bytes())
|
||||||
|
(directory/'device.key').write_bytes(pem_private(e['keys'][host]))
|
||||||
|
(directory/'device.json').write_text(json.dumps({'host_id':host,'owner':'ou_a',
|
||||||
|
'binding_generation':device['binding_generation']}))
|
||||||
|
release=pc_config.validate_config(dict(public_url=e['settings'].public_url,credential_mode='broker',
|
||||||
|
app_id='cli_test',environment='test',permission_profile='product-v1',
|
||||||
|
work_api_base='https://work.example.test',remote_approvals=True))
|
||||||
|
monkeypatch.setattr(pc_config,'load_config',lambda:release)
|
||||||
|
monkeypatch.setattr(pc_broker,'load_config',lambda:release)
|
||||||
|
loop=asyncio.get_running_loop();faults=set();calls=[];trace=[];stop=threading.Event()
|
||||||
|
def forward(request):
|
||||||
|
async def dispatch():
|
||||||
|
response=await e['client'].request(request.method,request.url.path,
|
||||||
|
headers=dict(request.headers),content=request.content)
|
||||||
|
return httpx.Response(response.status_code,headers=response.headers,content=response.content,request=request)
|
||||||
|
response=asyncio.run_coroutine_threadsafe(dispatch(),loop).result(timeout=10)
|
||||||
|
trace.append((request.url.path,response.status_code))
|
||||||
|
if request.url.path.endswith('/consume')and 'consume_receipt_lost'in faults:
|
||||||
|
raise httpx.ReadTimeout('synthetic lost consume response')
|
||||||
|
if request.url.path.endswith('/status')and '/approvals/'in request.url.path and 'poll_lost'in faults:
|
||||||
|
raise httpx.ConnectError('synthetic offline')
|
||||||
|
return response
|
||||||
|
transport=httpx.MockTransport(forward)
|
||||||
|
actual_transport=pc_gate.ApprovalTransport
|
||||||
|
monkeypatch.setattr(pc_gate,'ApprovalTransport',lambda d,r:actual_transport(d,r,http_transport=transport))
|
||||||
|
def platform(request):
|
||||||
|
assert request.url.host=='work.example.test'
|
||||||
|
assert request.headers['authorization'].startswith('Bearer fake-access')
|
||||||
|
calls.append(request)
|
||||||
|
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'],
|
||||||
|
'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')}
|
||||||
|
context.update(task_id=task['turn_id'],channel='work-dm')
|
||||||
|
marker=pc_context.CURRENT_TASK.set(context);control=pc_context.CURRENT_TASK_STOP.set(stop.is_set)
|
||||||
|
jobs=[]
|
||||||
|
def launch(operation='operation-synthetic'):
|
||||||
|
nonlocal loop
|
||||||
|
loop=asyncio.get_running_loop()
|
||||||
|
job=asyncio.create_task(asyncio.to_thread(client.api,'POST',
|
||||||
|
'/open-apis/calendar/v4/calendars/cal_synthetic/events',{},
|
||||||
|
{'summary':'合成测试:不创建真实日程'},operation))
|
||||||
|
jobs.append(job);return job
|
||||||
|
async def card(bound=True):
|
||||||
|
deadline=time.monotonic()+10
|
||||||
|
while time.monotonic()<deadline:
|
||||||
|
for job in jobs:
|
||||||
|
if job.done():raise AssertionError(('task settled before card',job.result()))
|
||||||
|
rows=e['store'].db.execute('SELECT * FROM work_approvals_v3').fetchall()
|
||||||
|
if rows and e['platform'].cards and (not bound or rows[0]['card_message_id']):return dict(rows[0])
|
||||||
|
await asyncio.sleep(.01)
|
||||||
|
raise AssertionError(('synthetic approval card was not delivered/bound',trace,
|
||||||
|
[(r['state'],bool(r['card_message_id']))for r in rows],len(e['platform'].cards)))
|
||||||
|
async def click(choice='allow',actor='ou_a',event_id=None,mutate=None):
|
||||||
|
row=await card();value=e['platform'].cards[0][1]['elements'][-1]['actions'][0]['value']
|
||||||
|
body={'schema':'2.0','header':{'event_type':'card.action.trigger','app_id':'cli_test',
|
||||||
|
'tenant_key':'tenant_synthetic','token':'verification-synthetic',
|
||||||
|
'create_time':str(int(time.time()*1000000)),'event_id':event_id or secrets.token_hex(16)},
|
||||||
|
'event':{'host':'im_message','operator':{'open_id':actor,'tenant_key':'tenant_synthetic'},
|
||||||
|
'context':{'open_message_id':row['card_message_id'],'open_chat_id':'oc_synthetic'},
|
||||||
|
'action':{'tag':'button','value':{**value,'choice':choice}}}}
|
||||||
|
if mutate:mutate(body)
|
||||||
|
response=await e['client'].post('/internal/approval-callback',json=body,
|
||||||
|
headers={'X-Internal-Secret':e['settings'].internal_secret})
|
||||||
|
return response,body
|
||||||
|
try:yield dict(env=e,client=client,directory=directory,context=context,stop=stop,faults=faults,
|
||||||
|
calls=calls,launch=launch,card=card,click=click,transport=transport,platform=platform)
|
||||||
|
finally:
|
||||||
|
stop.set()
|
||||||
|
if jobs:await asyncio.wait_for(asyncio.gather(*jobs,return_exceptions=True),timeout=15)
|
||||||
|
pc_context.CURRENT_TASK_STOP.reset(control);pc_context.CURRENT_TASK.reset(marker)
|
||||||
|
client.close()
|
||||||
|
|
||||||
|
|
||||||
|
async def test_allow_callback_replay_and_local_repeat_execute_once(pair):
|
||||||
|
p=pair;job=p['launch']();row=await p['card']()
|
||||||
|
assert not p['calls'] and pc_gate.approval_pending(p['context'])
|
||||||
|
response,body=await p['click']();assert response.status_code==200
|
||||||
|
result=await asyncio.wait_for(job,10)
|
||||||
|
assert result['status']=='completed'and len(p['calls'])==1
|
||||||
|
replay=await p['env']['client'].post('/internal/approval-callback',json=body,
|
||||||
|
headers={'X-Internal-Secret':p['env']['settings'].internal_secret})
|
||||||
|
assert replay.status_code==200
|
||||||
|
duplicate=await p['launch']()
|
||||||
|
assert duplicate['status']=='duplicate'and len(p['calls'])==1
|
||||||
|
assert not pc_gate.approval_pending(p['context'])
|
||||||
|
|
||||||
|
|
||||||
|
async def test_deny_never_sends_or_reprompts_same_operation(pair):
|
||||||
|
p=pair;job=p['launch']();await p['click']('deny')
|
||||||
|
with pytest.raises(pc_errors.WorkError,match='拒绝'):await asyncio.wait_for(job,10)
|
||||||
|
assert not p['calls']
|
||||||
|
assert (await p['launch']())['previous_status']=='not_executed'
|
||||||
|
assert len(p['env']['platform'].cards)==1
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('fault',['consume_receipt_lost','poll_lost','business_receipt_lost'])
|
||||||
|
async def test_ambiguous_response_never_replays_after_reopen(pair,fault):
|
||||||
|
p=pair;p['faults'].add(fault);job=p['launch']();await p['click']()
|
||||||
|
if fault=='business_receipt_lost':
|
||||||
|
assert (await asyncio.wait_for(job,10))['status']=='unknown'
|
||||||
|
else:
|
||||||
|
with pytest.raises(pc_errors.WorkError):await asyncio.wait_for(job,10)
|
||||||
|
expected=1 if fault=='business_receipt_lost'else 0
|
||||||
|
assert len(p['calls'])==expected
|
||||||
|
reopened=pc_broker.BrokerWorkClient(p['directory'],transport=p['transport'],
|
||||||
|
api_transport=httpx.MockTransport(p['platform']))
|
||||||
|
try:
|
||||||
|
result=await asyncio.to_thread(reopened.api,'POST',
|
||||||
|
'/open-apis/calendar/v4/calendars/cal_synthetic/events',{},
|
||||||
|
{'summary':'合成测试:不创建真实日程'},'operation-synthetic')
|
||||||
|
assert result['status']=='duplicate'and len(p['calls'])==expected
|
||||||
|
finally:reopened.close()
|
||||||
|
if fault=='consume_receipt_lost':
|
||||||
|
e=p['env'];connection=Store(e['settings'].data_dir/'metadata.sqlite')
|
||||||
|
try:
|
||||||
|
restored=ApprovalStore(BindingState(connection,'test','cli_test'),e['api'].broker.store.keyring)
|
||||||
|
row=connection.db.execute('SELECT state FROM work_approvals_v3').fetchone()
|
||||||
|
assert row['state']=='consumed'
|
||||||
|
finally:connection.close()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('failure',['stop','rebind','terminal','expired'])
|
||||||
|
async def test_stop_binding_terminal_and_expiry_do_not_execute(pair,failure):
|
||||||
|
p=pair;job=p['launch']();row=await p['card']();e=p['env']
|
||||||
|
if failure=='stop':p['stop'].set()
|
||||||
|
elif failure=='rebind':
|
||||||
|
value=json.loads((p['directory']/'device.json').read_text());value['binding_generation']+=1
|
||||||
|
(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()))
|
||||||
|
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']()
|
||||||
|
try:
|
||||||
|
result=await asyncio.wait_for(job,10)
|
||||||
|
assert result['status']!='completed'
|
||||||
|
except pc_errors.WorkError:pass
|
||||||
|
assert not p['calls']
|
||||||
|
|
||||||
|
|
||||||
|
async def test_other_operator_cannot_approve_but_owner_can(pair):
|
||||||
|
p=pair;job=p['launch']();response,_=await p['click'](actor='ou_b')
|
||||||
|
assert response.json()['toast']['type']=='warning'and not p['calls']
|
||||||
|
assert p['env']['store'].db.execute('SELECT state FROM work_approvals_v3').fetchone()['state']=='pending'
|
||||||
|
await p['click']();assert (await asyncio.wait_for(job,10))['status']=='completed'
|
||||||
|
assert len(p['calls'])==1
|
||||||
|
|
||||||
|
|
||||||
|
async def test_card_send_receipt_loss_never_sends_second_card(pair):
|
||||||
|
p=pair;p['env']['platform'].lose_card_receipt=True;job=p['launch']();await p['card'](bound=False)
|
||||||
|
deadline=time.monotonic()+5
|
||||||
|
while time.monotonic()<deadline:
|
||||||
|
row=p['env']['store'].db.execute('SELECT state FROM work_approval_card_outbox_v1').fetchone()
|
||||||
|
if row and row['state']=='unknown':break
|
||||||
|
await asyncio.sleep(.01)
|
||||||
|
assert row['state']=='unknown'
|
||||||
|
await p['env']['app'].state.approvals.maintain()
|
||||||
|
await p['env']['app'].state.approvals.maintain()
|
||||||
|
assert len(p['env']['platform'].cards)==1
|
||||||
|
p['stop'].set()
|
||||||
|
with pytest.raises(pc_errors.WorkError):await asyncio.wait_for(job,10)
|
||||||
|
assert not p['calls']
|
||||||
|
|
||||||
|
|
||||||
|
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'])
|
||||||
|
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
|
||||||
|
assert (await e['client'].post(path,json=signed)).status_code==409
|
||||||
|
other=await e['client'].post(path,json=wire(e,path,**{**fields,'task_id':'other-task'}))
|
||||||
|
assert other.status_code==409 and not p['calls']
|
||||||
|
p['stop'].set()
|
||||||
|
with pytest.raises(pc_errors.WorkError):await asyncio.wait_for(job,10)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('field',['app','tenant','token','timestamp','chat','card','nonce','value_identity'])
|
||||||
|
async def test_forged_callback_cannot_approve(pair,field):
|
||||||
|
p=pair;job=p['launch']();await p['card']()
|
||||||
|
def mutate(body):
|
||||||
|
if field=='app':body['header']['app_id']='another-app'
|
||||||
|
elif field=='tenant':body['header']['tenant_key']='another-tenant'
|
||||||
|
elif field=='token':body['header']['token']='wrong-verification'
|
||||||
|
elif field=='timestamp':body['header']['create_time']='1'
|
||||||
|
elif field=='chat':body['event']['context']['open_chat_id']='oc_other'
|
||||||
|
elif field=='card':body['event']['context']['open_message_id']='om_other'
|
||||||
|
elif field=='nonce':body['event']['action']['value']['nonce']='A'*43
|
||||||
|
else:body['event']['action']['value']['actor_open_id']='ou_a'
|
||||||
|
response,_=await p['click'](mutate=mutate)
|
||||||
|
assert response.json()['toast']['type']=='warning'
|
||||||
|
assert p['env']['store'].db.execute('SELECT state FROM work_approvals_v3').fetchone()['state']=='pending'
|
||||||
|
assert not p['calls']
|
||||||
|
p['stop'].set()
|
||||||
|
with pytest.raises(pc_errors.WorkError):await asyncio.wait_for(job,10)
|
||||||
|
|
||||||
|
|
||||||
|
async def test_conflicting_clicks_and_concurrent_consume_grant_at_most_once(pair):
|
||||||
|
p=pair;job=p['launch']();row=await p['card']()
|
||||||
|
# Prevent PC consumption while testing two consumers of the same grant.
|
||||||
|
response,_=await p['click']('allow')
|
||||||
|
conflict,_=await p['click']('deny')
|
||||||
|
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'])
|
||||||
|
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)
|
||||||
|
except pc_errors.WorkError:result=None
|
||||||
|
assert len(p['calls'])<=1
|
||||||
|
assert sum(r.json().get('execute')is True for r in responses)+len(p['calls'])==1
|
||||||
|
|
||||||
|
|
||||||
|
async def test_expiry_removes_buttons_and_update_receipt_loss_is_retryable(pair,monkeypatch):
|
||||||
|
p=pair;job=p['launch']();row=await p['card']();e=p['env']
|
||||||
|
with e['store'].db:e['store'].db.execute('UPDATE work_approvals_v3 SET expires_at=0')
|
||||||
|
await e['app'].state.approvals.worker.call('close_unavailable')
|
||||||
|
sender=e['app'].state.approvals.sender;original=e['platform'].update_task_card
|
||||||
|
attempts=[]
|
||||||
|
async def lost_once(*args,**kwargs):
|
||||||
|
await original(*args,**kwargs);attempts.append(1)
|
||||||
|
if len(attempts)==1:raise ConnectionError('synthetic update receipt loss')
|
||||||
|
monkeypatch.setattr(e['platform'],'update_task_card',lost_once)
|
||||||
|
with pytest.raises(ConnectionError):await sender.update_closed(row['approval_id'])
|
||||||
|
assert await sender.update_closed(row['approval_id'])=={'state':'updated'}
|
||||||
|
assert await sender.update_closed(row['approval_id'])=={'state':'no_closed_card'}
|
||||||
|
assert len(e['platform'].cards)==1 and len(attempts)==2
|
||||||
|
assert all('"button"'not in json.dumps(card)for _,card in e['platform'].updates)
|
||||||
|
with pytest.raises(pc_errors.WorkError):await asyncio.wait_for(job,10)
|
||||||
|
assert not p['calls']
|
||||||
|
|
||||||
|
|
||||||
|
async def test_reviewed_read_bypasses_confirmation(pair):
|
||||||
|
p=pair
|
||||||
|
result=await asyncio.to_thread(p['client'].api,'GET','/open-apis/calendar/v4/calendars')
|
||||||
|
assert result['status']=='completed'and len(p['calls'])==1
|
||||||
|
assert not p['env']['platform'].cards
|
||||||
|
assert not p['env']['store'].db.execute('SELECT * FROM work_approvals_v3').fetchall()
|
||||||
|
|
||||||
|
|
||||||
|
async def test_default_off_does_not_register_approval_or_callback_routes(env):
|
||||||
|
status=await env['client'].post('/work/v2/status',json=wire(env,'/work/v2/status'))
|
||||||
|
assert status.status_code==200 and status.json()['approval_protocol']is None
|
||||||
|
for path in ('/work/v2/approvals/create','/internal/approval-callback'):
|
||||||
|
assert (await env['client'].post(path,json={})).status_code==404
|
||||||
|
assert not env['store'].db.execute("SELECT name FROM sqlite_master WHERE name='work_approvals_v3'").fetchall()
|
||||||
|
|
||||||
|
|
||||||
|
async def test_approval_worker_recreation_preserves_original_pending_card(pair):
|
||||||
|
p=pair;job=p['launch']();row=await p['card']();e=p['env']
|
||||||
|
api=e['app'].state.approvals;original=api.worker
|
||||||
|
restored=ApprovalWorker(e['settings'],e['api'].broker.store.keyring)
|
||||||
|
await restored.start()
|
||||||
|
api.worker=restored;api.sender.approvals=restored
|
||||||
|
try:
|
||||||
|
await api.maintain()
|
||||||
|
assert len(e['platform'].cards)==1
|
||||||
|
response,_=await p['click']()
|
||||||
|
assert response.json()['toast']['type']=='info'
|
||||||
|
assert (await asyncio.wait_for(job,10))['status']=='completed'
|
||||||
|
assert len(p['calls'])==1
|
||||||
|
saved=e['store'].db.execute('SELECT approval_id,state,card_message_id FROM work_approvals_v3').fetchone()
|
||||||
|
assert (saved['approval_id'],saved['state'],saved['card_message_id'])==(
|
||||||
|
row['approval_id'],'consumed',row['card_message_id'])
|
||||||
|
finally:
|
||||||
|
# Drain only this adapter's tracked card work before closing its
|
||||||
|
# connection. App lifespan still owns the original worker shutdown.
|
||||||
|
deadline=time.monotonic()+5
|
||||||
|
while time.monotonic()<deadline:
|
||||||
|
if not api.scheduled:break
|
||||||
|
await asyncio.sleep(.01)
|
||||||
|
api.worker=original;api.sender.approvals=original
|
||||||
|
await restored.close()
|
||||||
@@ -672,3 +672,90 @@ def test_prepare_update_cards_are_opt_in_and_rollback_keeps_parent_environment(s
|
|||||||
assert current['services']['connector']['environment']['HN_WORK_TASK_CARDS_ENABLED']=='true'
|
assert current['services']['connector']['environment']['HN_WORK_TASK_CARDS_ENABLED']=='true'
|
||||||
assert rollback['services']['connector']['environment']==old['services']['connector']['environment']
|
assert rollback['services']['connector']['environment']==old['services']['connector']['environment']
|
||||||
assert (output/'credential-keyring.json').read_bytes()==(root/'credential-keyring.json').read_bytes()
|
assert (output/'credential-keyring.json').read_bytes()==(root/'credential-keyring.json').read_bytes()
|
||||||
|
|
||||||
|
|
||||||
|
def approval_update(scenario,**changes):
|
||||||
|
parent=prepared(scenario);root=scenario['output'];image='sha256:'+'a'*64
|
||||||
|
for name in ('connector','router'):scenario['roles'][name]['image']=image
|
||||||
|
deploy.write_json(root/'candidate.json',{'image':image,'tag':parent['candidate_image']})
|
||||||
|
env=scenario['base']['services']['connector']['environment']
|
||||||
|
scenario['base']['services']['longconn']['environment'].update(
|
||||||
|
HN_FEISHU_APP_ID=env['HN_FEISHU_APP_ID'],HN_INTERNAL_SECRET=env['HN_INTERNAL_SECRET'],HN_FEISHU_EVENT_SOURCE='longconn')
|
||||||
|
identity=root.parent/'callback-private.json'
|
||||||
|
identity.write_text(json.dumps({'tenant_key':'tenant_test','verification_token':'synthetic-verify-token'}))
|
||||||
|
identity.chmod(0o600)
|
||||||
|
args=argparse.Namespace(plan=str(root),source_root=str(ROOT),output=str(root.parent/'approvals'),
|
||||||
|
enable_remote_approvals=True,callback_identity=str(identity))
|
||||||
|
for key,value in changes.items():setattr(args,key,value)
|
||||||
|
return args
|
||||||
|
|
||||||
|
|
||||||
|
def test_approval_update_preserves_runtime_ancestry_and_original_longconn_rollback(scenario):
|
||||||
|
args=approval_update(scenario);deploy.prepare_update(args)
|
||||||
|
root=Path(args.output);plan=deploy.load_plan(root)
|
||||||
|
candidate=json.loads((root/'compose.broker.json').read_text());rollback=json.loads((root/'compose.rollback.json').read_text())
|
||||||
|
assert deploy.targets(plan)==('connector','router','longconn')
|
||||||
|
assert plan['longconn_base_image']==scenario['roles']['longconn']['image']
|
||||||
|
assert candidate['services']['longconn']['image']!=candidate['services']['connector']['image']
|
||||||
|
assert candidate['services']['longconn']['environment']['HN_CREDENTIAL_MODE']=='broker'
|
||||||
|
assert rollback['services']['longconn']['image']==scenario['roles']['longconn']['image']
|
||||||
|
assert rollback['services']['longconn']['environment']['HN_CREDENTIAL_MODE']=='legacy'
|
||||||
|
assert rollback['services']['longconn']['environment']['HN_WORK_REMOTE_APPROVALS_ENABLED']=='false'
|
||||||
|
assert (root/'credential-keyring.json').read_bytes()==(Path(args.plan)/'credential-keyring.json').read_bytes()
|
||||||
|
|
||||||
|
|
||||||
|
def test_approval_runtime_checks_three_roles_and_sdk_without_network(scenario):
|
||||||
|
args=approval_update(scenario);deploy.prepare_update(args);root=Path(args.output);plan=deploy.load_plan(root)
|
||||||
|
scenario['calls'].clear();deploy.runtime_check(root,plan)
|
||||||
|
probes=[c for c in scenario['calls']if c[:2]==['docker','run']]
|
||||||
|
assert len(probes)==3
|
||||||
|
assert all('--network'in c and c[c.index('--network')+1]=='none'for c in probes)
|
||||||
|
assert any(plan['longconn_candidate_image']in c and 'register_p2_card_action_trigger'in c[-1]for c in probes)
|
||||||
|
assert not any('synthetic-verify-token'in part for c in probes for part in c)
|
||||||
|
|
||||||
|
|
||||||
|
def test_approval_activation_targets_original_three_services_only(scenario):
|
||||||
|
args=approval_update(scenario);deploy.prepare_update(args);root=Path(args.output);plan=deploy.load_plan(root)
|
||||||
|
image='sha256:'+'a'*64
|
||||||
|
deploy.write_json(root/'candidate.json',{'image':image,'tag':plan['candidate_image']})
|
||||||
|
deploy.write_json(root/'candidate-longconn.json',{'image':image,'tag':plan['longconn_candidate_image']})
|
||||||
|
scenario['calls'].clear();deploy.activate(root,plan,True)
|
||||||
|
up=[c for c in scenario['calls']if 'up'in c]
|
||||||
|
assert len(up)==1 and up[0][-3:]==['connector','router','longconn']
|
||||||
|
assert '--no-deps'in up[0]and '--pull'in up[0]
|
||||||
|
|
||||||
|
|
||||||
|
def test_approval_overlay_rejects_longconn_command_or_network_change(scenario):
|
||||||
|
args=approval_update(scenario);deploy.prepare_update(args);root=Path(args.output);plan=deploy.load_plan(root)
|
||||||
|
base=deploy.run(deploy.compose(plan)+['config','--format','json'],True)
|
||||||
|
merged=deploy.run(deploy.compose(plan,root/'compose.broker.json')+['config','--format','json'],True)
|
||||||
|
merged['services']['longconn']['entrypoint']=['sh','-c','unreviewed']
|
||||||
|
with pytest.raises(deploy.DeployError,match='unrelated longconn'):
|
||||||
|
deploy.validate_overlay(base,merged,plan['candidate_image'],approval_plan=plan)
|
||||||
|
|
||||||
|
|
||||||
|
def test_approval_update_rejects_different_app_or_missing_identity(scenario):
|
||||||
|
args=approval_update(scenario)
|
||||||
|
scenario['base']['services']['longconn']['environment']['HN_FEISHU_APP_ID']='other'
|
||||||
|
with pytest.raises(deploy.DeployError,match='does not match'):deploy.prepare_update(args)
|
||||||
|
assert not Path(args.output).exists()
|
||||||
|
|
||||||
|
|
||||||
|
def test_approval_build_reuses_distinct_longconn_base_and_saves_both_receipts(scenario):
|
||||||
|
args=approval_update(scenario);deploy.prepare_update(args);root=Path(args.output);plan=deploy.load_plan(root)
|
||||||
|
scenario['calls'].clear();deploy.build(root,plan)
|
||||||
|
commands=[c for c in scenario['calls']if c[:2]==['docker','build']]
|
||||||
|
assert len(commands)==2
|
||||||
|
assert 'BASE_IMAGE='+scenario['roles']['longconn']['image']in commands[1]
|
||||||
|
assert plan['longconn_candidate_image']in commands[1]
|
||||||
|
assert all('--network'in c and c[c.index('--network')+1]=='none'for c in commands)
|
||||||
|
assert (root/'candidate.json').is_file()and(root/'candidate-longconn.json').is_file()
|
||||||
|
|
||||||
|
|
||||||
|
def test_approval_cli_rollback_restores_original_longconn_too(scenario,monkeypatch):
|
||||||
|
args=approval_update(scenario);deploy.prepare_update(args);root=Path(args.output)
|
||||||
|
monkeypatch.setattr(deploy.sys,'argv',['broker_deploy.py','rollback','--plan',str(root),'--stop-broker-use'])
|
||||||
|
scenario['calls'].clear();deploy.main()
|
||||||
|
commands=[c for c in scenario['calls']if 'up'in c]
|
||||||
|
assert len(commands)==1 and commands[0][-3:]==['connector','router','longconn']
|
||||||
|
assert str(root/'compose.rollback.json')in commands[0]
|
||||||
|
|||||||
Reference in New Issue
Block a user