Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

make 'better' better

Browse source
This commit is contained in:
Bruno Windels 2021-10-20 13:38:54 +02:00
parent d7407ecf66
commit 5dc0c8c0b3
1 changed files with 61 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/matrix/e2ee/megolm/decryption/RoomKey.ts
View file

@ -41,47 +41,38 @@ export interface IRoomKey {
} }
export interface IIncomingRoomKey extends IRoomKey { export interface IIncomingRoomKey extends IRoomKey {
copyEventIds(value: string[]): void; get isBetter(): boolean | undefined;
checkIsBetterThanStorage(keyDeserialization: KeyDeserialization, txn: Transaction): Promise<boolean>;
write(keyDeserialization: KeyDeserialization, txn: Transaction): Promise<boolean>;
} }
export async function checkBetterKeyInStorage(key: IIncomingRoomKey, keyDeserialization: KeyDeserialization, txn: Transaction) { abstract class BaseIncomingRoomKey implements IIncomingRoomKey {
let existingKey = keyDeserialization.cache.get(key.roomId, key.senderKey, key.sessionId); private _eventIds?: string[];
if (!existingKey) { private _isBetter?: boolean;
const storageKey = await fromStorage(key.roomId, key.senderKey, key.sessionId, txn);
// store the event ids that can be decrypted with this key checkBetterKeyInStorage(keyDeserialization: KeyDeserialization, txn: Transaction): Promise<boolean> {
// before we overwrite them if called from `write`. return this._checkBetterKeyInStorage(keyDeserialization, undefined, txn);
if (storageKey) { }
if (storageKey.eventIds) {
key.copyEventIds(storageKey.eventIds); async write(keyDeserialization: KeyDeserialization, pickleKey: string, txn: Transaction): Promise<boolean> {
} // we checked already and we had a better session in storage, so don't write
if (storageKey.hasSession) { let pickledSession;
existingKey = storageKey; if (this._isBetter === undefined) {
} // if this key wasn't used to decrypt any messages in the same sync,
// we haven't checked if this is the best key yet,
// so do that now to not overwrite a better key.
// while we have the key deserialized, also pickle it to store it later on here.
await this._checkBetterKeyInStorage(keyDeserialization, session => {
pickledSession = session.pickle(pickleKey);
}, txn);
}
if (this._isBetter === false) {
return false;
} }
}
if (existingKey) {
const isBetter = await keyDeserialization.useKey(key, newSession => {
return keyDeserialization.useKey(existingKey, existingSession => {
return newSession.first_known_index() < existingSession.first_known_index();
});
});
return isBetter ? key : existingKey;
} else {
return key;
}
}
async function write(olm, pickleKey, keyDeserialization, txn) {
// we checked already and we had a better session in storage, so don't write
if (this._isBetter === false) {
return false;
}
if (!this._sessionInfo) {
await this.createSessionInfo(olm, pickleKey, txn);
}
if (this._sessionInfo) {
// before calling write in parallel, we need to check keyDeserialization.running is false so we are sure our transaction will not be closed // before calling write in parallel, we need to check keyDeserialization.running is false so we are sure our transaction will not be closed
const pickledSession = await keyDeserialization.useKey(this, session => session.pickle(pickleKey)); if (!pickledSession) {
pickledSession = await keyDeserialization.useKey(this, session => session.pickle(pickleKey));
}
const sessionEntry = { const sessionEntry = {
roomId: this.roomId, roomId: this.roomId,
senderKey: this.senderKey, senderKey: this.senderKey,
@ -90,19 +81,44 @@ async function write(olm, pickleKey, keyDeserialization, txn) {
claimedKeys: this._sessionInfo.claimedKeys, claimedKeys: this._sessionInfo.claimedKeys,
}; };
txn.inboundGroupSessions.set(sessionEntry); txn.inboundGroupSessions.set(sessionEntry);
this.dispose();
return true; return true;
} }
return false;
}
class BaseIncomingRoomKey {
private _eventIds?: string[];
get eventIds() { return this._eventIds; } get eventIds() { return this._eventIds; }
get isBetter() { return this._isBetter; }
copyEventIds(eventIds: string[]): void { private async _checkBetterKeyInStorage(keyDeserialization: KeyDeserialization, callback?: (session: OlmInboundGroupSession) => void, txn: Transaction): Promise<boolean> {
this._eventIds = eventIds; if (this._isBetter !== undefined) {
return this._isBetter;
}
let existingKey = keyDeserialization.cache.get(this.roomId, this.senderKey, this.sessionId);
if (!existingKey) {
const storageKey = await fromStorage(this.roomId, this.senderKey, this.sessionId, txn);
// store the event ids that can be decrypted with this key
// before we overwrite them if called from `write`.
if (storageKey) {
if (storageKey.hasSession) {
existingKey = storageKey;
} else if (storageKey.eventIds) {
this._eventIds = storageKey.eventIds;
}
}
}
if (existingKey) {
this._isBetter = await keyDeserialization.useKey(key, newSession => {
return keyDeserialization.useKey(existingKey, existingSession => {
const isBetter = newSession.first_known_index() < existingSession.first_known_index();
if (isBetter && callback) {
callback(newSession);
}
return isBetter;
});
});
} else {
// no previous key, so we're the best \o/
this._isBetter = true;
}
return this._isBetter;
} }
} }