From 2c53b2f193b2ae185e10851bb5ef64633a899134 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 23 Jun 2023 15:50:02 +0300 Subject: [PATCH] Update mautrix-go --- config/upgrade.go | 1 + example-config.yaml | 4 ++++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/upgrade.go b/config/upgrade.go index 440c07e..e4023e3 100644 --- a/config/upgrade.go +++ b/config/upgrade.go @@ -134,6 +134,7 @@ func DoUpgrade(helper *up.Helper) { helper.Copy(up.Bool, "bridge", "encryption", "delete_keys", "delete_prev_on_new_session") helper.Copy(up.Bool, "bridge", "encryption", "delete_keys", "delete_on_device_delete") helper.Copy(up.Bool, "bridge", "encryption", "delete_keys", "periodically_delete_expired") + helper.Copy(up.Bool, "bridge", "encryption", "delete_keys", "delete_outdated_inbound") helper.Copy(up.Str, "bridge", "encryption", "verification_levels", "receive") helper.Copy(up.Str, "bridge", "encryption", "verification_levels", "send") helper.Copy(up.Str, "bridge", "encryption", "verification_levels", "share") diff --git a/example-config.yaml b/example-config.yaml index b247c05..f5a347a 100644 --- a/example-config.yaml +++ b/example-config.yaml @@ -372,6 +372,10 @@ bridge: delete_on_device_delete: false # Periodically delete megolm sessions when 2x max_age has passed since receiving the session. periodically_delete_expired: false + # Delete inbound megolm sessions that don't have the received_at field used for + # automatic ratcheting and expired session deletion. This is meant as a migration + # to delete old keys prior to the bridge update. + delete_outdated_inbound: false # What level of device verification should be required from users? # # Valid levels: diff --git a/go.mod b/go.mod index 384adc8..f393b7d 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( golang.org/x/net v0.11.0 google.golang.org/protobuf v1.30.0 maunium.net/go/maulogger/v2 v2.4.1 - maunium.net/go/mautrix v0.15.4-0.20230619114441-3e840e962e24 + maunium.net/go/mautrix v0.15.4-0.20230623121006-d8b15c18dc3f ) require ( diff --git a/go.sum b/go.sum index 21fe37b..fb2ed0f 100644 --- a/go.sum +++ b/go.sum @@ -131,5 +131,5 @@ 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/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8= maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho= -maunium.net/go/mautrix v0.15.4-0.20230619114441-3e840e962e24 h1:caWWJEYs2G4eLbQ5y7RIrCPUgPU8m1nj6jeyGZAuYVM= -maunium.net/go/mautrix v0.15.4-0.20230619114441-3e840e962e24/go.mod h1:zLrQqdxJlLkurRCozTc9CL6FySkgZlO/kpCYxBILSLE= +maunium.net/go/mautrix v0.15.4-0.20230623121006-d8b15c18dc3f h1:On42TnPHerbuxWmKVSamncYD0MPgOkKDSqtL7eOyHJc= +maunium.net/go/mautrix v0.15.4-0.20230623121006-d8b15c18dc3f/go.mod h1:zLrQqdxJlLkurRCozTc9CL6FySkgZlO/kpCYxBILSLE=