Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-08 08:58:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

updateSchema: Be resilient to invalid images

Browse Source
This commit is contained in:
Scott Nonnenberg
2022-07-05 17:28:00 -07:00
committed by GitHub
parent 5fcf97b43b
commit 064f3dd0e0
3 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ts/types/Attachment.ts
+31 -19
View File
@@ -28,6 +28,7 @@ import { scaleImageToLevel } from '../util/scaleImageToLevel';
import * as GoogleChrome from '../util/GoogleChrome';
import { parseIntOrThrow } from '../util/parseIntOrThrow';
import { getValue } from '../RemoteConfig';
import { isRecord } from '../util/isRecord';
const MAX_WIDTH = 300;
const MAX_HEIGHT = MAX_WIDTH * 1.5;
@@ -251,7 +252,7 @@ export function isValid(
// part of re-encoding the image:
export async function autoOrientJPEG(
attachment: AttachmentType,
_: unknown,
{ logger }: { logger: LoggerType },
{
sendHQImages = false,
isIncoming = false,
@@ -280,26 +281,37 @@ export async function autoOrientJPEG(
const dataBlob = new Blob([attachment.data], {
type: attachment.contentType,
});
const { blob: xcodedDataBlob } = await scaleImageToLevel(
dataBlob,
attachment.contentType,
isIncoming
);
const xcodedDataArrayBuffer = await blobToArrayBuffer(xcodedDataBlob);
try {
const { blob: xcodedDataBlob } = await scaleImageToLevel(
dataBlob,
attachment.contentType,
isIncoming
);
const xcodedDataArrayBuffer = await blobToArrayBuffer(xcodedDataBlob);
// IMPORTANT: We overwrite the existing `data` `Uint8Array` losing the original
// image data. Ideally, we’d preserve the original image data for users who want to
// retain it but due to reports of data loss, we don’t want to overburden IndexedDB
// by potentially doubling stored image data.
// See: https://github.com/signalapp/Signal-Desktop/issues/1589
const xcodedAttachment = {
// `digest` is no longer valid for auto-oriented image data, so we discard it:
...omit(attachment, 'digest'),
data: new Uint8Array(xcodedDataArrayBuffer),
size: xcodedDataArrayBuffer.byteLength,
};
// IMPORTANT: We overwrite the existing `data` `Uint8Array` losing the original
// image data. Ideally, we’d preserve the original image data for users who want to
// retain it but due to reports of data loss, we don’t want to overburden IndexedDB
// by potentially doubling stored image data.
// See: https://github.com/signalapp/Signal-Desktop/issues/1589
const xcodedAttachment = {
// `digest` is no longer valid for auto-oriented image data, so we discard it:
...omit(attachment, 'digest'),
data: new Uint8Array(xcodedDataArrayBuffer),
size: xcodedDataArrayBuffer.byteLength,
};
return xcodedAttachment;
return xcodedAttachment;
} catch (error: unknown) {
const errorString =
isRecord(error) && 'stack' in error ? error.stack : error;
logger.error(
'autoOrientJPEG: Failed to rotate/scale attachment',
errorString
);
return attachment;
}
}
const UNICODE_LEFT_TO_RIGHT_OVERRIDE = '\u202D';