mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Ensure ACI in aci fields in backup

Browse source
This commit is contained in:
Fedor Indutny 2025-01-08 12:15:05 -08:00 • committed by GitHub
parent e915180a62
commit d66df8ff0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

64
ts/services/backups/export.ts
View file

@ -1233,6 +1233,16 @@ export class BackupExportStream extends Readable {
private aciToBytes(aci: AciString | string): Uint8Array { private aciToBytes(aci: AciString | string): Uint8Array {
return Aci.parseFromServiceIdString(aci).getRawUuidBytes(); return Aci.parseFromServiceIdString(aci).getRawUuidBytes();
} }
private aciToBytesOrUndefined(
aci: AciString | string
): Uint8Array | undefined {
if (isAciString(aci)) {
return Aci.parseFromServiceIdString(aci).getRawUuidBytes();
}
return undefined;
}
private serviceIdToBytes(serviceId: ServiceIdString): Uint8Array { private serviceIdToBytes(serviceId: ServiceIdString): Uint8Array {
return ServiceId.parseFromServiceIdString(serviceId).getRawUuidBytes(); return ServiceId.parseFromServiceIdString(serviceId).getRawUuidBytes();
} }
@ -1599,7 +1609,7 @@ export class BackupExportStream extends Readable {
{ {
genericGroupUpdate: { genericGroupUpdate: {
updaterAci: message.sourceServiceId updaterAci: message.sourceServiceId
? this.serviceIdToBytes(message.sourceServiceId) ? this.aciToBytesOrUndefined(message.sourceServiceId)
: undefined, : undefined,
}, },
}, },
@ -1721,7 +1731,7 @@ export class BackupExportStream extends Readable {
if (type === 'create') { if (type === 'create') {
const innerUpdate = new Backups.GroupCreationUpdate(); const innerUpdate = new Backups.GroupCreationUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
update.groupCreationUpdate = innerUpdate; update.groupCreationUpdate = innerUpdate;
updates.push(update); updates.push(update);
@ -1729,7 +1739,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = const innerUpdate =
new Backups.GroupAttributesAccessLevelChangeUpdate(); new Backups.GroupAttributesAccessLevelChangeUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.accessLevel = detail.newPrivilege; innerUpdate.accessLevel = detail.newPrivilege;
@ -1739,7 +1749,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = const innerUpdate =
new Backups.GroupMembershipAccessLevelChangeUpdate(); new Backups.GroupMembershipAccessLevelChangeUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.accessLevel = detail.newPrivilege; innerUpdate.accessLevel = detail.newPrivilege;
@ -1748,7 +1758,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'access-invite-link') { } else if (type === 'access-invite-link') {
const innerUpdate = new Backups.GroupInviteLinkAdminApprovalUpdate(); const innerUpdate = new Backups.GroupInviteLinkAdminApprovalUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.linkRequiresAdminApproval = innerUpdate.linkRequiresAdminApproval =
detail.newPrivilege === detail.newPrivilege ===
@ -1759,7 +1769,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'announcements-only') { } else if (type === 'announcements-only') {
const innerUpdate = new Backups.GroupAnnouncementOnlyChangeUpdate(); const innerUpdate = new Backups.GroupAnnouncementOnlyChangeUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.isAnnouncementOnly = detail.announcementsOnly; innerUpdate.isAnnouncementOnly = detail.announcementsOnly;
@ -1768,7 +1778,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'avatar') { } else if (type === 'avatar') {
const innerUpdate = new Backups.GroupAvatarUpdate(); const innerUpdate = new Backups.GroupAvatarUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.wasRemoved = detail.removed; innerUpdate.wasRemoved = detail.removed;
@ -1777,7 +1787,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'title') { } else if (type === 'title') {
const innerUpdate = new Backups.GroupNameUpdate(); const innerUpdate = new Backups.GroupNameUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.newGroupName = detail.newTitle; innerUpdate.newGroupName = detail.newTitle;
@ -1786,7 +1796,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'group-link-add') { } else if (type === 'group-link-add') {
const innerUpdate = new Backups.GroupInviteLinkEnabledUpdate(); const innerUpdate = new Backups.GroupInviteLinkEnabledUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.linkRequiresAdminApproval = innerUpdate.linkRequiresAdminApproval =
detail.privilege === detail.privilege ===
@ -1797,7 +1807,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'group-link-reset') { } else if (type === 'group-link-reset') {
const innerUpdate = new Backups.GroupInviteLinkResetUpdate(); const innerUpdate = new Backups.GroupInviteLinkResetUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
update.groupInviteLinkResetUpdate = innerUpdate; update.groupInviteLinkResetUpdate = innerUpdate;
@ -1805,7 +1815,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'group-link-remove') { } else if (type === 'group-link-remove') {
const innerUpdate = new Backups.GroupInviteLinkDisabledUpdate(); const innerUpdate = new Backups.GroupInviteLinkDisabledUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
update.groupInviteLinkDisabledUpdate = innerUpdate; update.groupInviteLinkDisabledUpdate = innerUpdate;
@ -1813,7 +1823,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'member-add') { } else if (type === 'member-add') {
if (from && from === detail.aci) { if (from && from === detail.aci) {
const innerUpdate = new Backups.GroupMemberJoinedUpdate(); const innerUpdate = new Backups.GroupMemberJoinedUpdate();
innerUpdate.newMemberAci = this.serviceIdToBytes(from); innerUpdate.newMemberAci = this.aciToBytes(from);
update.groupMemberJoinedUpdate = innerUpdate; update.groupMemberJoinedUpdate = innerUpdate;
updates.push(update); updates.push(update);
@ -1822,7 +1832,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = new Backups.GroupMemberAddedUpdate(); const innerUpdate = new Backups.GroupMemberAddedUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.newMemberAci = this.aciToBytes(detail.aci); innerUpdate.newMemberAci = this.aciToBytes(detail.aci);
@ -1849,7 +1859,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = new Backups.GroupMemberAddedUpdate(); const innerUpdate = new Backups.GroupMemberAddedUpdate();
innerUpdate.newMemberAci = this.aciToBytes(detail.aci); innerUpdate.newMemberAci = this.aciToBytes(detail.aci);
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
if (detail.inviter) { if (detail.inviter) {
innerUpdate.inviterAci = this.aciToBytes(detail.inviter); innerUpdate.inviterAci = this.aciToBytes(detail.inviter);
@ -1867,7 +1877,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'member-add-from-admin-approval') { } else if (type === 'member-add-from-admin-approval') {
const innerUpdate = new Backups.GroupJoinRequestApprovalUpdate(); const innerUpdate = new Backups.GroupJoinRequestApprovalUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.requestorAci = this.aciToBytes(detail.aci); innerUpdate.requestorAci = this.aciToBytes(detail.aci);
@ -1878,7 +1888,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'member-privilege') { } else if (type === 'member-privilege') {
const innerUpdate = new Backups.GroupAdminStatusUpdate(); const innerUpdate = new Backups.GroupAdminStatusUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.memberAci = this.aciToBytes(detail.aci); innerUpdate.memberAci = this.aciToBytes(detail.aci);
@ -1890,7 +1900,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'member-remove') { } else if (type === 'member-remove') {
if (from && from === detail.aci) { if (from && from === detail.aci) {
const innerUpdate = new Backups.GroupMemberLeftUpdate(); const innerUpdate = new Backups.GroupMemberLeftUpdate();
innerUpdate.aci = this.serviceIdToBytes(from); innerUpdate.aci = this.aciToBytes(from);
update.groupMemberLeftUpdate = innerUpdate; update.groupMemberLeftUpdate = innerUpdate;
updates.push(update); updates.push(update);
@ -1899,7 +1909,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = new Backups.GroupMemberRemovedUpdate(); const innerUpdate = new Backups.GroupMemberRemovedUpdate();
if (from) { if (from) {
innerUpdate.removerAci = this.serviceIdToBytes(from); innerUpdate.removerAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.removedAci = this.aciToBytes(detail.aci); innerUpdate.removedAci = this.aciToBytes(detail.aci);
@ -1912,7 +1922,7 @@ export class BackupExportStream extends Readable {
) { ) {
const innerUpdate = new Backups.SelfInvitedToGroupUpdate(); const innerUpdate = new Backups.SelfInvitedToGroupUpdate();
if (from) { if (from) {
innerUpdate.inviterAci = this.serviceIdToBytes(from); innerUpdate.inviterAci = this.aciToBytesOrUndefined(from);
} }
update.selfInvitedToGroupUpdate = innerUpdate; update.selfInvitedToGroupUpdate = innerUpdate;
@ -1936,7 +1946,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = new Backups.GroupUnknownInviteeUpdate(); const innerUpdate = new Backups.GroupUnknownInviteeUpdate();
if (from) { if (from) {
innerUpdate.inviterAci = this.serviceIdToBytes(from); innerUpdate.inviterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.inviteeCount = 1; innerUpdate.inviteeCount = 1;
@ -1945,7 +1955,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'pending-add-many') { } else if (type === 'pending-add-many') {
const innerUpdate = new Backups.GroupUnknownInviteeUpdate(); const innerUpdate = new Backups.GroupUnknownInviteeUpdate();
if (from) { if (from) {
innerUpdate.inviterAci = this.serviceIdToBytes(from); innerUpdate.inviterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.inviteeCount = detail.count; innerUpdate.inviteeCount = detail.count;
@ -1971,7 +1981,7 @@ export class BackupExportStream extends Readable {
) { ) {
const innerUpdate = new Backups.GroupSelfInvitationRevokedUpdate(); const innerUpdate = new Backups.GroupSelfInvitationRevokedUpdate();
if (from) { if (from) {
innerUpdate.revokerAci = this.serviceIdToBytes(from); innerUpdate.revokerAci = this.aciToBytesOrUndefined(from);
} }
update.groupSelfInvitationRevokedUpdate = innerUpdate; update.groupSelfInvitationRevokedUpdate = innerUpdate;
@ -1981,7 +1991,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = new Backups.GroupInvitationRevokedUpdate(); const innerUpdate = new Backups.GroupInvitationRevokedUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.invitees = [ innerUpdate.invitees = [
{ {
@ -1999,7 +2009,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'pending-remove-many') { } else if (type === 'pending-remove-many') {
const innerUpdate = new Backups.GroupInvitationRevokedUpdate(); const innerUpdate = new Backups.GroupInvitationRevokedUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.invitees = []; innerUpdate.invitees = [];
@ -2028,7 +2038,7 @@ export class BackupExportStream extends Readable {
const innerUpdate = new Backups.GroupJoinRequestApprovalUpdate(); const innerUpdate = new Backups.GroupJoinRequestApprovalUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
innerUpdate.requestorAci = this.aciToBytes(detail.aci); innerUpdate.requestorAci = this.aciToBytes(detail.aci);
@ -2065,7 +2075,7 @@ export class BackupExportStream extends Readable {
? undefined ? undefined
: detail.description; : detail.description;
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
update.groupDescriptionUpdate = innerUpdate; update.groupDescriptionUpdate = innerUpdate;
@ -2073,7 +2083,7 @@ export class BackupExportStream extends Readable {
} else if (type === 'summary') { } else if (type === 'summary') {
const innerUpdate = new Backups.GenericGroupUpdate(); const innerUpdate = new Backups.GenericGroupUpdate();
if (from) { if (from) {
innerUpdate.updaterAci = this.serviceIdToBytes(from); innerUpdate.updaterAci = this.aciToBytesOrUndefined(from);
} }
update.genericGroupUpdate = innerUpdate; update.genericGroupUpdate = innerUpdate;