Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto: configure key sharing strategy based on DeviceIsolationMode #4425

Merged
merged 7 commits into from
Sep 30, 2024
Merged

crypto: configure key sharing strategy based on DeviceIsolationMode #4425

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8ca39c
crypto: configure key sharing strategy based on deviceIsolationMode
BillCarsonFr Sep 23, 2024
87f5304
Fix outdated docs referring to old cryptomode
BillCarsonFr Sep 25, 2024
4f4928b
code review: better comment for globalBlacklistUnverifiedDevices option
BillCarsonFr Sep 30, 2024
a41b1f0
RoomEncryptor: Use appropriate default for getBlacklistUnverifiedDevices
BillCarsonFr Sep 30, 2024
670fe2e
do not provide a default value for DeviceIsolationMode for encryption
BillCarsonFr Sep 30, 2024
7b3cf87
Update src/rust-crypto/RoomEncryptor.ts
richvdh Sep 30, 2024
78ca93d
Merge branch 'develop' into valere/invisible_crypto_decryption_flag
richvdh Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/rust-crypto/RoomEncryptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,10 @@ export class RoomEncryptor {
*
* This ensures that we have a megolm session ready to use and that we have shared its key with all the devices
* in the room.
*
* @param globalBlacklistUnverifiedDevices - When `true`, it will not send encrypted messages to unverified devices
* @param deviceIsolationMode - The device isolation mode see {@link DeviceIsolationMode}
* @param globalBlacklistUnverifiedDevices - When `true`, and `deviceIsolationMode` is `AllDevicesIsolationMode`,
* will not send encrypted messages to unverified devices.
* Ignored when `deviceIsolationMode` is `OnlySignedDevicesIsolationMode`.
* @param deviceIsolationMode - The device isolation mode. See {@link DeviceIsolationMode}
richvdh marked this conversation as resolved.
Show resolved Hide resolved
*/
public async prepareForEncryption(
globalBlacklistUnverifiedDevices: boolean,
Expand All @@ -145,8 +146,10 @@ export class RoomEncryptor {
* then, if an event is provided, encrypt it using the session.
*
* @param event - Event to be encrypted, or null if only preparing for encryption (in which case we will pre-share the room key).
* @param globalBlacklistUnverifiedDevices - When `true`, it will not send encrypted messages to unverified devices
* @param deviceIsolationMode - The device isolation mode see {@link DeviceIsolationMode}.
* @param globalBlacklistUnverifiedDevices - When `true`, and `deviceIsolationMode` is `AllDevicesIsolationMode`,
* will not send encrypted messages to unverified devices.
* Ignored when `deviceIsolationMode` is `OnlySignedDevicesIsolationMode`.
* @param deviceIsolationMode - The device isolation mode. See {@link DeviceIsolationMode}.
*/
public encryptEvent(
event: MatrixEvent | null,
Expand Down Expand Up @@ -183,8 +186,10 @@ export class RoomEncryptor {
* in the room.
*
* @param logger - a place to write diagnostics to
* @param globalBlacklistUnverifiedDevices - When `true`, it will not send encrypted messages to unverified devices
* @param deviceIsolationMode - The device isolation mode see {@link DeviceIsolationMode}.
* @param globalBlacklistUnverifiedDevices - When `true`, and `deviceIsolationMode` is `AllDevicesIsolationMode`,
* will not send encrypted messages to unverified devices.
* Ignored when `deviceIsolationMode` is `OnlySignedDevicesIsolationMode`.
* @param deviceIsolationMode - The device isolation mode. See {@link DeviceIsolationMode}.
*/
private async ensureEncryptionSession(
logger: LogSpan,
Expand Down