fluencelabs/js-libp2p-noise
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-noise synced 2025-06-29 08:51:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix merging updated payload signing

Browse Source
This commit is contained in:
Belma Gutlic
2020-01-11 20:20:57 +01:00
parent 29f16c481f
commit ad45be5e7b
7 changed files with 23 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/noise.test.ts
View File

@ -57,9 +57,8 @@ describe("Noise", () => {
const staticKeys = generateKeypair();
const xx = new XX();
const handshake = new XXHandshake(false, libp2pPrivKey, libp2pPubKey, prologue, staticKeys, wrapped, localPeer, xx);
const payload = await getPayload(remotePeer, staticKeys.publicKey);
const handshake = new Handshake(false, payload, prologue, staticKeys, wrapped, localPeer, xx);
const handshake = new XXHandshake(false, payload, prologue, staticKeys, wrapped, localPeer, xx);
let receivedMessageBuffer = decode0((await wrapped.readLP()).slice());
// The first handshake message contains the initiator's ephemeral public key
@ -67,9 +66,9 @@ describe("Noise", () => {
xx.recvMessage(handshake.session, receivedMessageBuffer);
// Stage 1
const { privateKey: libp2pPrivKey, publicKey: libp2pPubKey } = getKeyPairFromPeerId(remotePeer);
const { publicKey: libp2pPubKey } = getKeyPairFromPeerId(remotePeer);
const signedPayload = await signPayload(remotePeer, getHandshakePayload(staticKeys.publicKey));
const handshakePayload = await createHandshakePayload(libp2pPubKey, libp2pPrivKey, signedPayload);
const handshakePayload = await createHandshakePayload(libp2pPubKey, signedPayload);
const messageBuffer = xx.sendMessage(handshake.session, handshakePayload);
wrapped.writeLP(encode1(messageBuffer));

21
test/xx-fallback-handshake.test.ts
View File

@ -3,17 +3,13 @@ import {Buffer} from "buffer";
import Duplex from 'it-pair/duplex';
import {
createHandshakePayload,
generateKeypair,
getHandshakePayload,
signPayload
getPayload,
} from "../src/utils";
import {generateEd25519Keys, getKeyPairFromPeerId} from "./utils";
import {XXFallbackHandshake} from "../src/handshake-xx-fallback";
import {createPeerIdsFromFixtures} from "./fixtures/peer";
import {assert} from "chai";
import {decode1, encode0, encode1} from "../src/encoder";
import {XX} from "../src/handshakes/xx";
describe("XX Fallback Handshake", () => {
let peerA, peerB, fakePeer;
@ -33,24 +29,17 @@ describe("XX Fallback Handshake", () => {
const staticKeysResponder = generateKeypair();
const ephemeralKeys = generateKeypair();
const {privateKey: initiatorPrivKey, publicKey: initiatorPubKey} = getKeyPairFromPeerId(peerA);
const {privateKey: responderPrivKey, publicKey: responderPubKey} = getKeyPairFromPeerId(peerB);
// Initial msg for responder is IK first message from initiator
const signedPayload = signPayload(initiatorPrivKey, getHandshakePayload(staticKeysInitiator.publicKey));
const handshakePayload = await createHandshakePayload(
initiatorPubKey,
initiatorPrivKey,
signedPayload,
);
const handshakePayload = await getPayload(peerA, staticKeysInitiator.publicKey);
const initialMsgR = encode0({
ne: ephemeralKeys.publicKey,
ns: Buffer.alloc(0),
ciphertext: handshakePayload,
});
const respPayload = await getPayload(peerB, staticKeysResponder.publicKey);
const handshakeResp =
new XXFallbackHandshake(false, responderPrivKey, responderPubKey, prologue, staticKeysResponder, connectionTo, peerA, initialMsgR);
new XXFallbackHandshake(false, respPayload, prologue, staticKeysResponder, connectionTo, peerA, initialMsgR);
await handshakeResp.propose();
await handshakeResp.exchange();
@ -59,7 +48,7 @@ describe("XX Fallback Handshake", () => {
// This is the point where initiator falls back from IK
const initialMsgI = await connectionFrom.readLP();
const handshakeInit =
new XXFallbackHandshake(true, initiatorPrivKey, initiatorPubKey, prologue, staticKeysInitiator, connectionFrom, peerB, initialMsgI, ephemeralKeys);
new XXFallbackHandshake(true, handshakePayload, prologue, staticKeysInitiator, connectionFrom, peerB, initialMsgI, ephemeralKeys);
await handshakeInit.propose();
await handshakeInit.exchange();

3
test/xx-handshake.test.ts
View File

@ -4,9 +4,8 @@ import {Buffer} from "buffer";
import Wrap from "it-pb-rpc";
import {XXHandshake} from "../src/handshake-xx";
import {generateKeypair} from "../src/utils";
import {generateKeypair, getPayload} from "../src/utils";
import {createPeerIdsFromFixtures} from "./fixtures/peer";
import {getKeyPairFromPeerId} from "./utils";
describe("XX Handshake", () => {