From 9843ba048fb717243e4d9f1703c0590cdb2dd676 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 5 Jun 2023 18:18:48 +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 32ba458..d1f4e95 100644 --- a/config/upgrade.go +++ b/config/upgrade.go @@ -154,6 +154,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") if prefix, ok := helper.Get(up.Str, "appservice", "provisioning", "prefix"); ok { helper.Set(up.Str, strings.TrimSuffix(prefix, "/v1"), "bridge", "provisioning", "prefix") } else { diff --git a/example-config.yaml b/example-config.yaml index 997e943..70f7038 100644 --- a/example-config.yaml +++ b/example-config.yaml @@ -413,6 +413,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 6a1c7bd..f107f66 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( golang.org/x/net v0.10.0 google.golang.org/protobuf v1.30.0 maunium.net/go/maulogger/v2 v2.4.1 - maunium.net/go/mautrix v0.15.3-0.20230531113908-fa42f8c7c587 + maunium.net/go/mautrix v0.15.3-0.20230605151437-f71a26085e1a ) require ( diff --git a/go.sum b/go.sum index fe44c47..712a196 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.3-0.20230531113908-fa42f8c7c587 h1:Qz7Vt17cYDssit23y2l8kpURS1YKq0GFoFGluS+KYaU= -maunium.net/go/mautrix v0.15.3-0.20230531113908-fa42f8c7c587/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=