nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-10-30 09:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always use server signed group change for updating local group

Browse Source
This commit is contained in:
AsamK 2026-10-14 11:57:50 +02:00
parent c3b0fe902e
commit c2b9c25b7c
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
View File

@ -636,32 +636,18 @@ class GroupV2Helper {
final DecryptedGroupChange decryptedChange;
final DecryptedGroup decryptedGroupState;
if (!changeActions.promote_members_pending_pni_aci_profile_key.isEmpty()) {
// The server fills in the ACI and PNI ciphertexts of a PNI promotion, so decrypt its signed change
final var signedGroupChange = dependencies.getGroupsV2Api()
.patchGroup(changeActions, getGroupAuthForToday(groupSecretParams), Optional.empty());
final var groupId = groupSecretParams.getPublicParams().getGroupIdentifier();
try {
decryptedChange = groupOperations.decryptChange(signedGroupChange.group_change,
DecryptChangeVerificationMode.verify(groupId)).orElseThrow();
decryptedGroupState = DecryptedGroupUtil.apply(previousGroupState, decryptedChange);
} catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
throw new IOException(e);
}
groupInfoV2.setGroup(decryptedGroupState);
return new Pair<>(decryptedGroupState, signedGroupChange);
}
var signedGroupChange = dependencies.getGroupsV2Api()
.patchGroup(changeActions, getGroupAuthForToday(groupSecretParams), Optional.empty());
final var groupId = groupSecretParams.getPublicParams().getGroupIdentifier();
try {
decryptedChange = groupOperations.decryptChange(changeActions, getSelfAci());
decryptedChange = groupOperations.decryptChange(signedGroupChange.group_change,
DecryptChangeVerificationMode.verify(groupId)).orElseThrow();
decryptedGroupState = DecryptedGroupUtil.apply(previousGroupState, decryptedChange);
} catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
throw new IOException(e);
}
var signedGroupChange = dependencies.getGroupsV2Api()
.patchGroup(changeActions, getGroupAuthForToday(groupSecretParams), Optional.empty());
groupInfoV2.setGroup(decryptedGroupState);
return new Pair<>(decryptedGroupState, signedGroupChange);