inex
/
famedlysdk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

signed vs verified logic

This commit is contained in:
Sorunome 2020-05-27 17:37:14 +02:00
parent 8d75c2a0af
commit e4e4386178
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/src/client.dart
View File

@ -149,25 +149,10 @@ class Client {
bool get fileEncryptionEnabled => true; bool get fileEncryptionEnabled => true;
/// Wheather this session is unknown to others /// Wheather this session is unknown to others
bool get isUnknownSession { bool get isUnknownSession =>
if (!userDeviceKeys.containsKey(userID)) { !userDeviceKeys.containsKey(userID) ||
return true; !userDeviceKeys[userID].deviceKeys.containsKey(deviceID) ||
} !userDeviceKeys[userID].deviceKeys[deviceID].signed;
final masterKey = userDeviceKeys[userID].masterKey;
if (masterKey == null) {
return true;
}
if (!masterKey.directVerified) {
return true;
}
if (!userDeviceKeys[userID].deviceKeys.containsKey(deviceID)) {
return true;
}
if (!userDeviceKeys[userID].deviceKeys[deviceID].crossVerified) {
return true;
}
return false;
}
/// Warning! This endpoint is for testing only! /// Warning! This endpoint is for testing only!
set rooms(List<Room> newList) { set rooms(List<Room> newList) {

13
lib/src/utils/device_keys_list.dart
View File

@ -140,6 +140,8 @@ abstract class SignedKey {
} }
} }
bool get signed => hasValidSignatureChain(verifiedOnly: false);
String get signingContent { String get signingContent {
final data = Map<String, dynamic>.from(content); final data = Map<String, dynamic>.from(content);
// some old data might have the custom verified and blocked keys // some old data might have the custom verified and blocked keys
@ -166,7 +168,7 @@ abstract class SignedKey {
return valid; return valid;
} }
bool hasValidSignatureChain({Set<String> visited}) { bool hasValidSignatureChain({bool verfiedOnly = true, Set<String> visited}) {
visited ??= <String>{}; visited ??= <String>{};
final setKey = '${userId};${identifier}'; final setKey = '${userId};${identifier}';
if (visited.contains(setKey)) { if (visited.contains(setKey)) {
@ -225,11 +227,16 @@ abstract class SignedKey {
continue; continue;
} }
if (key.directVerified) { if ((verifiedOnly && key.directVerified) ||
(key is SignedKey &&
key.usage.includes('master') &&
key.directVerified &&
key.userId == client.userID)) {
return true; // we verified this key and it is valid...all checks out! return true; // we verified this key and it is valid...all checks out!
} }
// or else we just recurse into that key and chack if it works out // or else we just recurse into that key and chack if it works out
final haveChain = key.hasValidSignatureChain(visited: visited); final haveChain = key.hasValidSignatureChain(
verfiedOnly: verfiedOnly, visited: visited);
if (haveChain) { if (haveChain) {
return true; return true;
} }