@wireapp/core 36.1.1 → 36.2.0
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/lib/mls/MLSService/MLSService.js +19 -16
- package/lib/mls/MLSService/MLSService.js.map +1 -1
- package/lib/mls/MLSService/commitBundleUtil.d.ts +7 -0
- package/lib/mls/MLSService/commitBundleUtil.js +51 -0
- package/lib/mls/MLSService/commitBundleUtil.js.map +1 -0
- package/lib/mls/MLSService/index.d.ts +1 -0
- package/lib/mls/MLSService/index.js +36 -0
- package/lib/mls/MLSService/index.js.map +1 -0
- package/lib/mls/index.d.ts +1 -1
- package/lib/mls/index.js +1 -1
- package/lib/mls/index.js.map +1 -1
- package/package.json +5 -5
|
@@ -37,6 +37,7 @@ const bazinga64_1 = require("bazinga64");
|
|
|
37
37
|
const logdown_1 = __importDefault(require("logdown"));
|
|
38
38
|
const messageSender_1 = require("../../conversation/message/messageSender");
|
|
39
39
|
const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
|
|
40
|
+
const commitBundleUtil_1 = require("./commitBundleUtil");
|
|
40
41
|
const commons_1 = require("@wireapp/commons");
|
|
41
42
|
const RecurringTaskScheduler_1 = require("../../util/RecurringTaskScheduler");
|
|
42
43
|
const TaskScheduler_1 = require("../../util/TaskScheduler");
|
|
@@ -70,24 +71,26 @@ class MLSService {
|
|
|
70
71
|
}
|
|
71
72
|
return client;
|
|
72
73
|
}
|
|
73
|
-
async uploadCommitBundle(groupId,
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
(
|
|
74
|
+
async uploadCommitBundle(groupId, commitBundle, isExternalCommit) {
|
|
75
|
+
const bundlePayload = (0, commitBundleUtil_1.toProtobufCommitBundle)(commitBundle);
|
|
76
|
+
try {
|
|
77
|
+
const response = await this.apiClient.api.conversation.postMlsCommitBundle(bundlePayload.slice());
|
|
78
|
+
if (isExternalCommit) {
|
|
79
|
+
await this.coreCryptoClient.mergePendingGroupFromExternalCommit(groupId, {});
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
79
82
|
await this.coreCryptoClient.commitAccepted(groupId);
|
|
80
|
-
const newEpoch = await this.getEpoch(groupId);
|
|
81
|
-
const groupIdStr = bazinga64_1.Encoder.toBase64(groupId).asString;
|
|
82
|
-
this.logger.log(`Commit have been accepted for group "${groupIdStr}". New epoch is "${newEpoch}"`);
|
|
83
|
-
if (welcome) {
|
|
84
|
-
// If the commit went well, we can send the Welcome
|
|
85
|
-
//@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
|
|
86
|
-
await this.apiClient.api.conversation.postMlsWelcomeMessage((0, exports.optionalToUint8Array)(welcome));
|
|
87
|
-
}
|
|
88
|
-
return messageResponse;
|
|
89
83
|
}
|
|
90
|
-
|
|
84
|
+
const newEpoch = await this.getEpoch(groupId);
|
|
85
|
+
const groupIdStr = bazinga64_1.Encoder.toBase64(groupId).asString;
|
|
86
|
+
this.logger.log(`Commit have been accepted for group "${groupIdStr}". New epoch is "${newEpoch}"`);
|
|
87
|
+
return response;
|
|
88
|
+
}
|
|
89
|
+
catch (error) {
|
|
90
|
+
if (isExternalCommit) {
|
|
91
|
+
await this.coreCryptoClient.clearPendingGroupFromExternalCommit(groupId);
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
91
94
|
await this.coreCryptoClient.clearPendingCommit(groupId);
|
|
92
95
|
}
|
|
93
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MLSService.js","sourceRoot":"","sources":["../../../src/mls/MLSService/MLSService.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;;AAmBH,yCAAsD;AACtD,sDAA8B;AAE9B,4EAAqE;AACrE,wFAAkF;
|
|
1
|
+
{"version":3,"file":"MLSService.js","sourceRoot":"","sources":["../../../src/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { CommitBundle } from '@wireapp/core-crypto';
|
|
2
|
+
/**
|
|
3
|
+
* Will convert a coreCrypto commit bundle into a Uint8Array representing a protobuf object
|
|
4
|
+
* @param commitBundle a commit bundle generated by coreCrypto
|
|
5
|
+
* @returns
|
|
6
|
+
*/
|
|
7
|
+
export declare function toProtobufCommitBundle({ commit, welcome, publicGroupState }: CommitBundle): Uint8Array;
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* Wire
|
|
4
|
+
* Copyright (C) 2022 Wire Swiss GmbH
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU General Public License as published by
|
|
8
|
+
* the Free Software Foundation, either version 3 of the License, or
|
|
9
|
+
* (at your option) any later version.
|
|
10
|
+
*
|
|
11
|
+
* This program is distributed in the hope that it will be useful,
|
|
12
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
13
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
14
|
+
* GNU General Public License for more details.
|
|
15
|
+
*
|
|
16
|
+
* You should have received a copy of the GNU General Public License
|
|
17
|
+
* along with this program. If not, see http://www.gnu.org/licenses/.
|
|
18
|
+
*
|
|
19
|
+
*/
|
|
20
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
+
exports.toProtobufCommitBundle = void 0;
|
|
22
|
+
const core_crypto_1 = require("@wireapp/core-crypto");
|
|
23
|
+
const mls_1 = require("@wireapp/protocol-messaging/web/mls");
|
|
24
|
+
const ratchetTreeMapping = {
|
|
25
|
+
[core_crypto_1.RatchetTreeType.Full]: mls_1.mls.RatchetTreeType.FULL,
|
|
26
|
+
[core_crypto_1.RatchetTreeType.ByRef]: mls_1.mls.RatchetTreeType.REFERENCE,
|
|
27
|
+
[core_crypto_1.RatchetTreeType.Delta]: mls_1.mls.RatchetTreeType.DELTA,
|
|
28
|
+
};
|
|
29
|
+
const groupInfoType = {
|
|
30
|
+
[core_crypto_1.PublicGroupStateEncryptionType.Plaintext]: mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE,
|
|
31
|
+
[core_crypto_1.PublicGroupStateEncryptionType.JweEncrypted]: mls_1.mls.GroupInfoType.GROUP_INFO_JWE,
|
|
32
|
+
};
|
|
33
|
+
/**
|
|
34
|
+
* Will convert a coreCrypto commit bundle into a Uint8Array representing a protobuf object
|
|
35
|
+
* @param commitBundle a commit bundle generated by coreCrypto
|
|
36
|
+
* @returns
|
|
37
|
+
*/
|
|
38
|
+
function toProtobufCommitBundle({ commit, welcome, publicGroupState }) {
|
|
39
|
+
const { ratchetTreeType, encryptionType } = publicGroupState;
|
|
40
|
+
return mls_1.mls.CommitBundle.encode({
|
|
41
|
+
groupInfoBundle: {
|
|
42
|
+
ratchetTreeType: ratchetTreeMapping[ratchetTreeType],
|
|
43
|
+
groupInfo: publicGroupState.payload,
|
|
44
|
+
groupInfoType: groupInfoType[encryptionType],
|
|
45
|
+
},
|
|
46
|
+
commit,
|
|
47
|
+
welcome,
|
|
48
|
+
}).finish();
|
|
49
|
+
}
|
|
50
|
+
exports.toProtobufCommitBundle = toProtobufCommitBundle;
|
|
51
|
+
//# sourceMappingURL=commitBundleUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commitBundleUtil.js","sourceRoot":"","sources":["../../../src/mls/MLSService/commitBundleUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAEH,sDAAmG;AACnG,6DAAwD;AAExD,MAAM,kBAAkB,GAAiD;IACvE,CAAC,6BAAe,CAAC,IAAI,CAAC,EAAE,SAAG,CAAC,eAAe,CAAC,IAAI;IAChD,CAAC,6BAAe,CAAC,KAAK,CAAC,EAAE,SAAG,CAAC,eAAe,CAAC,SAAS;IACtD,CAAC,6BAAe,CAAC,KAAK,CAAC,EAAE,SAAG,CAAC,eAAe,CAAC,KAAK;CACnD,CAAC;AACF,MAAM,aAAa,GAA8D;IAC/E,CAAC,4CAA8B,CAAC,SAAS,CAAC,EAAE,SAAG,CAAC,aAAa,CAAC,kBAAkB;IAChF,CAAC,4CAA8B,CAAC,YAAY,CAAC,EAAE,SAAG,CAAC,aAAa,CAAC,cAAc;CAChF,CAAC;AAEF;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAe;IACtF,MAAM,EAAC,eAAe,EAAE,cAAc,EAAC,GAAG,gBAAgB,CAAC;IAC3D,OAAO,SAAG,CAAC,YAAY,CAAC,MAAM,CAAC;QAC7B,eAAe,EAAE;YACf,eAAe,EAAE,kBAAkB,CAAC,eAAe,CAAC;YACpD,SAAS,EAAE,gBAAgB,CAAC,OAAO;YACnC,aAAa,EAAE,aAAa,CAAC,cAAc,CAAC;SAC7C;QACD,MAAM;QACN,OAAO;KACR,CAAC,CAAC,MAAM,EAAE,CAAC;AACd,CAAC;AAXD,wDAWC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './MLSService';
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* Wire
|
|
4
|
+
* Copyright (C) 2022 Wire Swiss GmbH
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU General Public License as published by
|
|
8
|
+
* the Free Software Foundation, either version 3 of the License, or
|
|
9
|
+
* (at your option) any later version.
|
|
10
|
+
*
|
|
11
|
+
* This program is distributed in the hope that it will be useful,
|
|
12
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
13
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
14
|
+
* GNU General Public License for more details.
|
|
15
|
+
*
|
|
16
|
+
* You should have received a copy of the GNU General Public License
|
|
17
|
+
* along with this program. If not, see http://www.gnu.org/licenses/.
|
|
18
|
+
*
|
|
19
|
+
*/
|
|
20
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
21
|
+
if (k2 === undefined) k2 = k;
|
|
22
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
23
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
24
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
25
|
+
}
|
|
26
|
+
Object.defineProperty(o, k2, desc);
|
|
27
|
+
}) : (function(o, m, k, k2) {
|
|
28
|
+
if (k2 === undefined) k2 = k;
|
|
29
|
+
o[k2] = m[k];
|
|
30
|
+
}));
|
|
31
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
32
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
33
|
+
};
|
|
34
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
+
__exportStar(require("./MLSService"), exports);
|
|
36
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/mls/MLSService/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAEH,+CAA6B"}
|
package/lib/mls/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './MLSService
|
|
1
|
+
export * from './MLSService';
|
package/lib/mls/index.js
CHANGED
|
@@ -32,5 +32,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
32
32
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
__exportStar(require("./MLSService
|
|
35
|
+
__exportStar(require("./MLSService"), exports);
|
|
36
36
|
//# sourceMappingURL=index.js.map
|
package/lib/mls/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mls/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAEH
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mls/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAEH,+CAA6B"}
|
package/package.json
CHANGED
|
@@ -11,9 +11,9 @@
|
|
|
11
11
|
"./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@wireapp/api-client": "^22.0
|
|
14
|
+
"@wireapp/api-client": "^22.1.0",
|
|
15
15
|
"@wireapp/commons": "^5.0.0",
|
|
16
|
-
"@wireapp/core-crypto": "0.6.0-pre.
|
|
16
|
+
"@wireapp/core-crypto": "0.6.0-pre.4",
|
|
17
17
|
"@wireapp/cryptobox": "12.8.0",
|
|
18
18
|
"@wireapp/promise-queue": "^2.0.0",
|
|
19
19
|
"@wireapp/protocol-messaging": "1.42.0",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"bazinga64": "6.0.0",
|
|
23
23
|
"hash.js": "1.1.7",
|
|
24
24
|
"http-status-codes": "2.2.0",
|
|
25
|
-
"idb": "7.1.
|
|
25
|
+
"idb": "7.1.1",
|
|
26
26
|
"logdown": "3.3.1",
|
|
27
27
|
"long": "^5.2.0",
|
|
28
28
|
"uuidjs": "4.2.12"
|
|
@@ -60,6 +60,6 @@
|
|
|
60
60
|
"test:coverage": "jest --coverage",
|
|
61
61
|
"watch": "tsc --watch"
|
|
62
62
|
},
|
|
63
|
-
"version": "36.
|
|
64
|
-
"gitHead": "
|
|
63
|
+
"version": "36.2.0",
|
|
64
|
+
"gitHead": "60a309392d2c932e8843c894380b8566e8608879"
|
|
65
65
|
}
|