diff --git a/docs/rental/app-workbench.md b/docs/rental/app-workbench.md new file mode 100644 index 0000000..8597d8b --- /dev/null +++ b/docs/rental/app-workbench.md @@ -0,0 +1,31 @@ +# 租赁账户的应用工作台 + +入口:PROXY_ACCOUNT → 租赁应用(system/rentApp/user/index)。 + +1. 无应用时显示创建引导;有应用时显示卡片列表及分页。 +2. 创建时填写名称及可选 HTTPS 默认回调地址,创建成功自动进入详情。 +3. 详情展示应用 ID、状态、默认回调、创建时间和凭证版本。 +4. 点击创建/轮换凭证,确认影响后,服务端为当前 APP 签发凭证;无需手工填写主体编号。 +5. API Secret 仅在成功响应的弹窗中展示一次,默认隐藏;确认安全保存后关闭,立即清除内存引用,不写缓存或日志。 + +签发会使旧 ACTIVE 凭证变为 VERIFY_ONLY,新请求须切换到新凭证。签发失败不自动重试,避免多次轮换。 + +## 接口与权限 + +| 接口 | 权限 | 说明 | +| --- | --- | --- | +| GET /rental/mine/app | rent:portal:view | 本人应用分页 | +| POST /rental/register/app | rent:app:create 或旧 rent:portal:register | 归属取当前登录用户 | +| GET /rental/app/{id} | rent:portal:view | 按当前用户校验应用归属,凭证显式选列,不返回 Secret | +| POST /rental/credential/issue | rent:credential:issue | owner_type 固定 APP,owner_id 为当前应用;后端再次校验归属 | + +现有 sql/rent_role_permissions.sql 已授予 PROXY_ACCOUNT 上述业务权限,无新增表结构及权限编码。若部署环境未执行该角色权限脚本,需要先完成授权并重新登录。 + +验收:空列表引导、创建失败保留输入、创建后打开详情、取消轮换不签发、重复点击防重、一次性密钥确认、跨用户详情拒绝、窄屏布局。构建及隔离测试不替代真实登录浏览器联调。 + +## 本次验证 + +- 页面及 API 文件 ESLint 通过,Vue 模板独立编译通过。 +- staging 全量构建成功;其他页面存在 3 项导出缺失及资源体积警告。 +- JDK8 后端 Rental*Test 共 55 项通过(0 失败),包含新增应用详情隔离测试。 +- 尚未连接实际 MySQL 或登录 PROXY_ACCOUNT 浏览器验收。 diff --git a/ruoyi-admin/src/main/resources/application-rental.yml b/ruoyi-admin/src/main/resources/application-rental.yml index 7668c22..def5ea1 100644 --- a/ruoyi-admin/src/main/resources/application-rental.yml +++ b/ruoyi-admin/src/main/resources/application-rental.yml @@ -1,6 +1,6 @@ # 通过spring.profiles.include=rental载入。本文件不存任何实际密钥或链上广播授权。 rental: - enabled: ${RENT_ENABLED:false} + enabled: ${RENT_ENABLED:true} domain: ${RENT_DOMAIN:localhost} master-key: ${RENT_MASTER_KEY:ZA+5tLy20rbLxsMEvVm7Ow9hl2qtAPD3nmiK1Tf52NA=} master-key-version: ${RENT_MASTER_KEY_VERSION:v1} @@ -11,7 +11,7 @@ rental: api-key: ${RENT_RPC_KEY:719b2ba2-dedd-48ad-99a6-df1caa6f08ae} history: # 内置历史采集与云端同进程;先执行sql/rent_history_init.sql。默认关闭,不自动启用主网。 - embedded-enabled: ${RENT_HISTORY_EMBEDDED_ENABLED:false} + embedded-enabled: ${RENT_HISTORY_EMBEDDED_ENABLED:true} networks: ${RENT_HISTORY_NETWORKS:NILE} poll-interval-ms: ${RENT_HISTORY_POLL_MS:1000} batch-size: ${RENT_HISTORY_BATCH_SIZE:30} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java index 279e6f6..95d3702 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalController.java @@ -68,6 +68,20 @@ public class RentalController { return AjaxResult.success(queries.list(resource, user(), page)); } + /** 本人应用详情;显式选列,禁止返回明文或加密 Secret。 */ + @GetMapping("/app/{id}") + @PreAuthorize("@ss.hasPermi('rent:portal:view')") + public AjaxResult appDetail(@PathVariable long id) { + Map app = store.one( + "SELECT id,name,status,notify_url,created_at,updated_at FROM rent_app WHERE id=? AND user_id=?", + id, user()); + require(app != null, "应用不存在或无权访问"); + List> credentials = store.rows( + "SELECT id,api_key,status,expires_at,created_at FROM rent_credential" + + " WHERE owner_type='APP' AND owner_id=? ORDER BY id DESC", id); + return AjaxResult.success(map("app", app, "credentials", credentials)); + } + @GetMapping("/manage/{resource}") @PreAuthorize("@ss.hasPermi('rent:manage:list')") public AjaxResult manage( diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java index 90d64b2..2d13d0e 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java @@ -40,6 +40,36 @@ public class RentalBusinessTest { private static final String OWNER = "TR7NHqjeKQxGTCi8q8ZY4pL8otgjLj6t"; private final ObjectMapper json = new ObjectMapper(); + /** 真实查询验证应用隔离、节点凭证隔离与 Secret 不外泄。 */ + @Test + public void appDetailIsOwnedAndNeverReturnsSecrets() { + com.ruoyi.common.core.domain.entity.SysUser user = + new com.ruoyi.common.core.domain.entity.SysUser(); + user.setUserId(10L); + com.ruoyi.common.core.domain.model.LoginUser login = + new com.ruoyi.common.core.domain.model.LoginUser(user, Collections.emptySet()); + org.springframework.security.core.context.SecurityContextHolder.getContext().setAuthentication( + new org.springframework.security.authentication.UsernamePasswordAuthenticationToken( + login, null, Collections.emptyList())); + try { + tx.execute(status -> identity.issue("APP", app, 10)); + tx.execute(status -> identity.issue("NODE", node, 20)); + RentalController controller = new RentalController( + store, null, identity, orders, funds, reviews, tasks, null, null); + Map result = (Map) controller.appDetail(app).get("data"); + List> credentials = + (List>) result.get("credentials"); + assertEquals(1, credentials.size()); + assertTrue(credentials.get(0).containsKey("api_key")); + assertFalse(credentials.get(0).containsKey("api_secret")); + long foreign = store.insert("app", map("user_id", 20, "name", "foreign", "status", "ACTIVE")); + expectFailure(() -> controller.appDetail(foreign)); + expectFailure(() -> controller.appDetail(Long.MAX_VALUE)); + } finally { + org.springframework.security.core.context.SecurityContextHolder.clearContext(); + } + } + @Before public void setup() throws Exception { JdbcDataSource source = new JdbcDataSource();