set proper status code and message when server cannot decode protobuf…

… message
decentraland · Feb 22, 2024 · b2978ca · b2978ca
1 parent 976362d
commit b2978ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ws-connector/src/controllers/handlers/ws-handler.ts b/ws-connector/src/controllers/handlers/ws-handler.ts
@@ -63,9 +63,17 @@ export async function registerWsHandler(
         userData.timeout = undefined
       }
 
+      let packet: ClientPacket
+
       try {
-        const packet = ClientPacket.decode(Buffer.from(message))
+        packet = ClientPacket.decode(Buffer.from(message))
+      } catch (err: any) {
+        logger.error(err)
+        ws.end(1007, Buffer.from('Cannot decode ClientPacket'))
+        return
+      }
 
+      try {
         switch (userData.stage) {
           case Stage.HANDSHAKE_START: {
             if (!packet.message || packet.message.$case !== 'challengeRequest') {

diff --git a/ws-connector/test/integration/e2e.spec.ts b/ws-connector/test/integration/e2e.spec.ts
@@ -83,12 +83,16 @@ test('end to end test', ({ components }) => {
     const ws = await createWs('/ws')
     const fut = futureWithTimeout(3000, 'The socket was not closed')
 
-    ws.on('close', fut.resolve) // resolve on close
+    ws.on('close', (code, reason) => {
+      fut.resolve({ code, reason: reason.toString() })
+    })
     ws.on('message', fut.reject) // fail on timeout and message
 
     await socketConnected(ws)
     await socketSend(ws, new Uint8Array([1, 2, 3, 4, 5, 6]))
-    await fut
+    const { code, reason } = await fut
+    expect(code).toEqual(1007)
+    expect(reason).toEqual('Cannot decode ClientPacket')
   })
 
   it('sends different address', async () => {