@wireapp/core 17.23.0 → 17.24.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/CHANGELOG.md +11 -0
- package/package.json +2 -2
- package/src/main/Account.d.ts +10 -1
- package/src/main/Account.js +8 -2
- package/src/main/Account.js.map +1 -1
- package/src/main/Account.ts +15 -2
- package/src/main/cryptography/CryptographyService.d.ts +6 -1
- package/src/main/cryptography/CryptographyService.js +6 -2
- package/src/main/cryptography/CryptographyService.js.map +1 -1
- package/src/main/cryptography/CryptographyService.ts +12 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [17.24.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.23.0...@wireapp/core@17.24.0) (2021-11-03)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* **core:** Add option to set a domain on an account ([#4168](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4168)) ([3a5a2a9](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/3a5a2a943a2c7ceb65a4b494af055442be2445bb))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [17.23.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.22.1...@wireapp/core@17.23.0) (2021-11-03)
|
|
7
18
|
|
|
8
19
|
|
package/package.json
CHANGED
|
@@ -69,6 +69,6 @@
|
|
|
69
69
|
"test:project": "yarn dist && yarn test",
|
|
70
70
|
"test:node": "nyc jasmine --config=jasmine.json"
|
|
71
71
|
},
|
|
72
|
-
"version": "17.
|
|
73
|
-
"gitHead": "
|
|
72
|
+
"version": "17.24.0",
|
|
73
|
+
"gitHead": "b7a9f7834610fd5d4a700b406221f59c83680f01"
|
|
74
74
|
}
|
package/src/main/Account.d.ts
CHANGED
|
@@ -52,7 +52,11 @@ export interface Account {
|
|
|
52
52
|
on(event: TOPIC.ERROR, listener: (payload: CoreError) => void): this;
|
|
53
53
|
}
|
|
54
54
|
export declare type StoreEngineProvider = (storeName: string) => Promise<CRUDEngine>;
|
|
55
|
+
declare type AccountConfig = {
|
|
56
|
+
federationDomain?: string;
|
|
57
|
+
};
|
|
55
58
|
export declare class Account extends EventEmitter {
|
|
59
|
+
private readonly config?;
|
|
56
60
|
private readonly apiClient;
|
|
57
61
|
private readonly logger;
|
|
58
62
|
private readonly storeEngineProvider;
|
|
@@ -72,7 +76,12 @@ export declare class Account extends EventEmitter {
|
|
|
72
76
|
team: TeamService;
|
|
73
77
|
user: UserService;
|
|
74
78
|
};
|
|
75
|
-
|
|
79
|
+
/**
|
|
80
|
+
* @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
|
|
81
|
+
* @param storeEngineProvider Used to store info in the database (will create a inMemory engine if undefined)
|
|
82
|
+
* @param config.federationDomain If using a federated backend this will set the default domain for qualified ids. Do not set if using a regular backend
|
|
83
|
+
*/
|
|
84
|
+
constructor(apiClient?: APIClient, storeEngineProvider?: StoreEngineProvider, config?: AccountConfig | undefined);
|
|
76
85
|
private persistCookie;
|
|
77
86
|
get clientId(): string;
|
|
78
87
|
get userId(): string;
|
package/src/main/Account.js
CHANGED
|
@@ -67,8 +67,14 @@ var TOPIC;
|
|
|
67
67
|
TOPIC["ERROR"] = "Account.TOPIC.ERROR";
|
|
68
68
|
})(TOPIC || (TOPIC = {}));
|
|
69
69
|
class Account extends events_1.EventEmitter {
|
|
70
|
-
|
|
70
|
+
/**
|
|
71
|
+
* @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
|
|
72
|
+
* @param storeEngineProvider Used to store info in the database (will create a inMemory engine if undefined)
|
|
73
|
+
* @param config.federationDomain If using a federated backend this will set the default domain for qualified ids. Do not set if using a regular backend
|
|
74
|
+
*/
|
|
75
|
+
constructor(apiClient = new api_client_1.APIClient(), storeEngineProvider, config) {
|
|
71
76
|
super();
|
|
77
|
+
this.config = config;
|
|
72
78
|
this.handlePayload = async (payload) => {
|
|
73
79
|
switch (payload.type) {
|
|
74
80
|
case conversation_1.PayloadBundleType.TIMER_UPDATE: {
|
|
@@ -145,7 +151,7 @@ class Account extends events_1.EventEmitter {
|
|
|
145
151
|
async initServices(storeEngine) {
|
|
146
152
|
const accountService = new account_1.AccountService(this.apiClient);
|
|
147
153
|
const assetService = new conversation_1.AssetService(this.apiClient);
|
|
148
|
-
const cryptographyService = new cryptography_1.CryptographyService(this.apiClient, storeEngine);
|
|
154
|
+
const cryptographyService = new cryptography_1.CryptographyService(this.apiClient, storeEngine, this.config);
|
|
149
155
|
const clientService = new client_2.ClientService(this.apiClient, storeEngine, cryptographyService);
|
|
150
156
|
const connectionService = new connection_1.ConnectionService(this.apiClient);
|
|
151
157
|
const giphyService = new giphy_1.GiphyService(this.apiClient);
|
package/src/main/Account.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Account.js","sourceRoot":"","sources":["Account.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,yDAA6D;AAC7D,oDAA8C;AAE9C,wDAAwH;AACxH,4DAA6E;AAE7E,sDAA6D;AAC7D,8DAAgD;AAChD,wDAA0F;AAC1F,mCAAoC;AACpC,sDAA8B;AAE9B,kCAAuC;AACvC,4CAA8C;AAC9C,sCAAoD;AACpD,8CAAgD;AAChD,kDAMyB;AAIzB,kDAAoD;AACpD,oCAAsC;AACtC,kDAAyE;AACzE,kCAAoC;AACpC,kCAAoC;AACpC,kCAAoC;AACpC,wCAA0C;AAE1C,IAAK,KAEJ;AAFD,WAAK,KAAK;IACR,sCAA6B,CAAA;AAC/B,CAAC,EAFI,KAAK,KAAL,KAAK,QAET;
|
|
1
|
+
{"version":3,"file":"Account.js","sourceRoot":"","sources":["Account.ts"],"names":[],"mappings":"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"}
|
package/src/main/Account.ts
CHANGED
|
@@ -96,6 +96,10 @@ export interface Account {
|
|
|
96
96
|
|
|
97
97
|
export type StoreEngineProvider = (storeName: string) => Promise<CRUDEngine>;
|
|
98
98
|
|
|
99
|
+
type AccountConfig = {
|
|
100
|
+
federationDomain?: string;
|
|
101
|
+
};
|
|
102
|
+
|
|
99
103
|
export class Account extends EventEmitter {
|
|
100
104
|
private readonly apiClient: APIClient;
|
|
101
105
|
private readonly logger: logdown.Logger;
|
|
@@ -118,7 +122,16 @@ export class Account extends EventEmitter {
|
|
|
118
122
|
user: UserService;
|
|
119
123
|
};
|
|
120
124
|
|
|
121
|
-
|
|
125
|
+
/**
|
|
126
|
+
* @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
|
|
127
|
+
* @param storeEngineProvider Used to store info in the database (will create a inMemory engine if undefined)
|
|
128
|
+
* @param config.federationDomain If using a federated backend this will set the default domain for qualified ids. Do not set if using a regular backend
|
|
129
|
+
*/
|
|
130
|
+
constructor(
|
|
131
|
+
apiClient: APIClient = new APIClient(),
|
|
132
|
+
storeEngineProvider?: StoreEngineProvider,
|
|
133
|
+
private readonly config?: AccountConfig,
|
|
134
|
+
) {
|
|
122
135
|
super();
|
|
123
136
|
this.apiClient = apiClient;
|
|
124
137
|
if (storeEngineProvider) {
|
|
@@ -187,7 +200,7 @@ export class Account extends EventEmitter {
|
|
|
187
200
|
public async initServices(storeEngine: CRUDEngine): Promise<void> {
|
|
188
201
|
const accountService = new AccountService(this.apiClient);
|
|
189
202
|
const assetService = new AssetService(this.apiClient);
|
|
190
|
-
const cryptographyService = new CryptographyService(this.apiClient, storeEngine);
|
|
203
|
+
const cryptographyService = new CryptographyService(this.apiClient, storeEngine, this.config);
|
|
191
204
|
|
|
192
205
|
const clientService = new ClientService(this.apiClient, storeEngine, cryptographyService);
|
|
193
206
|
const connectionService = new ConnectionService(this.apiClient);
|
|
@@ -13,13 +13,17 @@ export interface MetaClient extends RegisteredClient {
|
|
|
13
13
|
primary_key: string;
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
|
+
declare type CryptographyServiceOptions = {
|
|
17
|
+
federationDomain?: string;
|
|
18
|
+
};
|
|
16
19
|
export declare class CryptographyService {
|
|
17
20
|
readonly apiClient: APIClient;
|
|
18
21
|
private readonly storeEngine;
|
|
22
|
+
private readonly options?;
|
|
19
23
|
private readonly logger;
|
|
20
24
|
cryptobox: Cryptobox;
|
|
21
25
|
private readonly database;
|
|
22
|
-
constructor(apiClient: APIClient, storeEngine: CRUDEngine);
|
|
26
|
+
constructor(apiClient: APIClient, storeEngine: CRUDEngine, options?: CryptographyServiceOptions | undefined);
|
|
23
27
|
static constructSessionId(userId: string, clientId: string, domain: string | null): string;
|
|
24
28
|
static convertArrayRecipientsToBase64(recipients: OTRRecipients<Uint8Array>): OTRRecipients<string>;
|
|
25
29
|
static convertBase64RecipientsToArray(recipients: OTRRecipients<string>): OTRRecipients<Uint8Array>;
|
|
@@ -34,3 +38,4 @@ export declare class CryptographyService {
|
|
|
34
38
|
resetSession(sessionId: string): Promise<void>;
|
|
35
39
|
decodeGenericMessage(otrMessage: ConversationOtrMessageAddEvent, source: PayloadBundleSource): Promise<PayloadBundle>;
|
|
36
40
|
}
|
|
41
|
+
export {};
|
|
@@ -32,15 +32,17 @@ const util_1 = require("../util");
|
|
|
32
32
|
const CryptographyDatabaseRepository_1 = require("./CryptographyDatabaseRepository");
|
|
33
33
|
const GenericMessageMapper_1 = require("./GenericMessageMapper");
|
|
34
34
|
class CryptographyService {
|
|
35
|
-
constructor(apiClient, storeEngine) {
|
|
35
|
+
constructor(apiClient, storeEngine, options) {
|
|
36
36
|
this.apiClient = apiClient;
|
|
37
37
|
this.storeEngine = storeEngine;
|
|
38
|
+
this.options = options;
|
|
38
39
|
this.cryptobox = new cryptobox_1.Cryptobox(this.storeEngine);
|
|
39
40
|
this.database = new CryptographyDatabaseRepository_1.CryptographyDatabaseRepository(this.storeEngine);
|
|
40
41
|
this.logger = (0, logdown_1.default)('@wireapp/core/cryptography/CryptographyService', {
|
|
41
42
|
logger: console,
|
|
42
43
|
markdown: false,
|
|
43
44
|
});
|
|
45
|
+
this.options = options;
|
|
44
46
|
}
|
|
45
47
|
static constructSessionId(userId, clientId, domain) {
|
|
46
48
|
const baseId = `${userId}@${clientId}`;
|
|
@@ -139,8 +141,10 @@ class CryptographyService {
|
|
|
139
141
|
this.logger.log(`Deleted session ID "${sessionId}".`);
|
|
140
142
|
}
|
|
141
143
|
async decodeGenericMessage(otrMessage, source) {
|
|
144
|
+
var _a;
|
|
142
145
|
const { from, qualified_from, data: { sender, text: cipherText }, } = otrMessage;
|
|
143
|
-
const
|
|
146
|
+
const domain = ((_a = this.options) === null || _a === void 0 ? void 0 : _a.federationDomain) ? (qualified_from === null || qualified_from === void 0 ? void 0 : qualified_from.domain) || this.options.federationDomain : null;
|
|
147
|
+
const sessionId = CryptographyService.constructSessionId(from, sender, domain);
|
|
144
148
|
const decryptedMessage = await this.decrypt(sessionId, cipherText);
|
|
145
149
|
const genericMessage = protocol_messaging_1.GenericMessage.decode(decryptedMessage);
|
|
146
150
|
if (genericMessage.content === conversation_1.GenericMessageType.EPHEMERAL) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CryptographyService.js","sourceRoot":"","sources":["CryptographyService.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;AAcH,kDAA6C;AAC7C,8CAAqD;AACrD,oEAA2D;AAE3D,yCAA2C;AAC3C,sDAA8B;AAE9B,kDAAuF;AAEvF,kCAAsC;AACtC,qFAAgF;AAChF,iEAA4D;
|
|
1
|
+
{"version":3,"file":"CryptographyService.js","sourceRoot":"","sources":["CryptographyService.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,19 +49,28 @@ export interface MetaClient extends RegisteredClient {
|
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
+
type CryptographyServiceOptions = {
|
|
53
|
+
federationDomain?: string;
|
|
54
|
+
};
|
|
55
|
+
|
|
52
56
|
export class CryptographyService {
|
|
53
57
|
private readonly logger: logdown.Logger;
|
|
54
58
|
|
|
55
59
|
public cryptobox: Cryptobox;
|
|
56
60
|
private readonly database: CryptographyDatabaseRepository;
|
|
57
61
|
|
|
58
|
-
constructor(
|
|
62
|
+
constructor(
|
|
63
|
+
readonly apiClient: APIClient,
|
|
64
|
+
private readonly storeEngine: CRUDEngine,
|
|
65
|
+
private readonly options?: CryptographyServiceOptions,
|
|
66
|
+
) {
|
|
59
67
|
this.cryptobox = new Cryptobox(this.storeEngine);
|
|
60
68
|
this.database = new CryptographyDatabaseRepository(this.storeEngine);
|
|
61
69
|
this.logger = logdown('@wireapp/core/cryptography/CryptographyService', {
|
|
62
70
|
logger: console,
|
|
63
71
|
markdown: false,
|
|
64
72
|
});
|
|
73
|
+
this.options = options;
|
|
65
74
|
}
|
|
66
75
|
|
|
67
76
|
public static constructSessionId(userId: string, clientId: string, domain: string | null): string {
|
|
@@ -209,7 +218,8 @@ export class CryptographyService {
|
|
|
209
218
|
data: {sender, text: cipherText},
|
|
210
219
|
} = otrMessage;
|
|
211
220
|
|
|
212
|
-
const
|
|
221
|
+
const domain = this.options?.federationDomain ? qualified_from?.domain || this.options.federationDomain : null;
|
|
222
|
+
const sessionId = CryptographyService.constructSessionId(from, sender, domain);
|
|
213
223
|
const decryptedMessage = await this.decrypt(sessionId, cipherText);
|
|
214
224
|
const genericMessage = GenericMessage.decode(decryptedMessage);
|
|
215
225
|
|