From 624110e43c017db85d9dbf41a1593565def63a1e Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Fri, 30 Oct 2026 19:32:11 -0400 Subject: [PATCH] =?UTF-8?q?views/rental/nodeDetail=20=20=20=E7=A7=9F?= =?UTF-8?q?=E8=B5=81=E5=9C=B0=E5=9D=80=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=88=A0=E9=99=A4=E5=BE=85=E9=AA=8C=E8=AF=81=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/rental/RentalController.java | 8 ++++ .../ruoyi/system/rental/RentalIdentity.java | 6 +++ .../system/rental/RentalProvisioning.java | 18 ++++++++ .../system/rental/RentalBusinessTest.java | 44 +++++++++++++++++++ 4 files changed, 76 insertions(+) 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 4820a7a..b253882 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 @@ -184,6 +184,14 @@ public class RentalController { return AjaxResult.success(); } + /** 删除本人尚未完成所有权验证的待审核地址。 */ + @DeleteMapping("/wallet/{id}") + @PreAuthorize("@ss.hasPermi('rent:wallet:bind')") + public AjaxResult removeWallet(@PathVariable long id) { + provisioning.deletePendingWallet(id, user()); + return AjaxResult.success(); + } + @PostMapping("/wallet/{id}/challenge") @PreAuthorize("@ss.hasPermi('rent:wallet:bind')") public AjaxResult challenge(@PathVariable long id) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalIdentity.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalIdentity.java index 530da41..ac2f2ec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalIdentity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalIdentity.java @@ -120,6 +120,12 @@ public class RentalIdentity { require("APP".equals(type) || "NODE".equals(type), "凭证主体非法"); Map row = store.get(type.toLowerCase(Locale.ROOT), owner, true); require(number(row, "user_id") == actor, "无主体权限"); + if ("NODE".equals(type)) { + // 与 Agent 建连共用节点行锁:检查必须在旧凭证降级之前完成, + // 防止过期页面或其他签发入口轮换在线节点的凭证,造成 Agent 认证中断。 + require(!Arrays.asList("ONLINE", "SYNCING").contains(text(row, "connection_status")), + "节点在线或正在恢复连接,禁止重新签发凭证,请先停止Agent并确认节点离线"); + } String secret = RentalCrypto.random(); String encrypted = crypto.encrypt(secret); String key = id("RK"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalProvisioning.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalProvisioning.java index b8635c3..364831f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalProvisioning.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalProvisioning.java @@ -157,6 +157,24 @@ public class RentalProvisioning { return wallet; } + /** + * 仅清理误添加的待验证地址,不删除已验证或已产生业务关联的钱包。 + * 与所有权验证共用钱包行锁,保证验证与删除不能同时成功;审计独立保留。 + */ + @Transactional(rollbackFor = Exception.class) + public void deletePendingWallet(long id, long actor) { + Map wallet = ownedWallet(id, actor, true); + require(wallet.get("ownership_verified_at") == null && "PENDING".equals(text(wallet, "status")), + "仅允许删除待验证的租赁地址"); + require(store.one("SELECT id FROM rent_order WHERE wallet_id=? LIMIT 1 FOR UPDATE", id) == null, + "地址存在关联订单,不能删除"); + require(store.one("SELECT id FROM rent_task WHERE wallet_id=? LIMIT 1 FOR UPDATE", id) == null, + "地址存在关联任务,不能删除"); + require(store.execute("DELETE FROM rent_wallet WHERE id=? AND status='PENDING' AND ownership_verified_at IS NULL", id) == 1, + "地址状态已变化,请刷新后重试"); + store.event("WALLET", id, "DELETE", actor, "删除待验证且无业务关联的租赁地址"); + } + @Transactional(rollbackFor = Exception.class) public Map challenge(long id, long actor) { Map wallet = ownedWallet(id, actor, true); 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 7ca666c..36c70c6 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 @@ -43,6 +43,45 @@ public class RentalBusinessTest { private static final String OWNER = "TR7NHqjeKQxGTCi8q8ZY4pL8otgjLj6t"; private final ObjectMapper json = new ObjectMapper(); + /** 待验证地址仅本人可删除,验证后或状态变化后必须保留。 */ + @Test + public void pendingWalletDeletionChecksOwnershipAndVerification() { + long pending = store.insert("wallet", map("node_id", node, "network", "NILE", + "address", "pending-delete", "status", "PENDING")); + expectFailure(() -> tx.execute(status -> { + rentalDeletion().deletePendingWallet(pending, 10); return null; + })); + store.update("wallet", pending, map("ownership_verified_at", now())); + expectFailure(() -> tx.execute(status -> { + rentalDeletion().deletePendingWallet(pending, 20); return null; + })); + store.update("wallet", pending, map("ownership_verified_at", null, "status", "PAUSED")); + expectFailure(() -> tx.execute(status -> { + rentalDeletion().deletePendingWallet(pending, 20); return null; + })); + store.update("wallet", pending, map("status", "PENDING")); + tx.execute(status -> { rentalDeletion().deletePendingWallet(pending, 20); return null; }); + assertNull(store.one("SELECT id FROM rent_wallet WHERE id=?", pending)); + assertEquals(1, store.rows("SELECT id FROM rent_event WHERE object_type='WALLET' AND object_id=? AND action='DELETE'", pending).size()); + } + + /** 在线和恢复连接时拒绝轮换且保留原凭证,离线后允许正常轮换。 */ + @Test + public void nodeCredentialRotationRequiresOffline() { + Map original = store.one( + "SELECT id FROM rent_credential WHERE owner_type='NODE' AND owner_id=? AND status='ACTIVE'", node); + for (String connection : Arrays.asList("ONLINE", "SYNCING")) { + store.update("node", node, map("connection_status", connection)); + expectFailure(() -> tx.execute(status -> identity.issue("NODE", node, 20))); + assertEquals("ACTIVE", text(store.get("credential", number(original, "id"), false), "status")); + assertEquals(1, store.rows("SELECT id FROM rent_credential WHERE owner_type='NODE' AND owner_id=?", node).size()); + } + store.update("node", node, map("connection_status", "OFFLINE")); + Map issued = tx.execute(status -> identity.issue("NODE", node, 20)); + assertEquals("ACTIVE", text(store.get("credential", number(issued, "id"), false), "status")); + assertEquals("VERIFY_ONLY", text(store.get("credential", number(original, "id"), false), "status")); + } + /** 真实查询验证应用隔离、节点凭证隔离与 Secret 不外泄。 */ @Test public void appDetailIsOwnedAndNeverReturnsSecrets() { @@ -56,6 +95,7 @@ public class RentalBusinessTest { login, null, Collections.emptyList())); try { tx.execute(status -> identity.issue("APP", app, 10)); + store.update("node", node, map("connection_status", "OFFLINE")); tx.execute(status -> identity.issue("NODE", node, 20)); RentalController controller = new RentalController( store, null, identity, orders, funds, reviews, tasks, null, null); @@ -132,6 +172,7 @@ public class RentalBusinessTest { map("package_id", product, "merchant_order_no", "credential-delete", "receiver_address", ADDRESS))); tx.execute(status -> { orders.cancel(number(order, "id"), 10); return null; }); expectFailure(() -> tx.execute(status -> identity.deleteAppCredential(number(historical, "id"), 10))); + store.update("node", node, map("connection_status", "OFFLINE")); Map nodeKey = tx.execute(status -> identity.issue("NODE", node, 20)); expectFailure(() -> tx.execute(status -> identity.deleteAppCredential(number(nodeKey, "id"), 20))); } @@ -454,7 +495,10 @@ public class RentalBusinessTest { "ONLINE", "heartbeat_expires_at", after(60))); + // 先离线签发,再模拟 Agent 上线,遵循实际节点生命周期。 + store.update("node", node, map("connection_status", "OFFLINE")); identity.issue("NODE", node, 20); + store.update("node", node, map("connection_status", "ONLINE")); product = store.insert( "package",