fix: allow key field to be unset

src/utils.ts

@@ -66,12 +66,24 @@ export const ensureArray = function <T> (maybeArray: T | T[]) {
   return maybeArray
 }
 
+const isSigned = (message: PubSubRPCMessage): boolean => {
+  if ((message.sequenceNumber == null) || (message.from == null) || (message.signature == null)) {
+    return false
+  }
+  // if a public key is present in the `from` field, the message should be signed
+  const msgFrom = peerIdFromBytes(message.from)
+  if (msgFrom.publicKey != null) {
+    return true
+  }
+  return message.key != null
+}
+
 export const toMessage = (message: PubSubRPCMessage): Message => {
   if (message.from == null) {
     throw new CodeError('RPC message was missing from', codes.ERR_MISSING_FROM)
   }
 
-  if (message.sequenceNumber == null || message.from == null || message.signature == null || message.key == null) {
+  if (!isSigned(message)) {
     return {
       type: 'unsigned',
       topic: message.topic ?? '',
@@ -83,9 +95,11 @@ export const toMessage = (message: PubSubRPCMessage): Message => {
     type: 'signed',
     from: peerIdFromBytes(message.from),
     topic: message.topic ?? '',
-    sequenceNumber: bigIntFromBytes(message.sequenceNumber),
+    sequenceNumber: bigIntFromBytes(message.sequenceNumber ?? new Uint8Array(0)),
     data: message.data ?? new Uint8Array(0),
-    signature: message.signature,
+    // @ts-expect-error this is checked in `isSigned`
+    signature: message.signature ?? new Uint8Array(0),
+    // @ts-expect-error key need not be defined
     key: message.key
   }
 }

test/utils.spec.ts

@@ -3,6 +3,7 @@ import * as utils from '../src/utils.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import type { Message, PubSubRPCMessage } from '@libp2p/interface-pubsub'
 import { peerIdFromBytes, peerIdFromString } from '@libp2p/peer-id'
+import * as PeerIdFactory from '@libp2p/peer-id-factory'
 
 describe('utils', () => {
   it('randomSeqno', () => {
@@ -94,4 +95,37 @@ describe('utils', () => {
       expect(utils.bigIntFromBytes(utils.bigIntToBytes(val))).to.equal(val)
     })
   })
+
+  it('ensures message is signed if public key is extractable', async () => {
+    const cases: PubSubRPCMessage[] = [
+      {
+        from: (await PeerIdFactory.createSecp256k1PeerId()).toBytes(),
+        topic: 'test',
+        data: new Uint8Array(0),
+        sequenceNumber: utils.bigIntToBytes(1n),
+        signature: new Uint8Array(0)
+      },
+      {
+        from: peerIdFromString('QmPNdSYk5Rfpo5euNqwtyizzmKXMNHdXeLjTQhcN4yfX22').toBytes(),
+        topic: 'test',
+        data: new Uint8Array(0),
+        sequenceNumber: utils.bigIntToBytes(1n),
+        signature: new Uint8Array(0)
+      },
+      {
+        from: peerIdFromString('QmPNdSYk5Rfpo5euNqwtyizzmKXMNHdXeLjTQhcN4yfX22').toBytes(),
+        topic: 'test',
+        data: new Uint8Array(0),
+        sequenceNumber: utils.bigIntToBytes(1n),
+        signature: new Uint8Array(0),
+        // dummy value which will fail verification
+        key: new Uint8Array(0)
+      }
+    ]
+    const expected = ['signed', 'unsigned', 'signed']
+
+    const actual = cases.map(utils.toMessage).map(m => m.type)
+
+    expect(actual).to.deep.equal(expected)
+  })
 })