fluencelabs/js-libp2p-noise
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p-noise synced 2025-04-26 07:12:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into mpetrunic/fix-outbount-remote-peer

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Marin Petrunić 2020-03-11 10:05:06 +01:00
commit ea67a7d7d1
No known key found for this signature in database
GPG Key ID: 834D07135E110DA5
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Bugfixes ### Bugfixes
- return handshake remote peer from secureOutbound - return handshake remote peer from secureOutbound
- fix browser usage of buffer
## [1.0.0-rc.8] - 2019-03-05 ## [1.0.0-rc.8] - 2019-03-05

13
src/utils.ts
View File

@ -58,9 +58,9 @@ export async function getPeerIdFromPayload(payload: pb.INoiseHandshakePayload):
return await PeerId.createFromPubKey(Buffer.from(payload.identityKey as Uint8Array)); return await PeerId.createFromPubKey(Buffer.from(payload.identityKey as Uint8Array));
} }
export async function decodePayload(payload: bytes): Promise<pb.INoiseHandshakePayload> { export async function decodePayload(payload: bytes|Uint8Array): Promise<pb.INoiseHandshakePayload> {
return NoiseHandshakePayloadProto.toObject( return NoiseHandshakePayloadProto.toObject(
NoiseHandshakePayloadProto.decode(payload) NoiseHandshakePayloadProto.decode(Buffer.from(payload))
) as INoisePayload; ) as INoisePayload;
} }
@ -85,19 +85,16 @@ export async function verifySignedPayload(
payload: pb.INoiseHandshakePayload, payload: pb.INoiseHandshakePayload,
remotePeer: PeerId remotePeer: PeerId
): Promise<PeerId> { ): Promise<PeerId> {
const identityKey = Buffer.from(payload.identityKey as Uint8Array);
if (!(await isValidPeerId(remotePeer.id, Buffer.from(payload.identityKey as Uint8Array)))) { if (!(await isValidPeerId(remotePeer.id, identityKey))) {
throw new Error("Peer ID doesn't match libp2p public key."); throw new Error("Peer ID doesn't match libp2p public key.");
} }
const generatedPayload = getHandshakePayload(noiseStaticKey); const generatedPayload = getHandshakePayload(noiseStaticKey);
// Unmarshaling from PublicKey protobuf // Unmarshaling from PublicKey protobuf
const publicKey = crypto.keys.unmarshalPublicKey(payload.identityKey); const publicKey = crypto.keys.unmarshalPublicKey(identityKey);
if (!publicKey.verify(generatedPayload, payload.identitySig)) { if (!publicKey.verify(generatedPayload, payload.identitySig)) {
throw new Error("Static key doesn't match to peer that signed payload!"); throw new Error("Static key doesn't match to peer that signed payload!");
} }
return remotePeer; return remotePeer;
} }