fix: upload of malformed jpegs with Message_Attachments_Strip_Exif disabled fails silently

apps/meteor/client/lib/chats/uploads.ts

@@ -49,14 +49,13 @@ const send = async (
 ): Promise<void> => {
 	const id = Random.id();
 
-	updateUploads((uploads) => [
-		...uploads,
-		{
-			id,
-			name: fileContent?.raw.name || file.name,
-			percentage: 0,
-		},
-	]);
+	const upload: Upload = {
+		id,
+		name: fileContent?.raw.name || file.name,
+		percentage: 0,
+	};
+
+	updateUploads((uploads) => [...uploads, upload]);
 
 	try {
 		await new Promise((resolve, reject) => {
@@ -128,6 +127,9 @@ const send = async (
 						t,
 						content,
 					});
+				} else if (xhr.readyState === xhr.DONE && xhr.status === 400) {
+					const error = JSON.parse(xhr.responseText);
+					updateUploads((uploads) => [...uploads, { ...upload, error: new Error(error.error) }]);
 				}
 			};
 

apps/meteor/client/views/room/body/UploadProgress/UploadProgressIndicator.tsx

@@ -53,7 +53,7 @@ const UploadProgressIndicator = ({ id, name, percentage, error, onClose }: Uploa
 			className={customClass}
 		>
 			<Box withTruncatedText zIndex={2} borderRadius={4}>
-				[{percentage}%] {name}
+				[{percentage}%] {name} {error && ` - ${error}`}
 			</Box>
 			<Button zIndex={3} small onClick={handleCloseClick}>
 				{t('Cancel')}

apps/meteor/tests/e2e/image-upload.spec.ts

@@ -0,0 +1,58 @@
+import { Users } from './fixtures/userStates';
+import { HomeChannel } from './page-objects';
+import { createTargetChannel, getSettingValueById, setSettingValueById } from './utils';
+import { test, expect } from './utils/test';
+
+test.use({ storageState: Users.user1.state });
+
+test.describe('image-upload', () => {
+	let settingDefaultValue: unknown;
+	let poHomeChannel: HomeChannel;
+	let targetChannel: string;
+
+	test.beforeAll(async ({ api }) => {
+		settingDefaultValue = await getSettingValueById(api, 'Message_Attachments_Strip_Exif');
+		targetChannel = await createTargetChannel(api, { members: ['user1'] });
+	});
+
+	test.beforeEach(async ({ page }) => {
+		poHomeChannel = new HomeChannel(page);
+		await page.goto('/home');
+		await poHomeChannel.sidenav.openChat(targetChannel);
+	});
+
+	test.afterAll(async ({ api }) => {
+		await setSettingValueById(api, 'Message_Attachments_Strip_Exif', settingDefaultValue);
+		expect((await api.post('/channels.delete', { roomName: targetChannel })).status()).toBe(200);
+	});
+
+	test.describe('strip exif disabled', () => {
+		test.beforeAll(async ({ api }) => {
+			await setSettingValueById(api, 'Message_Attachments_Strip_Exif', false);
+		});
+
+		test('should show error indicator when upload fails', async ({ page }) => {
+			await poHomeChannel.content.sendFileMessage('bad-orientation.jpeg');
+			await poHomeChannel.content.fileNameInput.fill('bad-orientation.jpeg');
+			await poHomeChannel.content.descriptionInput.fill('bad-orientation_description');
+			await poHomeChannel.content.btnModalConfirm.click();
+
+			await expect(page.getByText('bad-orientation.jpeg')).toContainText('Error:');
+		});
+	});
+
+	test.describe('strip exif enabled', () => {
+		test.beforeAll(async ({ api }) => {
+			await setSettingValueById(api, 'Message_Attachments_Strip_Exif', true);
+		});
+
+		test('should succeed upload of bad-orientation.jpeg', async () => {
+			await poHomeChannel.content.sendFileMessage('bad-orientation.jpeg');
+			await poHomeChannel.content.fileNameInput.fill('bad-orientation.jpeg');
+			await poHomeChannel.content.descriptionInput.fill('bad-orientation_description');
+			await poHomeChannel.content.btnModalConfirm.click();
+
+			await expect(poHomeChannel.content.getFileDescription).toHaveText('bad-orientation_description');
+		});
+	});
+});