From 1bfd457cf099ff01d7fff8f320820407da1469b9 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 14 Apr 2025 23:09:45 +0300 Subject: [PATCH] hicli/crypto: don't fail to decrypt even if decrypted content is malformed --- desktop/go.mod | 2 +- desktop/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- pkg/hicli/hicli.go | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/desktop/go.mod b/desktop/go.mod index 43fe3fb..1be66d9 100644 --- a/desktop/go.mod +++ b/desktop/go.mod @@ -79,7 +79,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - maunium.net/go/mautrix v0.23.3-0.20250413194551-60e14d7dffa4 // indirect + maunium.net/go/mautrix v0.23.3-0.20250414200811-99ff0c0964e4 // indirect mvdan.cc/xurls/v2 v2.6.0 // indirect ) diff --git a/desktop/go.sum b/desktop/go.sum index 16bf24d..028be88 100644 --- a/desktop/go.sum +++ b/desktop/go.sum @@ -260,7 +260,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -maunium.net/go/mautrix v0.23.3-0.20250413194551-60e14d7dffa4 h1:gRz3mMyRgO6O8X9Gy1QjwYlB/dbQtmuegOE0O6a3eQw= -maunium.net/go/mautrix v0.23.3-0.20250413194551-60e14d7dffa4/go.mod h1:pCYLHmo02Jauak/9VlTkbGPrBMvLXsGqTGMNOx+L2PE= +maunium.net/go/mautrix v0.23.3-0.20250414200811-99ff0c0964e4 h1:H0nImAaVSHbTfhW0rGZbwRTkHJFV6hMyXBDaS2T6MvA= +maunium.net/go/mautrix v0.23.3-0.20250414200811-99ff0c0964e4/go.mod h1:pCYLHmo02Jauak/9VlTkbGPrBMvLXsGqTGMNOx+L2PE= mvdan.cc/xurls/v2 v2.6.0 h1:3NTZpeTxYVWNSokW3MKeyVkz/j7uYXYiMtXRUfmjbgI= mvdan.cc/xurls/v2 v2.6.0/go.mod h1:bCvEZ1XvdA6wDnxY7jPPjEmigDtvtvPXAD/Exa9IMSk= diff --git a/go.mod b/go.mod index ca3b51f..934b6b2 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/text v0.23.0 gopkg.in/yaml.v3 v3.0.1 maunium.net/go/mauflag v1.0.0 - maunium.net/go/mautrix v0.23.3-0.20250413194551-60e14d7dffa4 + maunium.net/go/mautrix v0.23.3-0.20250414200811-99ff0c0964e4 mvdan.cc/xurls/v2 v2.6.0 ) diff --git a/go.sum b/go.sum index 3dd5632..d25467a 100644 --- a/go.sum +++ b/go.sum @@ -99,7 +99,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= -maunium.net/go/mautrix v0.23.3-0.20250413194551-60e14d7dffa4 h1:gRz3mMyRgO6O8X9Gy1QjwYlB/dbQtmuegOE0O6a3eQw= -maunium.net/go/mautrix v0.23.3-0.20250413194551-60e14d7dffa4/go.mod h1:pCYLHmo02Jauak/9VlTkbGPrBMvLXsGqTGMNOx+L2PE= +maunium.net/go/mautrix v0.23.3-0.20250414200811-99ff0c0964e4 h1:H0nImAaVSHbTfhW0rGZbwRTkHJFV6hMyXBDaS2T6MvA= +maunium.net/go/mautrix v0.23.3-0.20250414200811-99ff0c0964e4/go.mod h1:pCYLHmo02Jauak/9VlTkbGPrBMvLXsGqTGMNOx+L2PE= mvdan.cc/xurls/v2 v2.6.0 h1:3NTZpeTxYVWNSokW3MKeyVkz/j7uYXYiMtXRUfmjbgI= mvdan.cc/xurls/v2 v2.6.0/go.mod h1:bCvEZ1XvdA6wDnxY7jPPjEmigDtvtvPXAD/Exa9IMSk= diff --git a/pkg/hicli/hicli.go b/pkg/hicli/hicli.go index 4c3fea2..b42b4bc 100644 --- a/pkg/hicli/hicli.go +++ b/pkg/hicli/hicli.go @@ -129,6 +129,7 @@ func New(rawDB, cryptoDB *dbutil.Database, log zerolog.Logger, pickleKey []byte, c.Crypto.SessionReceived = c.handleReceivedMegolmSession c.Crypto.DisableRatchetTracking = true c.Crypto.DisableDecryptKeyFetching = true + c.Crypto.IgnorePostDecryptionParseErrors = true c.Client.Crypto = (*hiCryptoHelper)(c) return c }