供应商节点认证的租赁地址,rent-agent-java 当节点启动时,需要认证本地的配置的私钥和云端认证的地址是否一致。
This commit is contained in:
1 parent
4b6ea31e6a
commit
849aff5ee1
3 files changed
+36
-1
No files matched your search
@@ -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