供应商节点认证的租赁地址,rent-agent-java 当节点启动时,需要认证本地的配置的私钥和云端认证的地址是否一致。
This commit is contained in:
1 parent
4b6ea31e6a
commit
849aff5ee1
3 files changed
+36
-1
No files matched your search
@@ -135,6 +135,8 @@ SHA256(实际UTF-8请求体)的小写十六进制
|
||||
|
||||
通道 `/node/v1/socket`:CHALLENGE → AUTH → 签名AUTH_OK → 分页SYNC_STATE/SYNC_ACK → ONLINE。未同步不得接新单。外层帧的 `body` 是原始JSON字符串;信封含 `api_key,timestamp,nonce,body,signature`,NODE域、method=FRAME、path固定。body含type、方向、session_id、session_epoch、sequence、message_id、payload。双方向序号各自从1递增。每15秒签名PING/PONG,45秒超时断开,nonce重复或旧会话帧拒绝。
|
||||
|
||||
Java Agent启动地址校验:签名 `AUTH_OK.payload` 增加 `node_id`(字符串)、`network` 和 `verified_wallets`(`[{address,network}]`)。地址仅从当前节点 `rent_wallet.ownership_verified_at IS NOT NULL` 的记录读取;网络来自钱包记录,节点表本身没有网络字段。Java Agent先验证帧签名及挑战,再要求已认证地址恰好一个,节点ID、网络及本地私钥派生地址全部一致,才发送 `SYNC_STATE`。缺字段、未认证或不一致时禁止上线,撤销本次广播授权并停止自动重连,界面显示固定错误说明;需停止并修正配置或换绑认证后重启。该响应不包含私钥,不需数据库迁移;先升级服务端再升级Java Agent,旧服务端缺字段时新Agent拒绝降级放行。
|
||||
|
||||
TASK_PUSH中保留稳定delivery_message_id、原api_key/intent/timestamp/nonce/signature。TASK域、method=PUSH、path=`/node/v1/task`。任务intent为按键排序的紧凑JSON;任务字段只含ASCII字符串/布尔值。MySQL JSON规范化后由后端按同一规则重建,再传输原意图,不改变授权内容。
|
||||
|
||||
Agent事件先落本地可靠队列,云端同事务以 `NODE:nodeId:eventId` 去重后RESULT_ACK。ACK只说明持久接收,ACCEPTED只说明本地接受,BUILT/BROADCASTED/RESULT只说明执行线索。云端另查交易合约、owner/receiver、网络、资源类型、非锁定、SUN、回执、确认深度和关系,不能凭节点消息扣款。
|
||||
|
||||
@@ -153,7 +153,19 @@ public class RentalSocket extends TextWebSocketHandler {
|
||||
other.socket.close(CloseStatus.POLICY_VIOLATION);
|
||||
}
|
||||
}
|
||||
send(c, "AUTH_OK", map("challenge", c.challenge, "heartbeat_seconds", 15));
|
||||
// 地址来源只能是当前节点已完成所有权认证的钱包记录,不能信任Agent自报地址。
|
||||
// AUTH_OK整体由节点凭证签名,Agent在恢复同步前核对本地私钥派生地址。
|
||||
List<Map<String, Object>> walletRows = store.rows(
|
||||
"SELECT address,network FROM rent_wallet WHERE node_id=?"
|
||||
+ " AND ownership_verified_at IS NOT NULL ORDER BY id", c.node);
|
||||
List<Map<String, Object>> verifiedWallets = new ArrayList<>();
|
||||
for (Map<String, Object> wallet : walletRows) {
|
||||
verifiedWallets.add(map("address", text(wallet, "address"), "network", text(wallet, "network")));
|
||||
}
|
||||
send(c, "AUTH_OK", map("challenge", c.challenge, "heartbeat_seconds", 15,
|
||||
"node_id", Long.toString(c.node), "network", verifiedWallets.size() == 1
|
||||
? text(verifiedWallets.get(0), "network") : "",
|
||||
"verified_wallets", verifiedWallets));
|
||||
return;
|
||||
}
|
||||
require(
|
||||
|
||||
@@ -1261,6 +1261,13 @@ public class RentalBusinessTest {
|
||||
Map<String, Object> firstAuth =
|
||||
json.readValue(
|
||||
text(json.readValue(first.messages.get(1), Map.class), "body"), Map.class);
|
||||
Map<String, Object> authPayload = (Map<String, Object>) firstAuth.get("payload");
|
||||
assertEquals(Long.toString(node), text(authPayload, "node_id"));
|
||||
assertEquals("NILE", text(authPayload, "network"));
|
||||
List<Map<String, Object>> verifiedWallets = (List<Map<String, Object>>) authPayload.get("verified_wallets");
|
||||
assertEquals(1, verifiedWallets.size());
|
||||
assertEquals(OWNER, text(verifiedWallets.get(0), "address"));
|
||||
assertEquals("NILE", text(verifiedWallets.get(0), "network"));
|
||||
Map<String, Object> credential =
|
||||
store.one(
|
||||
"SELECT * FROM rent_credential WHERE owner_type='NODE' AND owner_id=? AND"
|
||||
@@ -1330,6 +1337,20 @@ public class RentalBusinessTest {
|
||||
assertFalse(session.isOpen());
|
||||
}
|
||||
|
||||
/** 未认证钱包和其他节点的钱包不得进入当前节点的签名认证响应。 */
|
||||
@Test
|
||||
public void socketAuthDoesNotAdvertiseUnverifiedOrOtherNodesWallets() throws Exception {
|
||||
store.update("wallet", wallet, map("ownership_verified_at", null));
|
||||
long anotherNode = store.insert("node", map("user_id", 20, "node_no", "OTHER-WALLET-NODE", "status", "ACTIVE"));
|
||||
store.insert("wallet", map("node_id", anotherNode, "network", "NILE", "address", ADDRESS,
|
||||
"status", "ACTIVE", "ownership_verified_at", now()));
|
||||
StubSocket session = new StubSocket();
|
||||
authenticate(new RentalSocket(store, identity, tasks, json), session);
|
||||
Map<String, Object> response = json.readValue(text(json.readValue(session.messages.get(1), Map.class), "body"), Map.class);
|
||||
Map<String, Object> payload = (Map<String, Object>) response.get("payload");
|
||||
assertTrue(((List<?>) payload.get("verified_wallets")).isEmpty());
|
||||
}
|
||||
|
||||
private void authenticate(RentalSocket socket, StubSocket session) throws Exception {
|
||||
socket.afterConnectionEstablished(session);
|
||||
Map<String, Object> challenge = json.readValue(session.messages.get(0), Map.class);
|
||||
|
||||
Reference in new issue
Block a user