matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

only re-try creating olm sessions for servers that failed to respond

Browse Source 
If the server responded, then retrying likely won't help.  Retrying is mainly
to help with slow servers.
This commit is contained in:
Hubert Chathi
2020-03-23 22:36:10 -04:00
parent 4d63f8ed04
commit 4f112e8379
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/crypto/algorithms/megolm.js
View File

@@ -277,9 +277,10 @@ MegolmEncryption.prototype._ensureOutboundSession = async function(
// shorter timeout when fetching one-time keys for the first
// phase.
const start = Date.now();
const failedServers = [];
await this._shareKeyWithDevices(
session, key, payload, devicesWithoutSession, errorDevices,
singleOlmCreationPhase ? 10000 : 2000,
singleOlmCreationPhase ? 10000 : 2000, failedServers,
);
if (!singleOlmCreationPhase && (Date.now() - start < 10000)) {
@@ -289,11 +290,19 @@ MegolmEncryption.prototype._ensureOutboundSession = async function(
// Retry sending keys to devices that we were unable to establish
// an olm session for. This time, we use a longer timeout, but we
// do this in the background and don't block anything else while we
// do this.
// do this. We only need to retry users from servers that didn't
// respond the first time.
const retryDevices = {};
const failedServerMap = new Set;
for (const server of failedServers) {
failedServerMap.add(server);
}
for (const {userId, deviceInfo} of errorDevices) {
retryDevices[userId] = retryDevices[userId] || [];
retryDevices[userId].push(deviceInfo);
const userHS = userId.slice(userId.indexOf(":") + 1);
if (failedServerMap.has(userHS)) {
retryDevices[userId] = retryDevices[userId] || [];
retryDevices[userId].push(deviceInfo);
}
}
const failedDevices = [];
@@ -702,12 +711,15 @@ MegolmEncryption.prototype.reshareKeyWithDevice = async function(
*
* @param {Number} [otkTimeout] The timeout in milliseconds when requesting
* one-time keys for establishing new olm sessions.
*
* @param {Array} [failedServers] An array to fill with remote servers that
* failed to respond to one-time-key requests.
*/
MegolmEncryption.prototype._shareKeyWithDevices = async function(
session, key, payload, devicesByUser, errorDevices, otkTimeout,
session, key, payload, devicesByUser, errorDevices, otkTimeout, failedServers,
) {
const devicemap = await olmlib.ensureOlmSessionsForDevices(
this._olmDevice, this._baseApis, devicesByUser, otkTimeout,
this._olmDevice, this._baseApis, devicesByUser, otkTimeout, failedServers,
);
this._getDevicesWithoutSessions(devicemap, devicesByUser, errorDevices);

10
src/crypto/olmlib.js
View File

@@ -180,14 +180,18 @@ export async function getExistingOlmSessions(
* @param {Number} [otkTimeout] The timeout in milliseconds when requesting
* one-time keys for establishing new olm sessions.
*
* @param {Array} [failedServers] An array to fill with remote servers that
* failed to respond to one-time-key requests.
*
* @return {Promise} resolves once the sessions are complete, to
* an Object mapping from userId to deviceId to
* {@link module:crypto~OlmSessionResult}
*/
export async function ensureOlmSessionsForDevices(
olmDevice, baseApis, devicesByUser, force, otkTimeout,
olmDevice, baseApis, devicesByUser, force, otkTimeout, failedServers,
) {
if (typeof force === "number") {
failedServers = otkTimeout;
otkTimeout = force;
force = false;
}
@@ -261,6 +265,10 @@ export async function ensureOlmSessionsForDevices(
throw e;
}
if (failedServers && "failures" in res) {
failedServers.push(...Object.keys(res.failures));
}
const otk_res = res.one_time_keys || {};
const promises = [];
for (const [userId, devices] of Object.entries(devicesByUser)) {