fix: Cleanup nullsafe encryption a bit
This commit is contained in:
parent
da80658c09
commit
1c838e3be8
|
|
@ -149,8 +149,7 @@ class Encryption {
|
||||||
runInRoot(() => keyVerificationManager.handleEventUpdate(update));
|
runInRoot(() => keyVerificationManager.handleEventUpdate(update));
|
||||||
}
|
}
|
||||||
if (update.content['sender'] == client.userID &&
|
if (update.content['sender'] == client.userID &&
|
||||||
(!update.content.containsKey('unsigned') ||
|
update.content['unsigned']?['transaction_id'] == null) {
|
||||||
!update.content['unsigned'].containsKey('transaction_id'))) {
|
|
||||||
// maybe we need to re-try SSSS secrets
|
// maybe we need to re-try SSSS secrets
|
||||||
// ignore: unawaited_futures
|
// ignore: unawaited_futures
|
||||||
runInRoot(() => ssss.periodicallyRequestMissingCache());
|
runInRoot(() => ssss.periodicallyRequestMissingCache());
|
||||||
|
|
@ -375,17 +374,15 @@ class Encryption {
|
||||||
|
|
||||||
Future<void> autovalidateMasterOwnKey() async {
|
Future<void> autovalidateMasterOwnKey() async {
|
||||||
// check if we can set our own master key as verified, if it isn't yet
|
// check if we can set our own master key as verified, if it isn't yet
|
||||||
|
final masterKey = client.userDeviceKeys[client.userID]?.masterKey;
|
||||||
if (client.database != null &&
|
if (client.database != null &&
|
||||||
client.userDeviceKeys.containsKey(client.userID)) {
|
masterKey != null &&
|
||||||
final masterKey = client.userDeviceKeys[client.userID]!.masterKey;
|
|
||||||
if (masterKey != null &&
|
|
||||||
!masterKey.directVerified &&
|
!masterKey.directVerified &&
|
||||||
masterKey
|
masterKey
|
||||||
.hasValidSignatureChain(onlyValidateUserIds: {client.userID})) {
|
.hasValidSignatureChain(onlyValidateUserIds: {client.userID})) {
|
||||||
await masterKey.setVerified(true);
|
await masterKey.setVerified(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// this method is responsible for all background tasks, such as uploading online key backups
|
// this method is responsible for all background tasks, such as uploading online key backups
|
||||||
bool _backgroundTasksRunning = true;
|
bool _backgroundTasksRunning = true;
|
||||||
|
|
|
||||||
|
|
@ -146,10 +146,10 @@ class KeyManager {
|
||||||
newSession.dispose();
|
newSession.dispose();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!_inboundGroupSessions.containsKey(roomId)) {
|
|
||||||
_inboundGroupSessions[roomId] = <String, SessionKey>{};
|
final roomInboundGroupSessions =
|
||||||
}
|
_inboundGroupSessions[roomId] ??= <String, SessionKey>{};
|
||||||
_inboundGroupSessions[roomId]![sessionId] = newSession;
|
roomInboundGroupSessions[sessionId] = newSession;
|
||||||
if (!client.isLogged() || client.encryption == null) {
|
if (!client.isLogged() || client.encryption == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -189,9 +189,8 @@ class KeyManager {
|
||||||
SessionKey? getInboundGroupSession(
|
SessionKey? getInboundGroupSession(
|
||||||
String roomId, String sessionId, String senderKey,
|
String roomId, String sessionId, String senderKey,
|
||||||
{bool otherRooms = true}) {
|
{bool otherRooms = true}) {
|
||||||
if (_inboundGroupSessions.containsKey(roomId) &&
|
final sess = _inboundGroupSessions[roomId]?[sessionId];
|
||||||
_inboundGroupSessions[roomId]!.containsKey(sessionId)) {
|
if (sess != null) {
|
||||||
final sess = _inboundGroupSessions[roomId]![sessionId]!;
|
|
||||||
if (sess.senderKey != senderKey && sess.senderKey.isNotEmpty) {
|
if (sess.senderKey != senderKey && sess.senderKey.isNotEmpty) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
@ -202,8 +201,8 @@ class KeyManager {
|
||||||
}
|
}
|
||||||
// search if this session id is *somehow* found in another room
|
// search if this session id is *somehow* found in another room
|
||||||
for (final val in _inboundGroupSessions.values) {
|
for (final val in _inboundGroupSessions.values) {
|
||||||
if (val.containsKey(sessionId)) {
|
final sess = val[sessionId];
|
||||||
final sess = val[sessionId]!;
|
if (sess != null) {
|
||||||
if (sess.senderKey != senderKey && sess.senderKey.isNotEmpty) {
|
if (sess.senderKey != senderKey && sess.senderKey.isNotEmpty) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
@ -231,9 +230,8 @@ class KeyManager {
|
||||||
/// Loads an inbound group session
|
/// Loads an inbound group session
|
||||||
Future<SessionKey?> loadInboundGroupSession(
|
Future<SessionKey?> loadInboundGroupSession(
|
||||||
String roomId, String sessionId, String senderKey) async {
|
String roomId, String sessionId, String senderKey) async {
|
||||||
if (_inboundGroupSessions.containsKey(roomId) &&
|
final sess = _inboundGroupSessions[roomId]?[sessionId];
|
||||||
_inboundGroupSessions[roomId]!.containsKey(sessionId)) {
|
if (sess != null) {
|
||||||
final sess = _inboundGroupSessions[roomId]![sessionId]!;
|
|
||||||
if (sess.senderKey != senderKey && sess.senderKey.isNotEmpty) {
|
if (sess.senderKey != senderKey && sess.senderKey.isNotEmpty) {
|
||||||
return null; // sender keys do not match....better not do anything
|
return null; // sender keys do not match....better not do anything
|
||||||
}
|
}
|
||||||
|
|
@ -244,16 +242,15 @@ class KeyManager {
|
||||||
if (session == null) {
|
if (session == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
final sess = SessionKey.fromDb(session, client.userID);
|
final dbSess = SessionKey.fromDb(session, client.userID);
|
||||||
if (!_inboundGroupSessions.containsKey(roomId)) {
|
final roomInboundGroupSessions =
|
||||||
_inboundGroupSessions[roomId] = <String, SessionKey>{};
|
_inboundGroupSessions[roomId] ??= <String, SessionKey>{};
|
||||||
}
|
if (!dbSess.isValid ||
|
||||||
if (!sess.isValid ||
|
dbSess.senderKey.isEmpty ||
|
||||||
sess.senderKey.isEmpty ||
|
dbSess.senderKey != senderKey) {
|
||||||
sess.senderKey != senderKey) {
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
_inboundGroupSessions[roomId]![sessionId] = sess;
|
roomInboundGroupSessions[sessionId] = dbSess;
|
||||||
return sess;
|
return sess;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -261,14 +258,13 @@ class KeyManager {
|
||||||
List<DeviceKeys> deviceKeys) {
|
List<DeviceKeys> deviceKeys) {
|
||||||
final deviceKeyIds = <String, Map<String, bool>>{};
|
final deviceKeyIds = <String, Map<String, bool>>{};
|
||||||
for (final device in deviceKeys) {
|
for (final device in deviceKeys) {
|
||||||
if (device.deviceId == null) {
|
final deviceId = device.deviceId;
|
||||||
|
if (deviceId == null) {
|
||||||
Logs().w('[KeyManager] ignoring device without deviceid');
|
Logs().w('[KeyManager] ignoring device without deviceid');
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!deviceKeyIds.containsKey(device.userId)) {
|
final userDeviceKeyIds = deviceKeyIds[device.userId] ??= <String, bool>{};
|
||||||
deviceKeyIds[device.userId] = <String, bool>{};
|
userDeviceKeyIds[deviceId] = !device.encryptToDevice;
|
||||||
}
|
|
||||||
deviceKeyIds[device.userId]![device.deviceId!] = !device.encryptToDevice;
|
|
||||||
}
|
}
|
||||||
return deviceKeyIds;
|
return deviceKeyIds;
|
||||||
}
|
}
|
||||||
|
|
@ -440,8 +436,9 @@ class KeyManager {
|
||||||
|
|
||||||
/// Creates an outbound group session for a given room id
|
/// Creates an outbound group session for a given room id
|
||||||
Future<OutboundGroupSession> createOutboundGroupSession(String roomId) async {
|
Future<OutboundGroupSession> createOutboundGroupSession(String roomId) async {
|
||||||
if (_pendingNewOutboundGroupSessions.containsKey(roomId)) {
|
final sess = _pendingNewOutboundGroupSessions[roomId];
|
||||||
return _pendingNewOutboundGroupSessions[roomId]!;
|
if (sess != null) {
|
||||||
|
return sess;
|
||||||
}
|
}
|
||||||
_pendingNewOutboundGroupSessions[roomId] =
|
_pendingNewOutboundGroupSessions[roomId] =
|
||||||
_createOutboundGroupSession(roomId);
|
_createOutboundGroupSession(roomId);
|
||||||
|
|
@ -791,14 +788,12 @@ class KeyManager {
|
||||||
Logs().i('[KeyManager] No body, doing nothing');
|
Logs().i('[KeyManager] No body, doing nothing');
|
||||||
return; // no body
|
return; // no body
|
||||||
}
|
}
|
||||||
if (!client.userDeviceKeys.containsKey(event.sender) ||
|
final device = client.userDeviceKeys[event.sender]
|
||||||
!client.userDeviceKeys[event.sender]!.deviceKeys
|
?.deviceKeys[event.content['requesting_device_id']];
|
||||||
.containsKey(event.content['requesting_device_id'])) {
|
if (device == null) {
|
||||||
Logs().i('[KeyManager] Device not found, doing nothing');
|
Logs().i('[KeyManager] Device not found, doing nothing');
|
||||||
return; // device not found
|
return; // device not found
|
||||||
}
|
}
|
||||||
final device = client.userDeviceKeys[event.sender]!
|
|
||||||
.deviceKeys[event.content['requesting_device_id']]!;
|
|
||||||
if (device.userId == client.userID &&
|
if (device.userId == client.userID &&
|
||||||
device.deviceId == client.deviceID) {
|
device.deviceId == client.deviceID) {
|
||||||
Logs().i('[KeyManager] Request is by ourself, ignoring');
|
Logs().i('[KeyManager] Request is by ourself, ignoring');
|
||||||
|
|
@ -914,10 +909,8 @@ class KeyManager {
|
||||||
};
|
};
|
||||||
final data = <String, Map<String, Map<String, dynamic>>>{};
|
final data = <String, Map<String, Map<String, dynamic>>>{};
|
||||||
for (final device in request.devices) {
|
for (final device in request.devices) {
|
||||||
if (!data.containsKey(device.userId)) {
|
final userData = data[device.userId] ??= {};
|
||||||
data[device.userId] = {};
|
userData[device.deviceId!] = sendToDeviceMessage;
|
||||||
}
|
|
||||||
data[device.userId]![device.deviceId!] = sendToDeviceMessage;
|
|
||||||
}
|
}
|
||||||
await client.sendToDevice(
|
await client.sendToDevice(
|
||||||
EventTypes.RoomKeyRequest,
|
EventTypes.RoomKeyRequest,
|
||||||
|
|
@ -933,13 +926,10 @@ class KeyManager {
|
||||||
}
|
}
|
||||||
final String roomId = event.content['room_id'];
|
final String roomId = event.content['room_id'];
|
||||||
final String sessionId = event.content['session_id'];
|
final String sessionId = event.content['session_id'];
|
||||||
if (client.userDeviceKeys.containsKey(event.sender) &&
|
final sender_ed25519 = client.userDeviceKeys[event.sender]
|
||||||
client.userDeviceKeys[event.sender]!.deviceKeys
|
?.deviceKeys[event.content['requesting_device_id']]?.ed25519Key;
|
||||||
.containsKey(event.content['requesting_device_id'])) {
|
if (sender_ed25519 != null) {
|
||||||
event.content['sender_claimed_ed25519_key'] = client
|
event.content['sender_claimed_ed25519_key'] = sender_ed25519;
|
||||||
.userDeviceKeys[event.sender]!
|
|
||||||
.deviceKeys[event.content['requesting_device_id']]!
|
|
||||||
.ed25519Key;
|
|
||||||
}
|
}
|
||||||
Logs().v('[KeyManager] Keeping room key');
|
Logs().v('[KeyManager] Keeping room key');
|
||||||
setInboundGroupSession(roomId, sessionId,
|
setInboundGroupSession(roomId, sessionId,
|
||||||
|
|
@ -1044,9 +1034,8 @@ RoomKeys _generateUploadKeys(_GenerateUploadKeysArgs args) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// create the room if it doesn't exist
|
// create the room if it doesn't exist
|
||||||
if (!roomKeys.rooms.containsKey(sess.roomId)) {
|
final roomKeyBackup =
|
||||||
roomKeys.rooms[sess.roomId] = RoomKeyBackup(sessions: {});
|
roomKeys.rooms[sess.roomId] ??= RoomKeyBackup(sessions: {});
|
||||||
}
|
|
||||||
// generate the encrypted content
|
// generate the encrypted content
|
||||||
final payload = <String, dynamic>{
|
final payload = <String, dynamic>{
|
||||||
'algorithm': AlgorithmTypes.megolmV1AesSha2,
|
'algorithm': AlgorithmTypes.megolmV1AesSha2,
|
||||||
|
|
@ -1061,7 +1050,7 @@ RoomKeys _generateUploadKeys(_GenerateUploadKeysArgs args) {
|
||||||
// fetch the device, if available...
|
// fetch the device, if available...
|
||||||
//final device = args.client.getUserDeviceKeysByCurve25519Key(sess.senderKey);
|
//final device = args.client.getUserDeviceKeysByCurve25519Key(sess.senderKey);
|
||||||
// aaaand finally add the session key to our payload
|
// aaaand finally add the session key to our payload
|
||||||
roomKeys.rooms[sess.roomId]!.sessions[sess.sessionId] = KeyBackupData(
|
roomKeyBackup.sessions[sess.sessionId] = KeyBackupData(
|
||||||
firstMessageIndex: sess.inboundGroupSession!.first_known_index(),
|
firstMessageIndex: sess.inboundGroupSession!.first_known_index(),
|
||||||
forwardedCount: sess.forwardingCurve25519KeyChain.length,
|
forwardedCount: sess.forwardingCurve25519KeyChain.length,
|
||||||
isVerified: dbSession.verified, //device?.verified ?? false,
|
isVerified: dbSession.verified, //device?.verified ?? false,
|
||||||
|
|
|
||||||
|
|
@ -411,12 +411,10 @@ class OlmManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final Map<String, dynamic> plainContent = json.decode(plaintext);
|
final Map<String, dynamic> plainContent = json.decode(plaintext);
|
||||||
if (plainContent.containsKey('sender') &&
|
if (plainContent['sender'] != event.sender) {
|
||||||
plainContent['sender'] != event.sender) {
|
|
||||||
throw DecryptException(DecryptException.senderDoesntMatch);
|
throw DecryptException(DecryptException.senderDoesntMatch);
|
||||||
}
|
}
|
||||||
if (plainContent.containsKey('recipient') &&
|
if (plainContent['recipient'] != client.userID) {
|
||||||
plainContent['recipient'] != client.userID) {
|
|
||||||
throw DecryptException(DecryptException.recipientDoesntMatch);
|
throw DecryptException(DecryptException.recipientDoesntMatch);
|
||||||
}
|
}
|
||||||
if (plainContent['recipient_keys'] is Map &&
|
if (plainContent['recipient_keys'] is Map &&
|
||||||
|
|
@ -637,18 +635,15 @@ class OlmManager {
|
||||||
}
|
}
|
||||||
final deviceKeysWithoutSession = List<DeviceKeys>.from(deviceKeys);
|
final deviceKeysWithoutSession = List<DeviceKeys>.from(deviceKeys);
|
||||||
deviceKeysWithoutSession.removeWhere((DeviceKeys deviceKeys) =>
|
deviceKeysWithoutSession.removeWhere((DeviceKeys deviceKeys) =>
|
||||||
olmSessions.containsKey(deviceKeys.curve25519Key) &&
|
olmSessions[deviceKeys.curve25519Key]?.isNotEmpty ?? false);
|
||||||
olmSessions[deviceKeys.curve25519Key]!.isNotEmpty);
|
|
||||||
if (deviceKeysWithoutSession.isNotEmpty) {
|
if (deviceKeysWithoutSession.isNotEmpty) {
|
||||||
await startOutgoingOlmSessions(deviceKeysWithoutSession);
|
await startOutgoingOlmSessions(deviceKeysWithoutSession);
|
||||||
}
|
}
|
||||||
for (final device in deviceKeys) {
|
for (final device in deviceKeys) {
|
||||||
if (!data.containsKey(device.userId)) {
|
final userData = data[device.userId] ??= {};
|
||||||
data[device.userId] = {};
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
data[device.userId]![device.deviceId!] =
|
userData[device.deviceId!] = await encryptToDeviceMessagePayload(
|
||||||
await encryptToDeviceMessagePayload(device, type, payload,
|
device, type, payload,
|
||||||
getFromDb: false);
|
getFromDb: false);
|
||||||
} catch (e, s) {
|
} catch (e, s) {
|
||||||
Logs().w('[LibOlm] Error encrypting to-device event', e, s);
|
Logs().w('[LibOlm] Error encrypting to-device event', e, s);
|
||||||
|
|
|
||||||
|
|
@ -90,10 +90,11 @@ class Bootstrap {
|
||||||
// cache the secret analyzing so that we don't drop stuff a different client sets during bootstrapping
|
// cache the secret analyzing so that we don't drop stuff a different client sets during bootstrapping
|
||||||
Map<String, Set<String>>? _secretsCache;
|
Map<String, Set<String>>? _secretsCache;
|
||||||
Map<String, Set<String>> analyzeSecrets() {
|
Map<String, Set<String>> analyzeSecrets() {
|
||||||
if (_secretsCache != null) {
|
final secretsCache = _secretsCache;
|
||||||
|
if (secretsCache != null) {
|
||||||
// deep-copy so that we can do modifications
|
// deep-copy so that we can do modifications
|
||||||
final newSecrets = <String, Set<String>>{};
|
final newSecrets = <String, Set<String>>{};
|
||||||
for (final s in _secretsCache!.entries) {
|
for (final s in secretsCache.entries) {
|
||||||
newSecrets[s.key] = Set<String>.from(s.value);
|
newSecrets[s.key] = Set<String>.from(s.value);
|
||||||
}
|
}
|
||||||
return newSecrets;
|
return newSecrets;
|
||||||
|
|
@ -147,11 +148,7 @@ class Bootstrap {
|
||||||
final usage = <String, int>{};
|
final usage = <String, int>{};
|
||||||
for (final keys in secrets.values) {
|
for (final keys in secrets.values) {
|
||||||
for (final key in keys) {
|
for (final key in keys) {
|
||||||
if (!usage.containsKey(key)) {
|
usage.update(key, (i) => i++, ifAbsent: () => 1);
|
||||||
usage[key] = 1;
|
|
||||||
} else {
|
|
||||||
usage[key] = usage[key]! + 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final entriesList = usage.entries.toList();
|
final entriesList = usage.entries.toList();
|
||||||
|
|
@ -315,14 +312,15 @@ class Bootstrap {
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> openExistingSsss() async {
|
Future<void> openExistingSsss() async {
|
||||||
if (state != BootstrapState.openExistingSsss || newSsssKey == null) {
|
final newSsssKey_ = newSsssKey;
|
||||||
|
if (state != BootstrapState.openExistingSsss || newSsssKey_ == null) {
|
||||||
throw BootstrapBadStateException();
|
throw BootstrapBadStateException();
|
||||||
}
|
}
|
||||||
if (!newSsssKey!.isUnlocked) {
|
if (!newSsssKey_.isUnlocked) {
|
||||||
throw BootstrapBadStateException('Key not unlocked');
|
throw BootstrapBadStateException('Key not unlocked');
|
||||||
}
|
}
|
||||||
Logs().v('Maybe cache all...');
|
Logs().v('Maybe cache all...');
|
||||||
await newSsssKey!.maybeCacheAll();
|
await newSsssKey_.maybeCacheAll();
|
||||||
checkCrossSigning();
|
checkCrossSigning();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -477,12 +475,9 @@ class Bootstrap {
|
||||||
futures.add(
|
futures.add(
|
||||||
client.onSync.stream
|
client.onSync.stream
|
||||||
.firstWhere((syncUpdate) =>
|
.firstWhere((syncUpdate) =>
|
||||||
client.userDeviceKeys.containsKey(client.userID) &&
|
masterKey?.publicKey != null &&
|
||||||
client.userDeviceKeys[client.userID]!.masterKey != null &&
|
client.userDeviceKeys[client.userID]?.masterKey?.ed25519Key ==
|
||||||
client.userDeviceKeys[client.userID]!.masterKey!.ed25519Key !=
|
masterKey?.publicKey)
|
||||||
null &&
|
|
||||||
client.userDeviceKeys[client.userID]!.masterKey!.ed25519Key ==
|
|
||||||
masterKey!.publicKey)
|
|
||||||
.then((_) => Logs().v('New Master Key was created')),
|
.then((_) => Logs().v('New Master Key was created')),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -595,8 +590,10 @@ class Bootstrap {
|
||||||
if (state != BootstrapState.error) {
|
if (state != BootstrapState.error) {
|
||||||
_state = newState;
|
_state = newState;
|
||||||
}
|
}
|
||||||
if (onUpdate != null) {
|
|
||||||
onUpdate!();
|
final onUpdate_ = onUpdate;
|
||||||
|
if (onUpdate_ != null) {
|
||||||
|
onUpdate_();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -227,10 +227,9 @@ class KeyVerification {
|
||||||
if (deviceId == '*') {
|
if (deviceId == '*') {
|
||||||
_deviceId = payload['from_device']; // gotta set the real device id
|
_deviceId = payload['from_device']; // gotta set the real device id
|
||||||
// and broadcast the cancel to the other devices
|
// and broadcast the cancel to the other devices
|
||||||
final devices = client.userDeviceKeys.containsKey(userId)
|
final devices = List<DeviceKeys>.from(
|
||||||
? List<DeviceKeys>.from(
|
client.userDeviceKeys[userId]?.deviceKeys.values ??
|
||||||
client.userDeviceKeys[userId]!.deviceKeys.values)
|
Iterable.empty());
|
||||||
: List<DeviceKeys>.from([]);
|
|
||||||
devices.removeWhere(
|
devices.removeWhere(
|
||||||
(d) => {deviceId, client.deviceID}.contains(d.deviceId));
|
(d) => {deviceId, client.deviceID}.contains(d.deviceId));
|
||||||
final cancelPayload = <String, dynamic>{
|
final cancelPayload = <String, dynamic>{
|
||||||
|
|
@ -472,7 +471,8 @@ class KeyVerification {
|
||||||
Future<bool> Function(String, SignableKey) verifier) async {
|
Future<bool> Function(String, SignableKey) verifier) async {
|
||||||
_verifiedDevices = <SignableKey>[];
|
_verifiedDevices = <SignableKey>[];
|
||||||
|
|
||||||
if (!client.userDeviceKeys.containsKey(userId)) {
|
final userDeviceKey = client.userDeviceKeys[userId];
|
||||||
|
if (userDeviceKey == null) {
|
||||||
await cancel('m.key_mismatch');
|
await cancel('m.key_mismatch');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -480,7 +480,7 @@ class KeyVerification {
|
||||||
final keyId = entry.key;
|
final keyId = entry.key;
|
||||||
final verifyDeviceId = keyId.substring('ed25519:'.length);
|
final verifyDeviceId = keyId.substring('ed25519:'.length);
|
||||||
final keyInfo = entry.value;
|
final keyInfo = entry.value;
|
||||||
final key = client.userDeviceKeys[userId]!.getKey(verifyDeviceId);
|
final key = userDeviceKey.getKey(verifyDeviceId);
|
||||||
if (key != null) {
|
if (key != null) {
|
||||||
if (!(await verifier(keyInfo, key))) {
|
if (!(await verifier(keyInfo, key))) {
|
||||||
await cancel('m.key_mismatch');
|
await cancel('m.key_mismatch');
|
||||||
|
|
@ -619,8 +619,10 @@ class KeyVerification {
|
||||||
if (state != KeyVerificationState.error) {
|
if (state != KeyVerificationState.error) {
|
||||||
state = newState;
|
state = newState;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final onUpdate = this.onUpdate;
|
||||||
if (onUpdate != null) {
|
if (onUpdate != null) {
|
||||||
onUpdate!();
|
onUpdate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -808,8 +810,8 @@ class _KeyVerificationMethodSas extends _KeyVerificationMethod {
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _sendAccept() async {
|
Future<void> _sendAccept() async {
|
||||||
sas = olm.SAS();
|
final sas = this.sas ??= olm.SAS();
|
||||||
commitment = _makeCommitment(sas!.get_pubkey(), startCanonicalJson);
|
commitment = _makeCommitment(sas.get_pubkey(), startCanonicalJson);
|
||||||
await request.send(EventTypes.KeyVerificationAccept, {
|
await request.send(EventTypes.KeyVerificationAccept, {
|
||||||
'method': type,
|
'method': type,
|
||||||
'key_agreement_protocol': keyAgreementProtocol,
|
'key_agreement_protocol': keyAgreementProtocol,
|
||||||
|
|
@ -906,9 +908,7 @@ class _KeyVerificationMethodSas extends _KeyVerificationMethod {
|
||||||
_calculateMac(encryption.fingerprintKey!, baseInfo + deviceKeyId);
|
_calculateMac(encryption.fingerprintKey!, baseInfo + deviceKeyId);
|
||||||
keyList.add(deviceKeyId);
|
keyList.add(deviceKeyId);
|
||||||
|
|
||||||
final masterKey = client.userDeviceKeys.containsKey(client.userID)
|
final masterKey = client.userDeviceKeys[client.userID]?.masterKey;
|
||||||
? client.userDeviceKeys[client.userID]!.masterKey
|
|
||||||
: null;
|
|
||||||
if (masterKey != null && masterKey.verified) {
|
if (masterKey != null && masterKey.verified) {
|
||||||
// we have our own master key verified, let's send it!
|
// we have our own master key verified, let's send it!
|
||||||
final masterKeyId = 'ed25519:${masterKey.publicKey}';
|
final masterKeyId = 'ed25519:${masterKey.publicKey}';
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ class SessionKey {
|
||||||
late Map<String, String> senderClaimedKeys;
|
late Map<String, String> senderClaimedKeys;
|
||||||
|
|
||||||
/// Sender curve25519 key
|
/// Sender curve25519 key
|
||||||
late String senderKey;
|
String senderKey;
|
||||||
|
|
||||||
/// Is this session valid?
|
/// Is this session valid?
|
||||||
bool get isValid => inboundGroupSession != null;
|
bool get isValid => inboundGroupSession != null;
|
||||||
|
|
|
||||||
|
|
@ -249,14 +249,9 @@ abstract class SignableKey extends MatrixSignableKey {
|
||||||
if (otherUserId == userId && keyId == identifier) {
|
if (otherUserId == userId && keyId == identifier) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
SignableKey? key;
|
|
||||||
if (client.userDeviceKeys[otherUserId]!.deviceKeys.containsKey(keyId)) {
|
|
||||||
key = client.userDeviceKeys[otherUserId]!.deviceKeys[keyId];
|
|
||||||
} else if (client.userDeviceKeys[otherUserId]!.crossSigningKeys
|
|
||||||
.containsKey(keyId)) {
|
|
||||||
key = client.userDeviceKeys[otherUserId]!.crossSigningKeys[keyId];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
final key = client.userDeviceKeys[otherUserId]?.deviceKeys[keyId] ??
|
||||||
|
client.userDeviceKeys[otherUserId]?.crossSigningKeys[keyId];
|
||||||
if (key == null) {
|
if (key == null) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -272,25 +267,22 @@ abstract class SignableKey extends MatrixSignableKey {
|
||||||
}
|
}
|
||||||
var haveValidSignature = false;
|
var haveValidSignature = false;
|
||||||
var gotSignatureFromCache = false;
|
var gotSignatureFromCache = false;
|
||||||
if (validSignatures != null &&
|
if (validSignatures?[otherUserId][fullKeyId] == true) {
|
||||||
validSignatures!.containsKey(otherUserId) &&
|
|
||||||
validSignatures![otherUserId].containsKey(fullKeyId)) {
|
|
||||||
if (validSignatures![otherUserId][fullKeyId] == true) {
|
|
||||||
haveValidSignature = true;
|
haveValidSignature = true;
|
||||||
gotSignatureFromCache = true;
|
gotSignatureFromCache = true;
|
||||||
} else if (validSignatures![otherUserId][fullKeyId] == false) {
|
} else if (validSignatures?[otherUserId][fullKeyId] == false) {
|
||||||
haveValidSignature = false;
|
haveValidSignature = false;
|
||||||
gotSignatureFromCache = true;
|
gotSignatureFromCache = true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (!gotSignatureFromCache && key.ed25519Key != null) {
|
if (!gotSignatureFromCache && key.ed25519Key != null) {
|
||||||
// validate the signature manually
|
// validate the signature manually
|
||||||
haveValidSignature = _verifySignature(key.ed25519Key!, signature);
|
haveValidSignature = _verifySignature(key.ed25519Key!, signature);
|
||||||
validSignatures ??= <String, dynamic>{};
|
final validSignatures = this.validSignatures ??= <String, dynamic>{};
|
||||||
if (!validSignatures!.containsKey(otherUserId)) {
|
if (!validSignatures.containsKey(otherUserId)) {
|
||||||
validSignatures![otherUserId] = <String, dynamic>{};
|
validSignatures[otherUserId] = <String, dynamic>{};
|
||||||
}
|
}
|
||||||
validSignatures![otherUserId][fullKeyId] = haveValidSignature;
|
validSignatures[otherUserId][fullKeyId] = haveValidSignature;
|
||||||
}
|
}
|
||||||
if (!haveValidSignature) {
|
if (!haveValidSignature) {
|
||||||
// no valid signature, this key is useless
|
// no valid signature, this key is useless
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ dependencies:
|
||||||
js: ^0.6.3
|
js: ^0.6.3
|
||||||
slugify: ^2.0.0
|
slugify: ^2.0.0
|
||||||
html: ^0.15.0
|
html: ^0.15.0
|
||||||
collection: ^1.15.0-nullsafety.4
|
collection: ^1.15.0
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
pedantic: ^1.11.0
|
pedantic: ^1.11.0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue