Forward the SenderHmac to the stream (#414)

* send the hmac through * test * also check the hmac * test fix
xmtp · Jan 6, 2025 · f6c43e0 · f6c43e0
1 parent faadec1
commit f6c43e0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/pkg/mls/api/v1/service.go b/pkg/mls/api/v1/service.go
@@ -226,7 +226,9 @@ func (s *Service) SendGroupMessages(ctx context.Context, req *mlsv1.SendGroupMes
 			log.Warn("invalid group id", zap.Error(err))
 			return nil, status.Error(codes.InvalidArgument, "invalid group id")
 		}
-		msg, err := s.store.InsertGroupMessage(ctx, decodedGroupId, input.GetV1().Data)
+
+		msgV1 := input.GetV1()
+		msg, err := s.store.InsertGroupMessage(ctx, decodedGroupId, msgV1.Data)
 		if err != nil {
 			log.Warn("error inserting message", zap.Error(err))
 			if mlsstore.IsAlreadyExistsError(err) {
@@ -242,6 +244,7 @@ func (s *Service) SendGroupMessages(ctx context.Context, req *mlsv1.SendGroupMes
 					CreatedNs: uint64(msg.CreatedAt.UnixNano()),
 					GroupId:   msg.GroupID,
 					Data:      msg.Data,
+					SenderHmac: msgV1.SenderHmac,
 				},
 			},
 		})

diff --git a/pkg/mls/api/v1/service_test.go b/pkg/mls/api/v1/service_test.go
@@ -299,6 +299,7 @@ func TestSubscribeGroupMessages_WithoutCursor(t *testing.T) {
 					CreatedNs: uint64(i + 1),
 					GroupId:   groupId,
 					Data:      []byte(fmt.Sprintf("data%d", i+1)),
+					SenderHmac: []byte(fmt.Sprintf("hmac%d", i+1)),
 				},
 			},
 		}
@@ -352,20 +353,24 @@ func TestSubscribeGroupMessages_WithCursor(t *testing.T) {
 			Version: &mlsv1.GroupMessageInput_V1_{
 				V1: &mlsv1.GroupMessageInput_V1{
 					Data: []byte("data1"),
+					SenderHmac: []byte("hmac1"),
+
 				},
 			},
 		},
 		{
 			Version: &mlsv1.GroupMessageInput_V1_{
 				V1: &mlsv1.GroupMessageInput_V1{
 					Data: []byte("data2"),
+					SenderHmac: []byte("hmac2"),
 				},
 			},
 		},
 		{
 			Version: &mlsv1.GroupMessageInput_V1_{
 				V1: &mlsv1.GroupMessageInput_V1{
 					Data: []byte("data3"),
+					SenderHmac: []byte("hmac3"),
 				},
 			},
 		},
@@ -383,10 +388,11 @@ func TestSubscribeGroupMessages_WithCursor(t *testing.T) {
 		msgs[i] = &mlsv1.GroupMessage{
 			Version: &mlsv1.GroupMessage_V1_{
 				V1: &mlsv1.GroupMessage_V1{
-					Id:        uint64(i + 4),
-					CreatedNs: uint64(i + 4),
-					GroupId:   groupId,
-					Data:      []byte(fmt.Sprintf("data%d", i+4)),
+					Id:         uint64(i + 4),
+					CreatedNs:  uint64(i + 4),
+					GroupId:    groupId,
+					Data:       []byte(fmt.Sprintf("data%d", i+4)),
+					SenderHmac: []byte(fmt.Sprintf("hmac%d", i+4)),
 				},
 			},
 		}
@@ -611,7 +617,8 @@ func newGroupMessageEqualsMatcher(obj *mlsv1.GroupMessage) *groupMessageEqualsMa
 }
 
 func (m *groupMessageEqualsMatcher) Matches(obj interface{}) bool {
-	return proto.Equal(m.obj, obj.(*mlsv1.GroupMessage))
+	return proto.Equal(m.obj, obj.(*mlsv1.GroupMessage)) &&
+		bytes.Equal(m.obj.GetV1().SenderHmac, obj.(*mlsv1.GroupMessage).GetV1().SenderHmac)
 }
 
 func (m *groupMessageEqualsMatcher) String() string {
@@ -628,7 +635,8 @@ func newGroupMessageIdAndDataEqualsMatcher(obj *mlsv1.GroupMessage) *groupMessag
 
 func (m *groupMessageIdAndDataEqualsMatcher) Matches(obj interface{}) bool {
 	return m.obj.GetV1().Id == obj.(*mlsv1.GroupMessage).GetV1().Id &&
-		bytes.Equal(m.obj.GetV1().Data, obj.(*mlsv1.GroupMessage).GetV1().Data)
+		bytes.Equal(m.obj.GetV1().Data, obj.(*mlsv1.GroupMessage).GetV1().Data) &&
+		bytes.Equal(m.obj.GetV1().SenderHmac, obj.(*mlsv1.GroupMessage).GetV1().SenderHmac)
 }
 
 func (m *groupMessageIdAndDataEqualsMatcher) String() string {