@dxos/credentials 2.33.7-dev.c2ba88fb → 2.33.8-dev.c77ba621
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.
- package/.rush/temp/package-deps_build.json +20 -20
- package/.rush/temp/package-deps_build_test.json +20 -20
- package/credentials.build.log +11 -11
- package/dist/src/auth/auth-message.d.ts +1 -1
- package/dist/src/auth/auth-message.d.ts.map +1 -1
- package/dist/src/auth/auth-message.js +2 -2
- package/dist/src/auth/auth-message.js.map +1 -1
- package/dist/src/auth/auth-plugin.test.js +6 -5
- package/dist/src/auth/auth-plugin.test.js.map +1 -1
- package/dist/src/auth/auth.test.js.map +1 -1
- package/dist/src/auth/authenticator.js +2 -2
- package/dist/src/auth/authenticator.js.map +1 -1
- package/dist/src/greet/greeter-plugin.test.js +6 -5
- package/dist/src/greet/greeter-plugin.test.js.map +1 -1
- package/dist/src/greet/greeter.d.ts +1 -1
- package/dist/src/greet/greeter.d.ts.map +1 -1
- package/dist/src/greet/greeter.js +2 -2
- package/dist/src/greet/greeter.js.map +1 -1
- package/dist/src/greet/invitation.d.ts +1 -1
- package/dist/src/greet/invitation.d.ts.map +1 -1
- package/dist/src/greet/invitation.js +2 -1
- package/dist/src/greet/invitation.js.map +1 -1
- package/dist/src/identity/identity-message-processor.d.ts +1 -1
- package/dist/src/identity/identity-message-processor.d.ts.map +1 -1
- package/dist/src/identity/identity-message-processor.js +4 -4
- package/dist/src/identity/identity-message-processor.js.map +1 -1
- package/dist/src/identity/seedphrase.test.js +2 -1
- package/dist/src/identity/seedphrase.test.js.map +1 -1
- package/dist/src/keys/filter.d.ts +1 -1
- package/dist/src/keys/filter.d.ts.map +1 -1
- package/dist/src/keys/filter.js +2 -2
- package/dist/src/keys/filter.js.map +1 -1
- package/dist/src/keys/keyring-helpers.d.ts +2 -1
- package/dist/src/keys/keyring-helpers.d.ts.map +1 -1
- package/dist/src/keys/keyring-helpers.js +6 -5
- package/dist/src/keys/keyring-helpers.js.map +1 -1
- package/dist/src/keys/keyring.d.ts +1 -1
- package/dist/src/keys/keyring.d.ts.map +1 -1
- package/dist/src/keys/keyring.js +9 -8
- package/dist/src/keys/keyring.js.map +1 -1
- package/dist/src/keys/keyring.test.js +6 -5
- package/dist/src/keys/keyring.test.js.map +1 -1
- package/dist/src/keys/keystore.js +2 -2
- package/dist/src/keys/keystore.js.map +1 -1
- package/dist/src/keys/signer.d.ts +1 -1
- package/dist/src/keys/signer.d.ts.map +1 -1
- package/dist/src/party/party-credential.d.ts +1 -1
- package/dist/src/party/party-credential.d.ts.map +1 -1
- package/dist/src/party/party-credential.js +7 -6
- package/dist/src/party/party-credential.js.map +1 -1
- package/dist/src/party/party-invitation-manager.js +3 -3
- package/dist/src/party/party-invitation-manager.js.map +1 -1
- package/dist/src/party/party-state.d.ts +1 -1
- package/dist/src/party/party-state.d.ts.map +1 -1
- package/dist/src/party/party-state.js +8 -7
- package/dist/src/party/party-state.js.map +1 -1
- package/dist/src/proto/gen/dxos/halo/keys.d.ts +9 -9
- package/dist/src/proto/gen/index.d.ts.map +1 -1
- package/dist/src/proto/gen/index.js +1 -1
- package/dist/src/proto/gen/index.js.map +1 -1
- package/dist/src/proto/substitutions.d.ts +2 -2
- package/dist/src/proto/substitutions.js +2 -2
- package/dist/src/proto/substitutions.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +12 -12
- package/src/auth/auth-message.ts +1 -1
- package/src/auth/auth-plugin.test.ts +2 -1
- package/src/auth/auth.test.ts +2 -1
- package/src/auth/authenticator.ts +1 -1
- package/src/greet/greeter-plugin.test.ts +2 -1
- package/src/greet/greeter.ts +1 -1
- package/src/greet/invitation.ts +2 -1
- package/src/identity/identity-message-processor.ts +1 -1
- package/src/identity/seedphrase.test.ts +2 -1
- package/src/keys/filter.ts +1 -1
- package/src/keys/keyring-helpers.ts +2 -1
- package/src/keys/keyring.test.ts +2 -1
- package/src/keys/keyring.ts +2 -1
- package/src/keys/keystore.ts +1 -1
- package/src/keys/signer.ts +1 -1
- package/src/party/party-credential.ts +2 -1
- package/src/party/party-invitation-manager.ts +1 -1
- package/src/party/party-state.ts +2 -1
- package/src/proto/gen/dxos/halo/keys.ts +9 -9
- package/src/proto/gen/index.ts +1 -1
- package/src/proto/substitutions.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter.js","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"greeter.js","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.d.ts","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"invitation.d.ts","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI3D;;GAEG;AAEH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,GAAG,CAAA;IACP,SAAS,EAAE,GAAG,CAAA;CACf;AAED;;GAEG;AACH,oBAAY,cAAc,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAEnE;;GAEG;AACH,oBAAY,eAAe,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAE1F,eAAO,MAAM,qBAAqB,EAAE,cAAgD,CAAC;AAErF,eAAO,MAAM,sBAAsB,EAAE,eAC2E,CAAC;AAGjH,oBAAY,kBAAkB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;AAEpD;;;;;;;;;;;GAWG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAiB;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAS;IAEtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA2B;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAE1B;;OAEG;gBACU,QAAQ,EAAE,aAAa,EAClC,eAAe,EAAE,eAAe,EAChC,cAAc,CAAC,EAAE,cAAc,EAC/B,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,UAAU,SAAI;IAQhB,IAAI,EAAE,WAEL;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,KAAK,WAER;IAED,IAAI,QAAQ,cAEX;IAED,IAAI,MAAM,WAET;IAED,IAAI,IAAI,YAEP;IAED,IAAI,KAAK,YAER;IAED,IAAI,SAAS,YAEZ;IAED,IAAI,SAAS,YAEZ;IAED,IAAI,OAAO,YAEV;IAED,IAAI,QAAQ,YAEX;IAED,IAAI,OAAO,YAKV;IAED,IAAI,MAAM,uBAET;IAED;;;OAGG;IACG,MAAM;IAUZ;;;;OAIG;IACG,KAAK;IAiBX;;;OAGG;IACG,SAAS;IAUf;;;OAGG;IACG,QAAQ;IAUd;;;;OAIG;IACG,MAAM;IAaZ;;;OAGG;IACG,QAAQ,CAAE,MAAM,EAAE,MAAM;CAG/B"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Invitation = exports.defaultSecretValidator = exports.defaultSecretProvider = void 0;
|
|
7
7
|
const crypto_1 = require("@dxos/crypto");
|
|
8
|
+
const protocols_1 = require("@dxos/protocols");
|
|
8
9
|
const proto_1 = require("../proto");
|
|
9
10
|
const defaultSecretProvider = async () => Buffer.from('0000');
|
|
10
11
|
exports.defaultSecretProvider = defaultSecretProvider;
|
|
@@ -31,7 +32,7 @@ class Invitation {
|
|
|
31
32
|
this._authNonce = (0, crypto_1.randomBytes)(32);
|
|
32
33
|
this._nonce = (0, crypto_1.randomBytes)(32);
|
|
33
34
|
this._issued = (0, proto_1.createDateTimeString)();
|
|
34
|
-
this._partyKey =
|
|
35
|
+
this._partyKey = protocols_1.PublicKey.from(partyKey);
|
|
35
36
|
this._secretValidator = secretValidator;
|
|
36
37
|
this._secretProvider = secretProvider;
|
|
37
38
|
this._onFinish = onFinish;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,
|
|
1
|
+
{"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../../src/greet/invitation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-message-processor.d.ts","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAa,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"identity-message-processor.d.ts","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAI3D,OAAO,EAAE,UAAU,EAA+B,MAAM,UAAU,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIzC;;;GAGG;AACH,qBAAa,wBAAyB,SAAQ,YAAY;IACxD,MAAM,EAAE,UAAU,CAAC;IAGnB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;gBAE7B,KAAK,EAAE,UAAU;IAQ9B;;;;;OAKG;IACH,IAAI,YAAY,+BAEf;IAED;;;OAGG;IACH,OAAO,CAAE,SAAS,EAAE,aAAa;IASjC;;;OAGG;IACG,cAAc,CAAE,OAAO,EAAE,aAAa;IAkB5C;;;;OAIG;IACG,2BAA2B,CAAE,OAAO,EAAE,aAAa;CAuD1D"}
|
|
@@ -10,7 +10,7 @@ exports.IdentityMessageProcessor = void 0;
|
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
12
|
const events_1 = require("events");
|
|
13
|
-
const
|
|
13
|
+
const protocols_1 = require("@dxos/protocols");
|
|
14
14
|
const identity_1 = require("../identity");
|
|
15
15
|
const keys_1 = require("../keys");
|
|
16
16
|
const party_1 = require("../party");
|
|
@@ -41,7 +41,7 @@ class IdentityMessageProcessor extends events_1.EventEmitter {
|
|
|
41
41
|
*/
|
|
42
42
|
getInfo(publicKey) {
|
|
43
43
|
(0, keys_1.assertValidPublicKey)(publicKey);
|
|
44
|
-
publicKey =
|
|
44
|
+
publicKey = protocols_1.PublicKey.from(publicKey);
|
|
45
45
|
const message = this._infoMessages.get(publicKey.toHex());
|
|
46
46
|
// The saved copy is a SignedMessage, but we only want to return the contents.
|
|
47
47
|
return message ? message.signed.payload : undefined;
|
|
@@ -76,7 +76,7 @@ class IdentityMessageProcessor extends events_1.EventEmitter {
|
|
|
76
76
|
if ((0, party_1.isEnvelope)(message)) {
|
|
77
77
|
// If this message has an Envelope, the Envelope must match this Party.
|
|
78
78
|
signedIdentityInfo = message.signed.payload.envelope.message.payload;
|
|
79
|
-
identityKey =
|
|
79
|
+
identityKey = protocols_1.PublicKey.from(signedIdentityInfo.signed.payload.publicKey);
|
|
80
80
|
partyKey = message.signed.payload.envelope.partyKey;
|
|
81
81
|
(0, assert_1.default)((0, party_1.isSignedMessage)(signedIdentityInfo));
|
|
82
82
|
(0, assert_1.default)(message.signatures);
|
|
@@ -99,7 +99,7 @@ class IdentityMessageProcessor extends events_1.EventEmitter {
|
|
|
99
99
|
else {
|
|
100
100
|
// If this message has no Envelope, the Identity key itself must match the Party.
|
|
101
101
|
signedIdentityInfo = message;
|
|
102
|
-
identityKey =
|
|
102
|
+
identityKey = protocols_1.PublicKey.from(signedIdentityInfo.signed.payload.publicKey);
|
|
103
103
|
partyKey = identityKey;
|
|
104
104
|
}
|
|
105
105
|
// Check the inner message signature.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-message-processor.js","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAC1B,mCAAsC;AAEtC
|
|
1
|
+
{"version":3,"file":"identity-message-processor.js","sourceRoot":"","sources":["../../../src/identity/identity-message-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const expect_1 = __importDefault(require("expect"));
|
|
10
10
|
const crypto_1 = require("@dxos/crypto");
|
|
11
|
+
const protocols_1 = require("@dxos/protocols");
|
|
11
12
|
const keys_1 = require("../keys");
|
|
12
13
|
const proto_1 = require("../proto");
|
|
13
14
|
it('Create cold identity key and recover', async () => {
|
|
@@ -26,7 +27,7 @@ it('Create cold identity key and recover', async () => {
|
|
|
26
27
|
// Recover seed phrase to key pair.
|
|
27
28
|
const recoveredKeyPair = (0, crypto_1.keyPairFromSeedPhrase)(seedPhrase);
|
|
28
29
|
// Verify same key as exported above.
|
|
29
|
-
(0, expect_1.default)(
|
|
30
|
+
(0, expect_1.default)(protocols_1.PublicKey.from(recoveredKeyPair.publicKey)).toEqual(identityKeyRecord.publicKey);
|
|
30
31
|
const newKeyring = new keys_1.Keyring();
|
|
31
32
|
await newKeyring.addKeyRecord({ ...recoveredKeyPair, type: proto_1.KeyType.IDENTITY });
|
|
32
33
|
/* Expect a message signed with the identity key in this new keyring to be verified as
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seedphrase.test.js","sourceRoot":"","sources":["../../../src/identity/seedphrase.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"seedphrase.test.js","sourceRoot":"","sources":["../../../src/identity/seedphrase.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAE5B,yCAAkF;AAClF,+CAA4C;AAE5C,kCAAkC;AAClC,oCAAmC;AAEnC,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;IACpD,8CAA8C;IAC9C,MAAM,UAAU,GAAG,IAAA,2BAAkB,GAAE,CAAC;IACxC,IAAA,gBAAM,EAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,UAAU,EAAE,CAAC;IACpD,IAAA,gBAAM,EAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEpD,yDAAyD;IACzD,MAAM,eAAe,GAAG,IAAA,8BAAqB,EAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,IAAI,cAAO,EAAE,CAAC;IAClC,MAAM,WAAW,CAAC,YAAY,CAAC,EAAE,GAAG,eAAe,EAAE,IAAI,EAAE,eAAO,CAAC,QAAQ,EAAS,CAAC,CAAC;IACtF,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,cAAO,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,eAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACjG,IAAA,gBAAM,EAAC,iBAAiB,CAAC,CAAC,WAAW,EAAE,CAAC;IACxC,IAAA,gBAAM,EAAC,iBAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,eAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAA,gBAAM,EAAC,iBAAkB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;IAE5C,mCAAmC;IACnC,MAAM,gBAAgB,GAAY,IAAA,8BAAqB,EAAC,UAAU,CAAC,CAAC;IAEpE,qCAAqC;IACrC,IAAA,gBAAM,EAAC,qBAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAkB,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,UAAU,GAAG,IAAI,cAAO,EAAE,CAAC;IACjC,MAAM,UAAU,CAAC,YAAY,CAAC,EAAE,GAAG,gBAAgB,EAAE,IAAI,EAAE,eAAO,CAAC,QAAQ,EAAS,CAAC,CAAC;IAEtF;;OAEG;IACH,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAClD,UAAU,CAAC,OAAO,CAAC,cAAO,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,eAAO,CAAC,QAAQ,EAAE,CAAC,CAAQ;KAC7E,CAAC,CAAC;IAEH,2CAA2C;IAC3C,0GAA0G;IAC1G,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":"AAMA,OAAO,EAAa,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":"AAMA,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,oBAAY,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;AAEnD;;GAEG;AACH,qBAAa,MAAM;IACjB;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,MAAM,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc;IAIpE;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,MAAM,EAAE,cAAc,GAAG,cAAc;IAInD;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,GAAG,OAAO,EAAE,cAAc,EAAE,GAAG,cAAc;IAIzD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,QAAQ,EAAE,MAAM,GAAG,cAAc;IAIrD;;OAEG;IACH,MAAM,CAAC,UAAU,CAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc;IAInE;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,GAAG,cAAc;IAIpE;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAE,UAAU,EAAE,GAAG,GAAG,cAAc;CAGjD"}
|
package/dist/src/keys/filter.js
CHANGED
|
@@ -8,7 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Filter = void 0;
|
|
10
10
|
const lodash_matches_1 = __importDefault(require("lodash.matches"));
|
|
11
|
-
const
|
|
11
|
+
const protocols_1 = require("@dxos/protocols");
|
|
12
12
|
/**
|
|
13
13
|
* Utility to create simple filtering predicates.
|
|
14
14
|
*/
|
|
@@ -47,7 +47,7 @@ class Filter {
|
|
|
47
47
|
* Filters objects for required key.
|
|
48
48
|
*/
|
|
49
49
|
static hasKey(property, key) {
|
|
50
|
-
return ({ [property]: value }) =>
|
|
50
|
+
return ({ [property]: value }) => protocols_1.PublicKey.from(value).equals(key);
|
|
51
51
|
}
|
|
52
52
|
/**
|
|
53
53
|
* Filters objects for exact object.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oEAAqC;AAErC
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/keys/filter.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oEAAqC;AAErC,+CAA2D;AAI3D;;GAEG;AACH,MAAa,MAAM;IACjB;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,MAA6B,EAAE,MAAsB;QAClE,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,MAAsB;QAChC,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,GAAG,CAAE,GAAG,OAAyB;QACtC,OAAO,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,WAAW,CAAE,QAAgB;QAClC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,UAAU,CAAE,QAAgB,EAAE,MAAa;QAChD,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,MAAM,CAAE,QAAgB,EAAE,GAAkB;QACjD,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,qBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAE,UAAe;QAC7B,OAAO,IAAA,wBAAO,EAAC,UAAU,CAAC,CAAC;IAC7B,CAAC;CACF;AAlDD,wBAkDC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { KeyPair
|
|
1
|
+
import { KeyPair } from '@dxos/crypto';
|
|
2
|
+
import { PublicKeyLike } from '@dxos/protocols';
|
|
2
3
|
import { KeyChain, KeyRecord, KeyType } from '../proto';
|
|
3
4
|
import { MakeOptional } from '../typedefs';
|
|
4
5
|
import { SecretKey } from './keytype';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring-helpers.d.ts","sourceRoot":"","sources":["../../../src/keys/keyring-helpers.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiB,OAAO,EAAa,aAAa,
|
|
1
|
+
{"version":3,"file":"keyring-helpers.d.ts","sourceRoot":"","sources":["../../../src/keys/keyring-helpers.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiB,OAAO,EAAwC,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAa,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAwB,MAAM,UAAU,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;GAEG;AAEH,eAAO,MAAM,gBAAgB,QAAS,aAAa,YAAY,OAAO,yBAUrE,CAAC;AAEF;;GAEG;AAGH,wBAAgB,oBAAoB,CAAE,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,aAAa,CAGzG;AAED;;GAEG;AAGH,wBAAgB,oBAAoB,CAAE,GAAG,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,SAAS,CAKlG;AAED;;GAEG;AAGH,wBAAgB,kBAAkB,CAAE,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAIhF;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,cAAe,KAAK,SAAS,EAAE,KAAK,CAAC,SAMhE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,cAAe,SAAS,KAAG,SAKnD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,cAAe,QAAQ,SAAS,CAAC,SASlE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,gBAAgB,QAAQ,SAAS,CAAC,YACnD,aAAa,OAAO,EAAE,WAAW,CAAC,KAAqB,SAoBjE,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,kBAAkB,QAAS,GAAG,WAwBzC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,UAAU,SAAS,GAAG,oBAAwI,CAAC;AAE5K;;;GAGG;AACH,eAAO,MAAM,0BAA0B,cAAe,KAAK,SAAS,EAAE,KAAK,CAAC,cAoB3E,CAAC"}
|
|
@@ -13,6 +13,7 @@ exports.checkAndNormalizeKeyRecord = exports.isKeyChain = exports.canonicalStrin
|
|
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
|
14
14
|
const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
|
|
15
15
|
const crypto_1 = require("@dxos/crypto");
|
|
16
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
17
|
const proto_1 = require("../proto");
|
|
17
18
|
/**
|
|
18
19
|
* Checks for a valid publicKey Buffer.
|
|
@@ -20,9 +21,9 @@ const proto_1 = require("../proto");
|
|
|
20
21
|
// TODO(burdon): Move to dxos/crypto.
|
|
21
22
|
const isValidPublicKey = (key, keyType) => {
|
|
22
23
|
try {
|
|
23
|
-
|
|
24
|
+
protocols_1.PublicKey.from(key);
|
|
24
25
|
if (keyType && [proto_1.KeyType.PARTY, proto_1.KeyType.IDENTITY, proto_1.KeyType.FEED, proto_1.KeyType.DEVICE].includes(keyType)) {
|
|
25
|
-
(0, assert_1.default)(
|
|
26
|
+
(0, assert_1.default)(protocols_1.PublicKey.from(key).asUint8Array().length === crypto_1.PUBLIC_KEY_LENGTH);
|
|
26
27
|
}
|
|
27
28
|
return true;
|
|
28
29
|
}
|
|
@@ -105,7 +106,7 @@ exports.assertValidAttributes = assertValidAttributes;
|
|
|
105
106
|
*/
|
|
106
107
|
const createKeyRecord = (attributes = {}, keyPair = (0, crypto_1.createKeyPair)()) => {
|
|
107
108
|
const { publicKey: rawPublicKey, secretKey } = keyPair;
|
|
108
|
-
const publicKey =
|
|
109
|
+
const publicKey = protocols_1.PublicKey.from(rawPublicKey);
|
|
109
110
|
// Disallow invalid attributes.
|
|
110
111
|
(0, exports.assertValidAttributes)(attributes);
|
|
111
112
|
return {
|
|
@@ -137,7 +138,7 @@ const canonicalStringify = (obj) => (0, json_stable_stringify_1.default)(obj, {
|
|
|
137
138
|
return undefined;
|
|
138
139
|
}
|
|
139
140
|
if (value) {
|
|
140
|
-
if (
|
|
141
|
+
if (protocols_1.PublicKey.isPublicKey(value)) {
|
|
141
142
|
return value.toHex();
|
|
142
143
|
}
|
|
143
144
|
if (Buffer.isBuffer(value)) {
|
|
@@ -172,7 +173,7 @@ const checkAndNormalizeKeyRecord = (keyRecord) => {
|
|
|
172
173
|
added: (0, proto_1.createDateTimeString)(),
|
|
173
174
|
...rest
|
|
174
175
|
}, {
|
|
175
|
-
publicKey:
|
|
176
|
+
publicKey: protocols_1.PublicKey.from(publicKey).asBuffer(),
|
|
176
177
|
secretKey: secretKey ? Buffer.from(secretKey) : undefined
|
|
177
178
|
});
|
|
178
179
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring-helpers.js","sourceRoot":"","sources":["../../../src/keys/keyring-helpers.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,EAAE;AACF,oCAAoC;AACpC,EAAE;AAEF,oDAA4B;AAC5B,kFAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"keyring-helpers.js","sourceRoot":"","sources":["../../../src/keys/keyring-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
|
-
import { PublicKey, PublicKeyLike } from '@dxos/
|
|
3
|
+
import { PublicKey, PublicKeyLike } from '@dxos/protocols';
|
|
4
4
|
import { KeyChain, KeyRecord, KeyRecordList, Message, SignedMessage, WithTypeUrl } from '../proto';
|
|
5
5
|
import { RawSignature } from '../typedefs';
|
|
6
6
|
import { FilterFunction } from './filter';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../../src/keys/keyring.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"keyring.d.ts","sourceRoot":"","sources":["../../../src/keys/keyring.ts"],"names":[],"mappings":"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"}
|
package/dist/src/keys/keyring.js
CHANGED
|
@@ -17,6 +17,7 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
17
17
|
const memdown_1 = __importDefault(require("memdown"));
|
|
18
18
|
const async_1 = require("@dxos/async");
|
|
19
19
|
const crypto_1 = require("@dxos/crypto");
|
|
20
|
+
const protocols_1 = require("@dxos/protocols");
|
|
20
21
|
const util_1 = require("@dxos/util");
|
|
21
22
|
const party_1 = require("../party");
|
|
22
23
|
const proto_1 = require("../proto");
|
|
@@ -42,7 +43,7 @@ class SignatureValidationCache {
|
|
|
42
43
|
sigResults = [];
|
|
43
44
|
this._cache.set(obj, sigResults);
|
|
44
45
|
}
|
|
45
|
-
sigResults.push({ valid, sig: Buffer.from(sig), key:
|
|
46
|
+
sigResults.push({ valid, sig: Buffer.from(sig), key: protocols_1.PublicKey.from(key), stringy: (0, keyring_helpers_1.canonicalStringify)(obj) });
|
|
46
47
|
}
|
|
47
48
|
get(obj, sig, key) {
|
|
48
49
|
const sigResults = this._cache.get(obj) || [];
|
|
@@ -142,7 +143,7 @@ class Keyring {
|
|
|
142
143
|
* building up a chain for a DEVICE.
|
|
143
144
|
*/
|
|
144
145
|
static buildKeyChain(publicKey, signedMessageMap, exclude = []) {
|
|
145
|
-
publicKey =
|
|
146
|
+
publicKey = protocols_1.PublicKey.from(publicKey);
|
|
146
147
|
const wrappedMessage = signedMessageMap.get(publicKey.toHex());
|
|
147
148
|
(0, assert_1.default)(wrappedMessage, 'No such message.');
|
|
148
149
|
const message = (0, party_1.unwrapMessage)(wrappedMessage);
|
|
@@ -183,7 +184,7 @@ class Keyring {
|
|
|
183
184
|
const { signed, signatures = [] } = message;
|
|
184
185
|
for (const signature of signatures) {
|
|
185
186
|
if (!validate || Keyring.validateSignature(signed, signature.signature, signature.key.asBuffer())) {
|
|
186
|
-
all.add(
|
|
187
|
+
all.add(protocols_1.PublicKey.from(signature.key).toHex());
|
|
187
188
|
}
|
|
188
189
|
}
|
|
189
190
|
}
|
|
@@ -198,7 +199,7 @@ class Keyring {
|
|
|
198
199
|
}
|
|
199
200
|
}
|
|
200
201
|
}
|
|
201
|
-
return Array.from(all).map(key =>
|
|
202
|
+
return Array.from(all).map(key => protocols_1.PublicKey.from(key));
|
|
202
203
|
}
|
|
203
204
|
/**
|
|
204
205
|
* Validate all the signatures on a signed message.
|
|
@@ -225,7 +226,7 @@ class Keyring {
|
|
|
225
226
|
let result = this._signatureValidationCache.get(message, signature, key);
|
|
226
227
|
if (result === undefined) {
|
|
227
228
|
const stringy = (0, keyring_helpers_1.canonicalStringify)(message);
|
|
228
|
-
result = Keyring.cryptoVerify(Buffer.from(stringy), Buffer.from(signature),
|
|
229
|
+
result = Keyring.cryptoVerify(Buffer.from(stringy), Buffer.from(signature), protocols_1.PublicKey.from(key).asBuffer());
|
|
229
230
|
this._signatureValidationCache.set(message, signature, key, result);
|
|
230
231
|
}
|
|
231
232
|
return result;
|
|
@@ -394,7 +395,7 @@ class Keyring {
|
|
|
394
395
|
*/
|
|
395
396
|
getFullKey(publicKey) {
|
|
396
397
|
(0, keyring_helpers_1.assertValidPublicKey)(publicKey);
|
|
397
|
-
publicKey =
|
|
398
|
+
publicKey = protocols_1.PublicKey.from(publicKey);
|
|
398
399
|
return this._findFullKey(filter_1.Filter.hasKey('publicKey', publicKey));
|
|
399
400
|
}
|
|
400
401
|
/**
|
|
@@ -469,7 +470,7 @@ class Keyring {
|
|
|
469
470
|
const parsed = JSON.parse(value);
|
|
470
471
|
return Promise.all(parsed.keys.map((item) => {
|
|
471
472
|
if (item.publicKey) {
|
|
472
|
-
item.publicKey =
|
|
473
|
+
item.publicKey = protocols_1.PublicKey.from(item.publicKey);
|
|
473
474
|
}
|
|
474
475
|
if (item.secretKey) {
|
|
475
476
|
item.secretKey = (0, crypto_1.keyToBuffer)(item.secretKey);
|
|
@@ -530,7 +531,7 @@ class Keyring {
|
|
|
530
531
|
const chains = new Map();
|
|
531
532
|
const fullKeys = [];
|
|
532
533
|
keys.forEach((key) => {
|
|
533
|
-
const fullKey = this.getFullKey(key instanceof
|
|
534
|
+
const fullKey = this.getFullKey(key instanceof protocols_1.PublicKey ? key : key.publicKey);
|
|
534
535
|
(0, assert_1.default)(fullKey);
|
|
535
536
|
(0, keyring_helpers_1.assertValidKeyPair)(fullKey);
|
|
536
537
|
fullKeys.push(fullKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../../src/keys/keyring.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"keyring.js","sourceRoot":"","sources":["../../../src/keys/keyring.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const expect_1 = __importDefault(require("expect"));
|
|
12
12
|
const crypto_1 = require("@dxos/crypto");
|
|
13
|
+
const protocols_1 = require("@dxos/protocols");
|
|
13
14
|
const proto_1 = require("../proto");
|
|
14
15
|
const filter_1 = require("./filter");
|
|
15
16
|
const keyring_1 = require("./keyring");
|
|
@@ -56,7 +57,7 @@ it('Add/retrieve single keyRecord from an external source', async () => {
|
|
|
56
57
|
const keyring = new keyring_1.Keyring();
|
|
57
58
|
await keyring.addKeyRecord(external);
|
|
58
59
|
const internal = keyring.getKey(external.publicKey);
|
|
59
|
-
(0, expect_1.default)(internal.publicKey).toEqual(
|
|
60
|
+
(0, expect_1.default)(internal.publicKey).toEqual(protocols_1.PublicKey.from(external.publicKey));
|
|
60
61
|
(0, expect_1.default)(keyring.hasSecretKey(internal)).toBe(true);
|
|
61
62
|
});
|
|
62
63
|
it('Try to add/retrieve a publicKey from an external source (with secret present)', async () => {
|
|
@@ -69,7 +70,7 @@ it('Add/retrieve a publicKey from an external source (without secret present)',
|
|
|
69
70
|
const keyring = new keyring_1.Keyring();
|
|
70
71
|
await keyring.addPublicKey(external);
|
|
71
72
|
const stored = keyring.getKey(external.publicKey);
|
|
72
|
-
(0, expect_1.default)(
|
|
73
|
+
(0, expect_1.default)(protocols_1.PublicKey.from(external.publicKey)).toEqual(stored.publicKey);
|
|
73
74
|
(0, expect_1.default)(keyring.hasSecretKey(stored)).toBe(false);
|
|
74
75
|
});
|
|
75
76
|
it('Retrieve a non-existent key', async () => {
|
|
@@ -84,7 +85,7 @@ it('Sign and verify a message with a single key', async () => {
|
|
|
84
85
|
keyring.findKey(keyring_1.Keyring.signingFilter({ type: proto_1.KeyType.IDENTITY }))
|
|
85
86
|
]);
|
|
86
87
|
(0, expect_1.default)(signed.signatures.length).toBe(1);
|
|
87
|
-
(0, expect_1.default)(
|
|
88
|
+
(0, expect_1.default)(protocols_1.PublicKey.from(signed.signatures[0].key)).toEqual(original.publicKey);
|
|
88
89
|
const verified = keyring.verify(signed);
|
|
89
90
|
(0, expect_1.default)(verified).toBe(true);
|
|
90
91
|
});
|
|
@@ -120,7 +121,7 @@ it('Sign and verify a message using a key chain', async () => {
|
|
|
120
121
|
const deviceABChain = keyring_1.Keyring.buildKeyChain(deviceAB.publicKey, keyMessages);
|
|
121
122
|
const signed = keyringA.sign({ message: 'Test' }, [deviceABChain]);
|
|
122
123
|
(0, expect_1.default)(signed.signatures.length).toBe(1);
|
|
123
|
-
(0, expect_1.default)(
|
|
124
|
+
(0, expect_1.default)(protocols_1.PublicKey.from(signed.signatures[0].key).toHex()).toEqual(deviceAB.publicKey.toHex());
|
|
124
125
|
(0, expect_1.default)(signed.signatures[0].keyChain).toBeTruthy();
|
|
125
126
|
{
|
|
126
127
|
const verified = keyringA.verify(signed);
|
|
@@ -304,7 +305,7 @@ it('Authenticate flow for Kube/Keyhole authentication', async () => {
|
|
|
304
305
|
it('Storing DXNS Address keys', async () => {
|
|
305
306
|
const keyring = new keyring_1.Keyring();
|
|
306
307
|
const secretKey = Buffer.from('sock force bubble lock tank staff cycle extra tobacco super sniff bachelor');
|
|
307
|
-
const publicKey =
|
|
308
|
+
const publicKey = protocols_1.PublicKey.fromHex('ba44cf74f42e924d864f0aa362f6ae3788ba8500d1245fa3c863113d2f001d37');
|
|
308
309
|
await keyring.addKeyRecord({
|
|
309
310
|
secretKey,
|
|
310
311
|
publicKey,
|