@libp2p/interface-compliance-tests 7.0.33-974e63f20 → 7.0.33-be63a4416
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connection-encryption/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAU,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEhF,MAAM,WAAW,4BAA4B;IAC3C,UAAU,EAAE,UAAU,CAAA;CACvB;yBAEe,QAAQ,SAAS,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,KAAG,IAAI;AAA3F,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connection-encryption/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAU,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEhF,MAAM,WAAW,4BAA4B;IAC3C,UAAU,EAAE,UAAU,CAAA;CACvB;yBAEe,QAAQ,SAAS,CAAC,mBAAmB,EAAE,4BAA4B,CAAC,KAAG,IAAI;AAA3F,wBAiMC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { generateKeyPair } from '@libp2p/crypto/keys';
|
|
2
|
-
import { peerIdFromPrivateKey } from '@libp2p/peer-id';
|
|
2
|
+
import { peerIdFromPrivateKey, peerIdFromString } from '@libp2p/peer-id';
|
|
3
3
|
import { multiaddrConnectionPair, echo } from '@libp2p/utils';
|
|
4
4
|
import { expect } from 'aegir/chai';
|
|
5
5
|
import all from 'it-all';
|
|
@@ -88,6 +88,70 @@ export default (common) => {
|
|
|
88
88
|
expect(err).to.have.property('name', 'UnexpectedPeerError');
|
|
89
89
|
});
|
|
90
90
|
});
|
|
91
|
+
describe('remote peer id parsed from a string', () => {
|
|
92
|
+
let rsaPeer;
|
|
93
|
+
let cryptoRsa;
|
|
94
|
+
before(async () => {
|
|
95
|
+
const rsaKey = await generateKeyPair('RSA', 512);
|
|
96
|
+
rsaPeer = peerIdFromPrivateKey(rsaKey);
|
|
97
|
+
cryptoRsa = await common.setup({
|
|
98
|
+
privateKey: rsaKey
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
async function secure(opts) {
|
|
102
|
+
const [remoteConn, localConn] = multiaddrConnectionPair();
|
|
103
|
+
try {
|
|
104
|
+
const [inboundResult, outboundResult] = await Promise.all([
|
|
105
|
+
opts.responder.secureInbound(localConn, {
|
|
106
|
+
remotePeer: opts.expectedByResponder
|
|
107
|
+
}),
|
|
108
|
+
opts.initiator.secureOutbound(remoteConn, {
|
|
109
|
+
remotePeer: opts.expectedByInitiator
|
|
110
|
+
})
|
|
111
|
+
]);
|
|
112
|
+
return { inbound: inboundResult.remotePeer, outbound: outboundResult.remotePeer };
|
|
113
|
+
}
|
|
114
|
+
finally {
|
|
115
|
+
localConn.abort(new Error('test finished'));
|
|
116
|
+
remoteConn.abort(new Error('test finished'));
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
function parse(peerId) {
|
|
120
|
+
return peerIdFromString(peerId.toString());
|
|
121
|
+
}
|
|
122
|
+
it('should match an RSA peer id on outbound connections', async () => {
|
|
123
|
+
const expected = parse(rsaPeer);
|
|
124
|
+
expect(expected.publicKey).to.be.undefined();
|
|
125
|
+
const { outbound } = await secure({ initiator: crypto, responder: cryptoRsa, expectedByInitiator: expected });
|
|
126
|
+
expect(outbound.equals(rsaPeer)).to.be.true();
|
|
127
|
+
});
|
|
128
|
+
it('should not match an RSA peer id against a different key on outbound connections', async () => {
|
|
129
|
+
const expected = parse(rsaPeer);
|
|
130
|
+
expect(expected.publicKey).to.be.undefined();
|
|
131
|
+
await expect(secure({ initiator: crypto, responder: cryptoRemote, expectedByInitiator: expected })).to.eventually.be.rejected
|
|
132
|
+
.with.property('name', 'UnexpectedPeerError');
|
|
133
|
+
});
|
|
134
|
+
it('should match an RSA peer id on inbound connections', async () => {
|
|
135
|
+
const expected = parse(rsaPeer);
|
|
136
|
+
expect(expected.publicKey).to.be.undefined();
|
|
137
|
+
const { inbound } = await secure({ initiator: cryptoRsa, responder: cryptoRemote, expectedByResponder: expected });
|
|
138
|
+
expect(inbound.equals(rsaPeer)).to.be.true();
|
|
139
|
+
});
|
|
140
|
+
it('should not match an RSA peer id against a different key on inbound connections', async () => {
|
|
141
|
+
const expected = parse(rsaPeer);
|
|
142
|
+
expect(expected.publicKey).to.be.undefined();
|
|
143
|
+
await expect(secure({ initiator: crypto, responder: cryptoRemote, expectedByResponder: expected })).to.eventually.be.rejected
|
|
144
|
+
.with.property('name', 'UnexpectedPeerError');
|
|
145
|
+
});
|
|
146
|
+
it('should match an Ed25519 peer id', async () => {
|
|
147
|
+
const { outbound } = await secure({ initiator: crypto, responder: cryptoRemote, expectedByInitiator: parse(remotePeer) });
|
|
148
|
+
expect(outbound.equals(remotePeer)).to.be.true();
|
|
149
|
+
});
|
|
150
|
+
it('should not match a different Ed25519 peer id', async () => {
|
|
151
|
+
await expect(secure({ initiator: crypto, responder: cryptoRemote, expectedByInitiator: parse(mitmPeer) })).to.eventually.be.rejected
|
|
152
|
+
.with.property('name', 'UnexpectedPeerError');
|
|
153
|
+
});
|
|
154
|
+
});
|
|
91
155
|
});
|
|
92
156
|
};
|
|
93
157
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connection-encryption/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connection-encryption/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/interface-compliance-tests",
|
|
3
|
-
"version": "7.0.33-
|
|
3
|
+
"version": "7.0.33-be63a4416",
|
|
4
4
|
"description": "Compliance tests for JS libp2p interfaces",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/interface-compliance-tests#readme",
|
|
@@ -86,15 +86,15 @@
|
|
|
86
86
|
"test:electron-main": "aegir test -t electron-main"
|
|
87
87
|
},
|
|
88
88
|
"dependencies": {
|
|
89
|
-
"@libp2p/crypto": "5.1.24-
|
|
90
|
-
"@libp2p/echo": "3.1.15-
|
|
91
|
-
"@libp2p/interface": "3.3.1-
|
|
92
|
-
"@libp2p/interface-internal": "3.1.14-
|
|
93
|
-
"@libp2p/logger": "6.2.14-
|
|
94
|
-
"@libp2p/memory": "2.0.29-
|
|
95
|
-
"@libp2p/peer-id": "6.0.16-
|
|
96
|
-
"@libp2p/plaintext": "3.0.29-
|
|
97
|
-
"@libp2p/utils": "7.4.2-
|
|
89
|
+
"@libp2p/crypto": "5.1.24-be63a4416",
|
|
90
|
+
"@libp2p/echo": "3.1.15-be63a4416",
|
|
91
|
+
"@libp2p/interface": "3.3.1-be63a4416",
|
|
92
|
+
"@libp2p/interface-internal": "3.1.14-be63a4416",
|
|
93
|
+
"@libp2p/logger": "6.2.14-be63a4416",
|
|
94
|
+
"@libp2p/memory": "2.0.29-be63a4416",
|
|
95
|
+
"@libp2p/peer-id": "6.0.16-be63a4416",
|
|
96
|
+
"@libp2p/plaintext": "3.0.29-be63a4416",
|
|
97
|
+
"@libp2p/utils": "7.4.2-be63a4416",
|
|
98
98
|
"@multiformats/multiaddr": "^13.0.3",
|
|
99
99
|
"@multiformats/multiaddr-matcher": "^3.0.2",
|
|
100
100
|
"aegir": "^48.1.1",
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
"it-map": "^3.1.4",
|
|
105
105
|
"it-pushable": "^3.2.3",
|
|
106
106
|
"it-to-buffer": "^5.0.0",
|
|
107
|
-
"libp2p": "3.3.12-
|
|
107
|
+
"libp2p": "3.3.12-be63a4416",
|
|
108
108
|
"p-defer": "^4.0.1",
|
|
109
109
|
"p-event": "^7.0.0",
|
|
110
110
|
"p-retry": "^8.0.0",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { generateKeyPair } from '@libp2p/crypto/keys'
|
|
2
|
-
import { peerIdFromPrivateKey } from '@libp2p/peer-id'
|
|
2
|
+
import { peerIdFromPrivateKey, peerIdFromString } from '@libp2p/peer-id'
|
|
3
3
|
import { multiaddrConnectionPair, echo } from '@libp2p/utils'
|
|
4
4
|
import { expect } from 'aegir/chai'
|
|
5
5
|
import all from 'it-all'
|
|
@@ -119,5 +119,91 @@ export default (common: TestSetup<ConnectionEncrypter, ConnectionEncrypterSetupA
|
|
|
119
119
|
expect(err).to.have.property('name', 'UnexpectedPeerError')
|
|
120
120
|
})
|
|
121
121
|
})
|
|
122
|
+
|
|
123
|
+
describe('remote peer id parsed from a string', () => {
|
|
124
|
+
let rsaPeer: PeerId
|
|
125
|
+
let cryptoRsa: ConnectionEncrypter
|
|
126
|
+
|
|
127
|
+
before(async () => {
|
|
128
|
+
const rsaKey = await generateKeyPair('RSA', 512)
|
|
129
|
+
rsaPeer = peerIdFromPrivateKey(rsaKey)
|
|
130
|
+
cryptoRsa = await common.setup({
|
|
131
|
+
privateKey: rsaKey
|
|
132
|
+
})
|
|
133
|
+
})
|
|
134
|
+
|
|
135
|
+
interface SecureOptions {
|
|
136
|
+
initiator: ConnectionEncrypter
|
|
137
|
+
responder: ConnectionEncrypter
|
|
138
|
+
expectedByInitiator?: PeerId
|
|
139
|
+
expectedByResponder?: PeerId
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
async function secure (opts: SecureOptions): Promise<{ inbound: PeerId, outbound: PeerId }> {
|
|
143
|
+
const [remoteConn, localConn] = multiaddrConnectionPair()
|
|
144
|
+
|
|
145
|
+
try {
|
|
146
|
+
const [inboundResult, outboundResult] = await Promise.all([
|
|
147
|
+
opts.responder.secureInbound(localConn, {
|
|
148
|
+
remotePeer: opts.expectedByResponder
|
|
149
|
+
}),
|
|
150
|
+
opts.initiator.secureOutbound(remoteConn, {
|
|
151
|
+
remotePeer: opts.expectedByInitiator
|
|
152
|
+
})
|
|
153
|
+
])
|
|
154
|
+
|
|
155
|
+
return { inbound: inboundResult.remotePeer, outbound: outboundResult.remotePeer }
|
|
156
|
+
} finally {
|
|
157
|
+
localConn.abort(new Error('test finished'))
|
|
158
|
+
remoteConn.abort(new Error('test finished'))
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
function parse (peerId: PeerId): PeerId {
|
|
163
|
+
return peerIdFromString(peerId.toString())
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
it('should match an RSA peer id on outbound connections', async () => {
|
|
167
|
+
const expected = parse(rsaPeer)
|
|
168
|
+
expect(expected.publicKey).to.be.undefined()
|
|
169
|
+
|
|
170
|
+
const { outbound } = await secure({ initiator: crypto, responder: cryptoRsa, expectedByInitiator: expected })
|
|
171
|
+
expect(outbound.equals(rsaPeer)).to.be.true()
|
|
172
|
+
})
|
|
173
|
+
|
|
174
|
+
it('should not match an RSA peer id against a different key on outbound connections', async () => {
|
|
175
|
+
const expected = parse(rsaPeer)
|
|
176
|
+
expect(expected.publicKey).to.be.undefined()
|
|
177
|
+
|
|
178
|
+
await expect(secure({ initiator: crypto, responder: cryptoRemote, expectedByInitiator: expected })).to.eventually.be.rejected
|
|
179
|
+
.with.property('name', 'UnexpectedPeerError')
|
|
180
|
+
})
|
|
181
|
+
|
|
182
|
+
it('should match an RSA peer id on inbound connections', async () => {
|
|
183
|
+
const expected = parse(rsaPeer)
|
|
184
|
+
expect(expected.publicKey).to.be.undefined()
|
|
185
|
+
|
|
186
|
+
const { inbound } = await secure({ initiator: cryptoRsa, responder: cryptoRemote, expectedByResponder: expected })
|
|
187
|
+
expect(inbound.equals(rsaPeer)).to.be.true()
|
|
188
|
+
})
|
|
189
|
+
|
|
190
|
+
it('should not match an RSA peer id against a different key on inbound connections', async () => {
|
|
191
|
+
const expected = parse(rsaPeer)
|
|
192
|
+
expect(expected.publicKey).to.be.undefined()
|
|
193
|
+
|
|
194
|
+
await expect(secure({ initiator: crypto, responder: cryptoRemote, expectedByResponder: expected })).to.eventually.be.rejected
|
|
195
|
+
.with.property('name', 'UnexpectedPeerError')
|
|
196
|
+
})
|
|
197
|
+
|
|
198
|
+
it('should match an Ed25519 peer id', async () => {
|
|
199
|
+
const { outbound } = await secure({ initiator: crypto, responder: cryptoRemote, expectedByInitiator: parse(remotePeer) })
|
|
200
|
+
expect(outbound.equals(remotePeer)).to.be.true()
|
|
201
|
+
})
|
|
202
|
+
|
|
203
|
+
it('should not match a different Ed25519 peer id', async () => {
|
|
204
|
+
await expect(secure({ initiator: crypto, responder: cryptoRemote, expectedByInitiator: parse(mitmPeer) })).to.eventually.be.rejected
|
|
205
|
+
.with.property('name', 'UnexpectedPeerError')
|
|
206
|
+
})
|
|
207
|
+
})
|
|
122
208
|
})
|
|
123
209
|
}
|