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

Only use membersE164 field in GroupV1 messages

Browse source
This commit is contained in:
Scott Nonnenberg 2020-07-24 13:20:58 -07:00
parent bffbc1e5cf
commit 1518b159d3
7 changed files with 21 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
js/background.js
View file

@ -2121,16 +2121,8 @@
'group'
);
const memberConversations = await Promise.all(
(details.members || details.membersE164).map(member => {
if (member.e164 || member.uuid) {
return ConversationController.getOrCreateAndWait(
member.e164 || member.uuid,
'private'
);
}
return ConversationController.getOrCreateAndWait(member, 'private');
})
const memberConversations = details.membersE164.map(e164 =>
ConversationController.getOrCreate(e164, 'private')
);
const members = memberConversations.map(c => c.get('id'));

17
js/models/messages.js
View file

@ -2246,20 +2246,9 @@
if (dataMessage.group) {
const pendingGroupUpdate = [];
const memberConversations = await Promise.all(
(
dataMessage.group.members || dataMessage.group.membersE164
).map(member => {
if (member.e164 || member.uuid) {
return ConversationController.getOrCreateAndWait(
member.e164 || member.uuid,
'private'
);
}
return ConversationController.getOrCreateAndWait(
member,
'private'
);
})
dataMessage.group.membersE164.map(e164 =>
ConversationController.getOrCreateAndWait(e164, 'private')
)
);
const members = memberConversations.map(c => c.get('id'));
attributes = {

15
libtextsecure/test/contacts_parser_test.js
View file

@ -64,12 +64,6 @@ describe('GroupBuffer', () => {
id: new Uint8Array([1, 3, 3, 7]).buffer,
name: 'Hackers',
membersE164: ['cereal', 'burn', 'phreak', 'joey'],
members: [
{ uuid: '3EA23646-92E8-4604-8833-6388861971C1', e164: 'cereal' },
{ uuid: 'B8414169-7149-4736-8E3B-477191931301', e164: 'burn' },
{ uuid: '64C97B95-A782-4E1E-BBCC-5A4ACE8d71f6', e164: 'phreak' },
{ uuid: 'CA334652-C35B-4FDC-9CC7-5F2060C771EE', e164: 'joey' },
],
avatar: { contentType: 'image/jpeg', length: avatarLen },
});
const groupInfoBuffer = groupInfo.encode().toArrayBuffer();
@ -103,15 +97,6 @@ describe('GroupBuffer', () => {
'phreak',
'joey',
]);
assert.sameDeepMembers(
group.members.map(({ uuid, e164 }) => ({ uuid, e164 })),
[
{ uuid: '3ea23646-92e8-4604-8833-6388861971c1', e164: 'cereal' },
{ uuid: 'b8414169-7149-4736-8e3b-477191931301', e164: 'burn' },
{ uuid: '64c97b95-a782-4e1e-bbcc-5a4ace8d71f6', e164: 'phreak' },
{ uuid: 'ca334652-c35b-4fdc-9cc7-5f2060c771ee', e164: 'joey' },
]
);
assert.strictEqual(group.avatar.contentType, 'image/jpeg');
assert.strictEqual(group.avatar.length, 255);
assert.strictEqual(group.avatar.data.byteLength, 255);

7
protos/SignalService.proto
View file

@ -372,16 +372,11 @@ message GroupContext {
REQUEST_INFO = 4;
}
message Member {
optional string uuid = 1;
optional string e164 = 2;
}
optional bytes id = 1;
optional Type type = 2;
optional string name = 3;
repeated string membersE164 = 4;
repeated Member members = 6;
// field 6 was removed; do not use
optional AttachmentPointer avatar = 5;
}

1
ts/textsecure.d.ts vendored
View file

@ -386,7 +386,6 @@ export declare class GroupContextClass {
type?: number;
name?: string | null;
membersE164?: Array<string>;
members?: Array<GroupContextClass.Member>;
avatar?: AttachmentPointerClass | null;
}

13
ts/textsecure/MessageReceiver.ts
View file

@ -1696,7 +1696,6 @@ class MessageReceiverInner extends EventTarget {
case window.textsecure.protobuf.GroupContext.Type.DELIVER:
decrypted.group.name = null;
decrypted.group.membersE164 = [];
decrypted.group.members = [];
decrypted.group.avatar = null;
break;
default: {
@ -1798,18 +1797,6 @@ class MessageReceiverInner extends EventTarget {
}
}
const groupMembers = decrypted.group ? decrypted.group.members || [] : [];
window.normalizeUuids(
decrypted,
[
'quote.authorUuid',
'reaction.targetAuthorUuid',
...groupMembers.map((_member, i) => `group.members.${i}.uuid`),
],
'message_receiver::processDecrypted'
);
return Promise.resolve(decrypted);
/* eslint-enable no-bitwise, no-param-reassign */
}

90
ts/textsecure/SendMessage.ts
View file

@ -38,11 +38,6 @@ export type SendMetadataType = {
};
};
type GroupMemberType = {
uuid?: string;
e164?: string;
};
export type SendOptionsType = {
senderCertificate?: ArrayBuffer;
sendMetadata?: SendMetadataType;
@ -1349,7 +1344,7 @@ export default class MessageSender {
}
async createGroup(
targetIdentifiers: Array<GroupMemberType>,
targetIdentifiers: Array<string>,
id: string,
name: string,
avatar: AttachmentType,
@ -1360,7 +1355,7 @@ export default class MessageSender {
proto.group.id = stringToArrayBuffer(id);
proto.group.type = window.textsecure.protobuf.GroupContext.Type.UPDATE;
proto.group.members = targetIdentifiers;
proto.group.membersE164 = targetIdentifiers;
proto.group.name = name;
return this.makeAttachmentPointer(avatar).then(async attachment => {
@ -1369,15 +1364,7 @@ export default class MessageSender {
}
proto.group.avatar = attachment;
return this.sendGroupProto(
targetIdentifiers.map(item => {
const identifier = item.uuid || item.e164;
if (!identifier) {
throw new Error(
'SendMessage.createGroup: Provided group member had neither uuid nor e164'
);
}
return identifier;
}),
targetIdentifiers,
proto,
Date.now(),
options
@ -1395,7 +1382,7 @@ export default class MessageSender {
groupId: string,
name: string,
avatar: AttachmentType,
targetIdentifiers: Array<GroupMemberType>,
targetIdentifiers: Array<string>,
options?: SendOptionsType
) {
const proto = new window.textsecure.protobuf.DataMessage();
@ -1404,7 +1391,7 @@ export default class MessageSender {
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = window.textsecure.protobuf.GroupContext.Type.UPDATE;
proto.group.name = name;
proto.group.members = targetIdentifiers;
proto.group.membersE164 = targetIdentifiers;
return this.makeAttachmentPointer(avatar).then(async attachment => {
if (!proto.group) {
@ -1413,15 +1400,7 @@ export default class MessageSender {
proto.group.avatar = attachment;
return this.sendGroupProto(
targetIdentifiers.map(item => {
const identifier = item.uuid || item.e164;
if (!identifier) {
throw new Error(
'SendMessage.updateGroup: Provided group member had neither uuid nor e164'
);
}
return identifier;
}),
targetIdentifiers,
proto,
Date.now(),
options
@ -1436,34 +1415,21 @@ export default class MessageSender {
async addIdentifierToGroup(
groupId: string,
newIdentifiers: Array<GroupMemberType>,
newIdentifiers: Array<string>,
options: SendOptionsType
) {
const proto = new window.textsecure.protobuf.DataMessage();
proto.group = new window.textsecure.protobuf.GroupContext();
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = window.textsecure.protobuf.GroupContext.Type.UPDATE;
proto.group.members = newIdentifiers;
return this.sendGroupProto(
newIdentifiers.map(item => {
const identifier = item.uuid || item.e164;
if (!identifier) {
throw new Error(
'SendMessage.addIdentifierToGroup: Provided group member had neither uuid nor e164'
);
}
return identifier;
}),
proto,
Date.now(),
options
);
proto.group.membersE164 = newIdentifiers;
return this.sendGroupProto(newIdentifiers, proto, Date.now(), options);
}
async setGroupName(
groupId: string,
name: string,
groupIdentifiers: Array<GroupMemberType>,
groupIdentifiers: Array<string>,
options: SendOptionsType
) {
const proto = new window.textsecure.protobuf.DataMessage();
@ -1471,35 +1437,22 @@ export default class MessageSender {
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = window.textsecure.protobuf.GroupContext.Type.UPDATE;
proto.group.name = name;
proto.group.members = groupIdentifiers;
proto.group.membersE164 = groupIdentifiers;
return this.sendGroupProto(
groupIdentifiers.map(item => {
const identifier = item.uuid || item.e164;
if (!identifier) {
throw new Error(
'SendMessage.setGroupName: Provided group member had neither uuid nor e164'
);
}
return identifier;
}),
proto,
Date.now(),
options
);
return this.sendGroupProto(groupIdentifiers, proto, Date.now(), options);
}
async setGroupAvatar(
groupId: string,
avatar: AttachmentType,
groupIdentifiers: Array<GroupMemberType>,
groupIdentifiers: Array<string>,
options: SendOptionsType
) {
const proto = new window.textsecure.protobuf.DataMessage();
proto.group = new window.textsecure.protobuf.GroupContext();
proto.group.id = stringToArrayBuffer(groupId);
proto.group.type = window.textsecure.protobuf.GroupContext.Type.UPDATE;
proto.group.members = groupIdentifiers;
proto.group.membersE164 = groupIdentifiers;
return this.makeAttachmentPointer(avatar).then(async attachment => {
if (!proto.group) {
@ -1507,20 +1460,7 @@ export default class MessageSender {
}
proto.group.avatar = attachment;
return this.sendGroupProto(
groupIdentifiers.map(item => {
const identifier = item.uuid || item.e164;
if (!identifier) {
throw new Error(
'SendMessage.setGroupAvatar: Provided group member had neither uuid nor e164'
);
}
return identifier;
}),
proto,
Date.now(),
options
);
return this.sendGroupProto(groupIdentifiers, proto, Date.now(), options);
});
}