More explicit error messages when uploading corrupt images

packages/bsky/tests/views/posts.test.ts

@@ -4,6 +4,7 @@ import { forSnapshot, stripViewerFromPost } from '../_util'
 import { RecordEmbed, VideoEmbed } from '../../src/views/types'
 import { RecordWithMedia } from '../../dist/views/types'
 import { ids } from '../../src/lexicon/lexicons'
+import { XRPCError } from '@atproto/xrpc'
 
 describe('pds posts views', () => {
   let network: TestNetwork
@@ -189,4 +190,22 @@ describe('pds posts views', () => {
     expect(data.posts.length).toBe(1)
     expect(forSnapshot(data.posts[0])).toMatchSnapshot()
   })
+
+  it('upload malformed svg', async () => {
+    try {
+      await pdsAgent.api.com.atproto.repo.uploadBlob(
+        Buffer.from('<svgQ'),
+        {
+          headers: sc.getHeaders(sc.dids.alice),
+          encoding: 'text/html',
+        },
+      )
+      throw new Error('Didnt throw')
+    } catch (e) {
+      expect(e).toBeInstanceOf(XRPCError)
+      expect((e as XRPCError).success).toBeFalsy()
+      expect((e as XRPCError).error).toBe("InvalidRequest")
+      expect((e as XRPCError).message).toBe('Image detected but content is unparsable')
+    }
+  })
 })

packages/pds/src/image/index.ts

@@ -2,6 +2,7 @@ import { Readable } from 'stream'
 import { pipeline } from 'stream/promises'
 import sharp from 'sharp'
 import { errHasMsg } from '@atproto/common'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export async function maybeGetInfo(
   stream: Readable,
@@ -15,10 +16,12 @@ export async function maybeGetInfo(
     ])
     metadata = result
   } catch (err) {
+    // If the buffer doesn't have any identifiable image in it, return null
     if (errHasMsg(err, 'Input buffer contains unsupported image format')) {
       return null
     }
-    throw err
+    // Otherwise, the buffer has a corrupt image in it
+    throw new InvalidRequestError("Image detected but content is unparsable")
   }
   const { size, height, width, format } = metadata
   if (