message/validation: avoid nil SSVMessage panic in Validate defer

Author: nkryuchkov

message/validation/errors.go

@@ -169,6 +169,6 @@ func (mv *messageValidator) handleValidationError(ctx context.Context, peerID pe
 }
 
 func (mv *messageValidator) handleValidationSuccess(ctx context.Context, decodedMessage *queue.SSVMessage) pubsub.ValidationResult {
-	recordAcceptedMessage(ctx, decodedMessage.GetID().GetRoleType())
+	recordAcceptedMessage(ctx, messageRole(decodedMessage))
 	return pubsub.ValidationAccept
 }

message/validation/validation.go

@@ -127,11 +127,7 @@ func (mv *messageValidator) Validate(ctx context.Context, peerID peer.ID, pmsg *
 	decodedMessage, err := mv.handlePubsubMessage(pmsg, time.Now())
 
 	defer func() {
-		role := spectypes.RunnerRole(spectypes.RoleUnknown)
-		if decodedMessage != nil {
-			role = decodedMessage.GetID().GetRoleType()
-		}
-		recordMessageDuration(ctx, role, time.Since(validationStart))
+		recordMessageDuration(ctx, messageRole(decodedMessage), time.Since(validationStart))
 	}()
 
 	if err != nil {
@@ -143,6 +139,13 @@ func (mv *messageValidator) Validate(ctx context.Context, peerID peer.ID, pmsg *
 	return mv.handleValidationSuccess(ctx, decodedMessage)
 }
 
+func messageRole(decodedMessage *queue.SSVMessage) spectypes.RunnerRole {
+	if decodedMessage == nil || decodedMessage.SSVMessage == nil {
+		return spectypes.RunnerRole(spectypes.RoleUnknown)
+	}
+	return decodedMessage.SSVMessage.GetID().GetRoleType()
+}
+
 func (mv *messageValidator) handlePubsubMessage(pMsg *pubsub.Message, receivedAt time.Time) (*queue.SSVMessage, error) {
 	if err := mv.validatePubSubMessage(pMsg); err != nil {
 		return nil, err

message/validation/validation_test.go

@@ -2,6 +2,7 @@ package validation
 
 import (
 	"bytes"
+	"context"
 	"crypto/rsa"
 	"crypto/sha256"
 	"encoding/hex"
@@ -1811,6 +1812,30 @@ func Test_ValidateSSVMessage(t *testing.T) {
 		require.ErrorContains(t, err, ErrNilSSVMessage.Error())
 	})
 
+	t.Run("validate handles nil ssv message without panic", func(t *testing.T) {
+		validator := New(netCfg, validatorStore, operators, dutyStore, signatureVerifier).(*messageValidator)
+
+		slot := netCfg.FirstSlotAtEpoch(1)
+		signedSSVMessage := generateSignedMessage(ks, committeeIdentifier, slot)
+		signedSSVMessage.SSVMessage = nil
+
+		encoded, err := signedSSVMessage.Encode()
+		require.NoError(t, err)
+
+		topic := "ssv.v2.0"
+		pmsg := &pubsub.Message{
+			Message: &pspb.Message{
+				Data:  encoded,
+				Topic: &topic,
+			},
+		}
+
+		require.NotPanics(t, func() {
+			result := validator.Validate(context.Background(), peerID, pmsg)
+			require.Equal(t, pubsub.ValidationReject, result)
+		})
+	})
+
 	// Receive zero round
 	t.Run("zero round", func(t *testing.T) {
 		validator := New(netCfg, validatorStore, operators, dutyStore, signatureVerifier).(*messageValidator)