From 2355d70426f4a41b2230b11a1a0ba76ac88df04a Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 17 Aug 2024 14:10:04 +0300 Subject: [PATCH] bridgev2/matrix: return error if trying to encrypt message without encryption enabled --- bridgev2/matrix/intent.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bridgev2/matrix/intent.go b/bridgev2/matrix/intent.go index e789fa75..91748317 100644 --- a/bridgev2/matrix/intent.go +++ b/bridgev2/matrix/intent.go @@ -56,6 +56,9 @@ func (as *ASIntent) SendMessage(ctx context.Context, roomID id.RoomID, eventType if encrypted, err := as.Matrix.StateStore.IsEncrypted(ctx, roomID); err != nil { return nil, fmt.Errorf("failed to check if room is encrypted: %w", err) } else if encrypted { + if as.Connector.Crypto == nil { + return nil, fmt.Errorf("room is encrypted, but bridge isn't configured to support encryption") + } if as.Matrix.IsCustomPuppet { if extra.Timestamp.IsZero() { as.Matrix.AddDoublePuppetValue(content)