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

add ability to sign yourself based on ssss

Browse source
This commit is contained in:
Sorunome 2020-05-27 18:50:09 +02:00
parent e4e4386178
commit aefe029c0a
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/src/cross_signing.dart
View file

@ -27,6 +27,31 @@ class CrossSigning {
(await client.ssss.getCached(USER_SIGNING_KEY)) != null;
}
Future<void> selfSign({String password, String recoveryKey}) async {
final handle = client.ssss.open(MASTER_KEY);
await handle.unlock(password: password, recoveryKey: recoveryKey);
await handle.maybeCacheAll();
final masterPrivateKey = base64.decode(await handle.getStored(MASTER_KEY));
final keyObj = olm.PkSigning();
String masterPubkey;
try {
masterPubkey = keyObj.init_with_seed(masterPrivateKey);
} finally {
keyObj.free();
}
if (masterPubkey == null || !client.userDeviceKeys.containsKey(client.userID) || !client.userDeviceKeys[client.userID].deviceKeys.containsKey(client.deviceID)) {
throw 'Master or user keys not found';
}
final masterKey = client.userDeviceKeys[client.userID].masterKey;
if (masterKey == null || masterKey.ed25519Key != masterPubkey) {
throw 'Master pubkey key doesn\'t match';
}
// master key is valid, set it to verified
masterKey.setVerified(true, false);
// and now sign bout our own key and our master key
await sign([masterKey, client.userDeviceKeys[client.userID].deviceKeys[client.deviceID]]);
}
bool signable(List<SignedKey> keys) {
for (final key in keys) {
if (key is CrossSigningKey && key.usage.contains('master')) {
@ -86,7 +111,7 @@ class CrossSigning {
signature);
}
// we don't care about signing other cross-signing keys
} else if (key.identifier != client.deviceID) {
} else {
// okay, we'll sign a device key with our self signing key
selfSigningKey ??= base64
.decode(await client.ssss.getCached(SELF_SIGNING_KEY) ?? '');
@ -119,8 +144,8 @@ class CrossSigning {
String _sign(String canonicalJson, Uint8List key) {
final keyObj = olm.PkSigning();
keyObj.init_with_seed(key);
try {
keyObj.init_with_seed(key);
return keyObj.sign(canonicalJson);
} finally {
keyObj.free();

6
lib/src/ssss.dart
View file

@ -213,7 +213,11 @@ class SSSS {
for (final type in CACHE_TYPES) {
final secret = await getCached(type);
if (secret == null) {
await getStored(type, keyId, key);
try {
await getStored(type, keyId, key);
} catch (_) {
// the entry wasn't stored, just ignore it
}
}
}
}

8
lib/src/utils/device_keys_list.dart
View file

@ -168,7 +168,7 @@ abstract class SignedKey {
return valid;
}
bool hasValidSignatureChain({bool verfiedOnly = true, Set<String> visited}) {
bool hasValidSignatureChain({bool verifiedOnly = true, Set<String> visited}) {
visited ??= <String>{};
final setKey = '${userId};${identifier}';
if (visited.contains(setKey)) {
@ -228,15 +228,15 @@ abstract class SignedKey {
}
if ((verifiedOnly && key.directVerified) ||
(key is SignedKey &&
key.usage.includes('master') &&
(key is CrossSigningKey &&
key.usage.contains('master') &&
key.directVerified &&
key.userId == client.userID)) {
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
final haveChain = key.hasValidSignatureChain(
verfiedOnly: verfiedOnly, visited: visited);
verifiedOnly: verifiedOnly, visited: visited);
if (haveChain) {
return true;
}