Log handshake steps

This commit is contained in:
morrigan 2019-12-02 11:24:30 +01:00
parent 36c3fa8ccb
commit fc71a22a6c

View File

@ -47,6 +47,7 @@ export class Handshake {
// stage 0 // stage 0
async propose(earlyData?: bytes): Promise<void> { async propose(earlyData?: bytes): Promise<void> {
if (this.isInitiator) { if (this.isInitiator) {
logger("Stage 0 - Initiator starting to send first message.");
const signedPayload = signPayload(this.libp2pPrivateKey, getHandshakePayload(this.staticKeys.publicKey)); const signedPayload = signPayload(this.libp2pPrivateKey, getHandshakePayload(this.staticKeys.publicKey));
const signedEarlyDataPayload = signEarlyDataPayload(this.libp2pPrivateKey, earlyData || Buffer.alloc(0)); const signedEarlyDataPayload = signEarlyDataPayload(this.libp2pPrivateKey, earlyData || Buffer.alloc(0));
const handshakePayload = await createHandshakePayload( const handshakePayload = await createHandshakePayload(
@ -58,24 +59,26 @@ export class Handshake {
const messageBuffer = await this.xx.sendMessage(this.session, handshakePayload); const messageBuffer = await this.xx.sendMessage(this.session, handshakePayload);
this.connection.writeLP(encodeMessageBuffer(messageBuffer)); this.connection.writeLP(encodeMessageBuffer(messageBuffer));
logger("Stage 0 - Initiator finished proposing, sent signed NoiseHandshake payload."); logger("Stage 0 - Initiator finished proposing, sent signed NoiseHandshake payload and static public key.");
} else { } else {
logger("Stage 0 - Responder waiting to receive first message...");
const receivedMessageBuffer = decodeMessageBuffer((await this.connection.readLP()).slice()); const receivedMessageBuffer = decodeMessageBuffer((await this.connection.readLP()).slice());
const plaintext = await this.xx.recvMessage(this.session, receivedMessageBuffer); const plaintext = await this.xx.recvMessage(this.session, receivedMessageBuffer);
// TODO: Verify payload // TODO: Verify payload
logger("Stage 0 - Responder received proposed message and remote static public key."); logger("Stage 0 - Responder received first message.");
} }
} }
// stage 1 // stage 1
async exchange(): Promise<void> { async exchange(): Promise<void> {
if (this.isInitiator) { if (this.isInitiator) {
logger('Stage 1 - Initiator waiting to receive first message from responder...');
const receivedMessageBuffer = decodeMessageBuffer((await this.connection.readLP()).slice()); const receivedMessageBuffer = decodeMessageBuffer((await this.connection.readLP()).slice());
const plaintext = await this.xx.recvMessage(this.session, receivedMessageBuffer); const plaintext = await this.xx.recvMessage(this.session, receivedMessageBuffer);
// TODO: Verify payload // TODO: Verify payload
logger('Stage 1 - Initiator received the message. Got remote\'s static key.'); logger('Stage 1 - Initiator received the message. Got remote\'s static key.');
} else { } else {
// create payload as responder logger('Stage 1 - Responder sending out first message with signed payload and static key.');
const signedPayload = signPayload(this.libp2pPrivateKey, getHandshakePayload(this.staticKeys.publicKey)); const signedPayload = signPayload(this.libp2pPrivateKey, getHandshakePayload(this.staticKeys.publicKey));
const handshakePayload = await createHandshakePayload( const handshakePayload = await createHandshakePayload(
this.libp2pPublicKey, this.libp2pPublicKey,
@ -85,20 +88,22 @@ export class Handshake {
const messageBuffer = await this.xx.sendMessage(this.session, handshakePayload); const messageBuffer = await this.xx.sendMessage(this.session, handshakePayload);
this.connection.writeLP(encodeMessageBuffer(messageBuffer)); this.connection.writeLP(encodeMessageBuffer(messageBuffer));
logger('Stage 1 - Responder sent the message.') logger('Stage 1 - Responder sent the second handshake message.')
} }
} }
// stage 2 // stage 2
async finish(): Promise<void> { async finish(): Promise<void> {
if (this.isInitiator) { if (this.isInitiator) {
logger('Stage 2 - Initiator sending third handshake message.');
const messageBuffer = await this.xx.sendMessage(this.session, Buffer.alloc(0)); const messageBuffer = await this.xx.sendMessage(this.session, Buffer.alloc(0));
this.connection.writeLP(encodeMessageBuffer(messageBuffer)); this.connection.writeLP(encodeMessageBuffer(messageBuffer));
logger('Stage 2 - Initiator sent message.'); logger('Stage 2 - Initiator sent message.');
} else { } else {
logger('Stage 2 - Responder waiting for third handshake message...');
const receivedMessageBuffer = (await this.connection.readLP()).slice(); const receivedMessageBuffer = (await this.connection.readLP()).slice();
const plaintext = await this.xx.recvMessage(this.session, decodeMessageBuffer(receivedMessageBuffer)); const plaintext = await this.xx.recvMessage(this.session, decodeMessageBuffer(receivedMessageBuffer));
logger('Stage 2 - Responder received the message, finished handshake. Got remote\'s static key.') logger('Stage 2 - Responder received the message, finished handshake. Got remote\'s static key.');
} }
} }