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

Repair broken attachments with non-array 'data' fields

Browse source
This commit is contained in:
Scott Nonnenberg 2022-07-18 13:01:43 -07:00 • committed by GitHub
parent a0424be5bb
commit 2f252b8e26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 105 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ts/sql/Client.ts
View file

@ -18,6 +18,7 @@ import {
get,
groupBy,
isFunction,
isTypedArray,
last,
map,
omit,
@ -90,6 +91,7 @@ import type {
import Server from './Server';
import { isCorruptionError } from './errors';
import { MINUTE } from '../util/durations';
import { getMessageIdForLogging } from '../util/idForLogging';
// We listen to a lot of events on ipc, often on the same channel. This prevents
// any warnings that might be sent to the console in that case.
@ -433,12 +435,25 @@ function _cleanData(
return cleaned;
}
function _cleanMessageData(data: MessageType): MessageType {
export function _cleanMessageData(data: MessageType): MessageType {
// Ensure that all messages have the received_at set properly
if (!data.received_at) {
assert(false, 'received_at was not set on the message');
data.received_at = window.Signal.Util.incrementMessageCounter();
}
if (data.attachments) {
const logId = getMessageIdForLogging(data);
data.attachments = data.attachments.map((attachment, index) => {
if (attachment.data && !isTypedArray(attachment.data)) {
log.warn(
`_cleanMessageData/${logId}: Attachment ${index} had non-array \`data\` field; deleting.`
);
return omit(attachment, ['data']);
}
return attachment;
});
}
return _cleanData(omit(data, ['dataMessage']));
}