This commit is contained in:
morrigan
2019-11-26 14:14:10 +01:00
parent 63826c013d
commit 2af4c744df
5 changed files with 56 additions and 27 deletions

View File

@ -2,8 +2,8 @@ declare module "it-pb-rpc" {
import { Buffer } from "buffer"; import { Buffer } from "buffer";
import { Duplex } from "it-pair"; import { Duplex } from "it-pair";
type WrappedDuplex = { type WrappedDuplex = {
read(bytes: number): Buffer, read(bytes: number): Promise<Buffer>,
readLP(): Buffer, readLP(): Promise<Buffer>,
write(input: Buffer): void, write(input: Buffer): void,
writeLP(input: Buffer): void, writeLP(input: Buffer): void,
unwrap(): Duplex unwrap(): Duplex

View File

@ -10,7 +10,9 @@ interface IReturnEncryptionWrapper {
export function encryptStream(handshake: Handshake, session: NoiseSession) : IReturnEncryptionWrapper { export function encryptStream(handshake: Handshake, session: NoiseSession) : IReturnEncryptionWrapper {
return async function * (source) { return async function * (source) {
for await (const chunk of source) { for await (const chunk of source) {
console.log("chunk: ", chunk);
const data = await handshake.encrypt(chunk, session); const data = await handshake.encrypt(chunk, session);
console.log("encrypted: ", data);
yield data; yield data;
} }
} }

View File

@ -83,18 +83,16 @@ export class Noise implements NoiseConnection {
const prologue = Buffer.from(this.protocol); const prologue = Buffer.from(this.protocol);
const handshake = new Handshake('XX', isInitiator, remotePublicKey, prologue, this.staticKeys, connection); const handshake = new Handshake('XX', isInitiator, remotePublicKey, prologue, this.staticKeys, connection);
console.log("Starting with handshake in createSecureConnection")
const session = await handshake.propose(this.earlyData); const session = await handshake.propose(this.earlyData);
await handshake.exchange(session); await handshake.exchange(session);
await handshake.finish(session); await handshake.finish(session);
console.log("Finished handshake in createSecureConnection")
// Create encryption box/unbox wrapper // Create encryption box/unbox wrapper
const [secure, user] = DuplexPair(); const [secure, user] = DuplexPair();
const network = connection.unwrap(); const network = connection.unwrap();
console.log("Unwrapped network: ", network)
pipe( pipe(
secure, // write to wrapper secure, // write to wrapper
ensureBuffer, // ensure any type of data is converted to buffer ensureBuffer, // ensure any type of data is converted to buffer

View File

@ -28,7 +28,7 @@ export async function createPeerIdsFromFixtures (length) {
export async function createPeerIds (length) { export async function createPeerIds (length) {
const peerIds: any[] = []; const peerIds: any[] = [];
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
const id = await PeerId.create({ keyType: 'ed25519'}); const id = await PeerId.create({ keyType: 'ed25519', bits: 256 });
peerIds.push(id); peerIds.push(id);
} }

View File

@ -21,35 +21,64 @@ describe("Noise", () => {
let remotePeer, localPeer; let remotePeer, localPeer;
before(async () => { before(async () => {
[remotePeer, localPeer] = await createPeerIds(2); // [remotePeer, localPeer] = await createPeerIds(2);
// TODO: Handle Peer ID received ed25519 keys
const pair1 = generateKeypair();
remotePeer = {
id: "id-1",
pubKey: { bytes: pair1.publicKey },
privKey: { bytes: pair1.privateKey },
}
const pair2 = generateKeypair();
localPeer = {
id: "id-2",
pubKey: { bytes: pair2.publicKey },
privKey: { bytes: pair2.privateKey },
}
}); });
it("should test that secureOutbound is spec compliant", async() => { it("should test that secureOutbound is spec compliant", async(done) => {
const libp2pKeys = await generateEd25519Keys(); const libp2pKeys = await generateEd25519Keys();
const noise = new Noise(libp2pKeys._key); const noise = new Noise(libp2pKeys._key);
const [inboundConnection, outboundConnection] = DuplexPair(); const [inboundConnection, outboundConnection] = DuplexPair();
await Promise.all([ const [outbound, inbound] = await Promise.all([
noise.secureOutbound(localPeer, outboundConnection, remotePeer), noise.secureOutbound(localPeer, outboundConnection, remotePeer),
(async () => { noise.secureInbound(remotePeer, inboundConnection, localPeer),
const wrapped = Wrap(inboundConnection);
const prologue = Buffer.from('/noise');
const staticKeys = {
privateKey: remotePeer.privKey.bytes,
publicKey: remotePeer.pubKey.bytes,
};
const handshake = new Handshake('XX', false, localPeer.pubKey.bytes, prologue, staticKeys, wrapped);
// Finish handshake // (async () => {
console.log("Starting with handshake as responder in test..."); // const wrapped = Wrap(inboundConnection);
const sessionResponder = await handshake.propose(Buffer.alloc(0)); // const prologue = Buffer.from('/noise');
await handshake.exchange(sessionResponder); // const staticKeys = {
await handshake.finish(sessionResponder); // privateKey: remotePeer.privKey.bytes,
console.log("Finished handshake as responder in test..."); // publicKey: remotePeer.pubKey.bytes,
// };
// Create the encrypted streams // const handshake = new Handshake('XX', false, localPeer.pubKey.bytes, prologue, staticKeys, wrapped);
})(), //
// // Finish handshake
// const sessionResponder = await handshake.propose(Buffer.alloc(0));
// await handshake.exchange(sessionResponder);
// await handshake.finish(sessionResponder);
//
// // Create the encrypted streams
// console.log(sessionResponder);
// })(),
]); ]);
const wrappedInbound = Wrap(inbound.conn);
const wrappedOutbound = Wrap(outbound.conn);
wrappedInbound.readLP().then((log) => {
console.log("Read this thing: ", log);
done();
});
wrappedOutbound.writeLP(Buffer.from("test"));
console.log("Payload is: ", Buffer.from("test"))
// const response = (await inbound.conn.source.next()).value;
// console.log(response);
}) })
}); });