fix(web): reject unsupported composer image types at attach time (#6574)

mohammed shazeb committed 3 months ago

Commit 34a12bc1 parent 7afa1845 files · +39 −0Browse files

Unified · Split

5 files

 import {
+  isProviderSendTurnSupportedImageMimeType,
   PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
   PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
 } from "@t3tools/contracts";
       await releaseOwnedFiles(input.fileReader, [uri, payload.value]);
       continue;
     }
+    if (!isProviderSendTurnSupportedImageMimeType(mimeType)) {
+      warnings.push(
+        `'${resolved?.originalName ?? fallbackName(uri, index, mimeType)}' is not a supported image type.`,
+      );
+      await releaseOwnedFiles(input.fileReader, [uri, payload.value]);
+      continue;
+    }
     if (
       resolved?.contentSize !== null &&
       resolved?.contentSize !== undefined &&

 import {
+  isProviderSendTurnSupportedImageMimeType,
   PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
   PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
   type UploadChatImageAttachment,
       error = `Unsupported file type for '${asset.fileName ?? "image"}'.`;
       continue;
     }
+    if (!isProviderSendTurnSupportedImageMimeType(mimeType)) {
+      error = `'${asset.fileName ?? "image"}' is not a supported image type. Attach GIF, JPEG, PNG, or WebP images.`;
+      continue;
+    }
     const base64 = asset.base64;
     if (!base64) {

   ThreadId,
 } from "@t3tools/contracts";
 import {
+  isProviderSendTurnSupportedImageMimeType,
   ProviderDriverKind,
   ProviderInstanceId,
   PROVIDER_SEND_TURN_MAX_ATTACHMENTS,
         error = `Unsupported file type for '${file.name}'. Please attach image files only.`;
         continue;
       }
+      if (!isProviderSendTurnSupportedImageMimeType(file.type)) {
+        error = `'${file.name}' is not a supported image type. Attach GIF, JPEG, PNG, or WebP images.`;
+        continue;
+      }
       if (reservedCount >= PROVIDER_SEND_TURN_MAX_ATTACHMENTS) {
         error = `You can attach up to ${PROVIDER_SEND_TURN_MAX_ATTACHMENTS} images per message.`;
         break;

   ThreadCreatedPayload,
   ThreadTurnDiff,
   ThreadTurnStartRequestedPayload,
+  isProviderSendTurnSupportedImageMimeType,
 } from "./orchestration.ts";
 import { ProviderInstanceId } from "./providerInstance.ts";
     assert.strictEqual(invalid._tag, "Failure");
   }),
 );
+it("isProviderSendTurnSupportedImageMimeType accepts raster formats and rejects svg", () => {
+  assert.strictEqual(isProviderSendTurnSupportedImageMimeType("image/png"), true);
+  assert.strictEqual(isProviderSendTurnSupportedImageMimeType("IMAGE/JPEG"), true);
+  assert.strictEqual(isProviderSendTurnSupportedImageMimeType("image/svg+xml"), false);
+});

@@ -144,6 +144,20 @@ export type ProviderUserInputAnswers = typeof ProviderUserInputAnswers.Type; · 143 unmodified lines
144	export const PROVIDER_SEND_TURN_MAX_INPUT_CHARS = 120_000;	144	export const PROVIDER_SEND_TURN_MAX_INPUT_CHARS = 120_000;
145	export const PROVIDER_SEND_TURN_MAX_ATTACHMENTS = 8;	145	export const PROVIDER_SEND_TURN_MAX_ATTACHMENTS = 8;
146	export const PROVIDER_SEND_TURN_MAX_IMAGE_BYTES = 10 * 1024 * 1024;	146	export const PROVIDER_SEND_TURN_MAX_IMAGE_BYTES = 10 * 1024 * 1024;
		147	export const PROVIDER_SEND_TURN_SUPPORTED_IMAGE_MIME_TYPES = [
		148	"image/gif",
		149	"image/jpeg",
		150	"image/png",
		151	"image/webp",
		152	] as const;
		153	const PROVIDER_SEND_TURN_SUPPORTED_IMAGE_MIME_TYPE_SET = new Set<string>(
		154	PROVIDER_SEND_TURN_SUPPORTED_IMAGE_MIME_TYPES,
		155	);
		156
		157	/** Whether a pasted or picked image mime type can be sent on a provider turn. */
		158	export function isProviderSendTurnSupportedImageMimeType(mimeType: string): boolean {
		159	return PROVIDER_SEND_TURN_SUPPORTED_IMAGE_MIME_TYPE_SET.has(mimeType.toLowerCase());
		160	}
147	const PROVIDER_SEND_TURN_MAX_IMAGE_DATA_URL_CHARS = 14_000_000;	161	const PROVIDER_SEND_TURN_MAX_IMAGE_DATA_URL_CHARS = 14_000_000;
148	const CHAT_ATTACHMENT_ID_MAX_CHARS = 128;	162	const CHAT_ATTACHMENT_ID_MAX_CHARS = 128;
149	// Correlation id is command id by design in this model.	163	// Correlation id is command id by design in this model.

Keyboard shortcuts