fluencelabs/js-libp2p-noise
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-noise synced 2025-06-21 17:31:50 +00:00
Code Issues Projects Releases Wiki Activity

Update setting remote id

Browse Source
This commit is contained in:
morrigan
2020-02-08 12:23:35 +01:00
parent a5c45bfc53
commit 06d5034998
5 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/handshake-ik.ts
View File

@ -56,9 +56,8 @@ export class IKHandshake implements IHandshake {
try {
const receivedMessageBuffer = decode1(receivedMsg);
const plaintext = this.ik.recvMessage(this.session, receivedMessageBuffer);
this.remotePeer = await getPeerIdFromPayload(plaintext);
logger("IK Stage 0 - Responder got message, going to verify payload.");
await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer.id);
this.remotePeer = await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer);
logger("IK Stage 0 - Responder successfully verified payload!");
} catch (e) {
logger("Responder breaking up with IK handshake in stage 0.");
@ -77,7 +76,7 @@ export class IKHandshake implements IHandshake {
logger("IK Stage 1 - Initiator got message, going to verify payload.");
try {
await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer.id);
await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer);
logger("IK Stage 1 - Initiator successfully verified payload!");
} catch (e) {
logger("Initiator breaking up with IK handshake in stage 1.");

3
src/handshake-xx-fallback.ts
View File

@ -57,8 +57,7 @@ export class XXFallbackHandshake extends XXHandshake {
logger("Initiator going to check remote's signature...");
try {
this.remotePeer = await getPeerIdFromPayload(plaintext);
await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer.id);
this.remotePeer = await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer);
} catch (e) {
throw new Error(`Error occurred while verifying signed payload from responder: ${e.message}`);
}

6
src/handshake-xx.ts
View File

@ -72,8 +72,7 @@ export class XXHandshake implements IHandshake {
logger("Initiator going to check remote's signature...");
try {
this.remotePeer = await getPeerIdFromPayload(plaintext);
await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer.id);
this.remotePeer = await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer);
} catch (e) {
throw new Error(`Error occurred while verifying signed payload: ${e.message}`);
}
@ -97,11 +96,10 @@ export class XXHandshake implements IHandshake {
logger('Stage 2 - Responder waiting for third handshake message...');
const receivedMessageBuffer = decode1(await this.connection.readLP());
const plaintext = this.xx.recvMessage(this.session, receivedMessageBuffer);
this.remotePeer = await getPeerIdFromPayload(plaintext);
logger('Stage 2 - Responder received the message, finished handshake. Got remote\'s static key.');
try {
await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer.id);
this.remotePeer = await verifySignedPayload(receivedMessageBuffer.ns, plaintext, this.remotePeer);
} catch (e) {
throw new Error(`Error occurred while verifying signed payload: ${e.message}`);
}

19
src/utils.ts
View File

@ -82,7 +82,18 @@ async function isValidPeerId(peerId: bytes, publicKeyProtobuf: bytes) {
return generatedPeerId.id.equals(peerId);
}
export async function verifySignedPayload(noiseStaticKey: bytes, plaintext: bytes, peerId: bytes) {
/**
* Verifies signed payload and returns peer id that has sent the payload.
* @param {bytes} noiseStaticKey - owner's noise static key
* @param {bytes} plaintext - encoded payload
* @param {PeerId} remotePeer - (optional) owner's libp2p peer ID
* @returns {Promise<PeerId>} - peer ID of payload owner
*/
export async function verifySignedPayload(
noiseStaticKey: bytes,
plaintext: bytes,
remotePeer?: PeerId
): Promise<PeerId> {
let receivedPayload;
try {
const NoiseHandshakePayload = await loadPayloadProto();
@ -97,7 +108,9 @@ export async function verifySignedPayload(noiseStaticKey: bytes, plaintext: byte
throw new Error("Failed to decode received payload. Reason: " + e.message);
}
if (!(await isValidPeerId(peerId, receivedPayload.identityKey)) ) {
remotePeer = remotePeer || await getPeerIdFromPayload(plaintext);
if (!(await isValidPeerId(remotePeer.id, receivedPayload.identityKey)) ) {
throw new Error("Peer ID doesn't match libp2p public key.");
}
@ -108,6 +121,8 @@ export async function verifySignedPayload(noiseStaticKey: bytes, plaintext: byte
if (!publicKey.verify(generatedPayload, receivedPayload.identitySig)) {
throw new Error("Static key doesn't match to peer that signed payload!");
}
return remotePeer;
}
export function getHkdf(ck: bytes32, ikm: bytes): Hkdf {