From cc3035307542f48ba9bdf451f8db172e8be5906a Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 6 Jun 2023 13:52:43 +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 71175aa..6dc713d 100644 --- a/config/upgrade.go +++ b/config/upgrade.go @@ -101,6 +101,7 @@ func DoUpgrade(helper *up.Helper) { helper.Copy(up.Bool, "bridge", "encryption", "rotation", "enable_custom") helper.Copy(up.Int, "bridge", "encryption", "rotation", "milliseconds") helper.Copy(up.Int, "bridge", "encryption", "rotation", "messages") + helper.Copy(up.Bool, "bridge", "encryption", "rotation", "disable_device_change_key_rotation") helper.Copy(up.Str, "bridge", "provisioning", "prefix") if secret, ok := helper.Get(up.Str, "bridge", "provisioning", "shared_secret"); !ok || secret == "generate" { diff --git a/example-config.yaml b/example-config.yaml index 63ded47..3d04b66 100644 --- a/example-config.yaml +++ b/example-config.yaml @@ -307,6 +307,10 @@ bridge: # default. messages: 100 + # Disable rotating keys when a user's devices change? + # You should not enable this option unless you understand all the implications. + disable_device_change_key_rotation: false + # Settings for provisioning API provisioning: # Prefix for the provisioning API paths. diff --git a/go.mod b/go.mod index 63dac16..87770e1 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/yuin/goldmark v1.5.4 golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea maunium.net/go/maulogger/v2 v2.4.1 - maunium.net/go/mautrix v0.15.3-0.20230525132645-47a60154df5d + maunium.net/go/mautrix v0.15.3-0.20230605151437-f71a26085e1a ) require ( diff --git a/go.sum b/go.sum index b14fd77..77bbf5f 100644 --- a/go.sum +++ b/go.sum @@ -72,5 +72,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.3-0.20230525132645-47a60154df5d h1:0tHDApqmIue+aYF/2FZ5QecIyGG96yZDYAxS4kWtWzQ= -maunium.net/go/mautrix v0.15.3-0.20230525132645-47a60154df5d/go.mod h1:h4NwfKqE4YxGTLSgn/gawKzXAb2sF4qx8agL6QEFtGg= +maunium.net/go/mautrix v0.15.3-0.20230605151437-f71a26085e1a h1:M7iaSu1wJLdsa77g1Ak1ow9G4KoLKsyowuNQ/3dAlwA= +maunium.net/go/mautrix v0.15.3-0.20230605151437-f71a26085e1a/go.mod h1:h4NwfKqE4YxGTLSgn/gawKzXAb2sF4qx8agL6QEFtGg=