Bladeren bron

Update mautrix-go to add proper TOFU

Tulir Asokan 3 jaren geleden
bovenliggende
commit
1aed6aa94d
3 gewijzigde bestanden met toevoegingen van 7 en 6 verwijderingen
  1. 4 3
      example-config.yaml
  2. 1 1
      go.mod
  3. 2 2
      go.sum

+ 4 - 3
example-config.yaml

@@ -315,9 +315,10 @@ bridge:
         #
         # Valid levels:
         #   unverified - Send keys to all device in the room.
-        #   cross-signed - Require valid cross-signing. TOFU for the cross-signing keys themselves.
-        #   cross-signed-trusted - Require valid cross-signing, plus a valid user signature from the bridge bot.
-        #                          Note that creating user signatures from the bridge bot is not currently possible.
+        #   cross-signed-untrusted - Require valid cross-signing, but trust all cross-signing keys.
+        #   cross-signed-tofu - Require valid cross-signing, trust cross-signing keys on first use (and reject changes).
+        #   cross-signed-verified - Require valid cross-signing, plus a valid user signature from the bridge bot.
+        #                           Note that creating user signatures from the bridge bot is not currently possible.
         #   verified - Require manual per-device verification
         #              (currently only possible by modifying the `trust` column in the `crypto_device` database table).
         verification_levels:

+ 1 - 1
go.mod

@@ -15,7 +15,7 @@ require (
 	golang.org/x/net v0.0.0-20220513224357-95641704303c
 	google.golang.org/protobuf v1.28.0
 	maunium.net/go/maulogger/v2 v2.3.2
-	maunium.net/go/mautrix v0.11.1-0.20220622190947-d32425a24edb
+	maunium.net/go/mautrix v0.11.1-0.20220623114205-916294467210
 )
 
 require (

+ 2 - 2
go.sum

@@ -107,5 +107,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.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0=
 maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
-maunium.net/go/mautrix v0.11.1-0.20220622190947-d32425a24edb h1:79pFgrAZ/iujzTgR/yJlDsDkiUg2ylQXJiMBspbS/9Y=
-maunium.net/go/mautrix v0.11.1-0.20220622190947-d32425a24edb/go.mod h1:CiKpMhAx5QZFHK03jpWb0iKI3sGU8x6+LfsOjDrcO8I=
+maunium.net/go/mautrix v0.11.1-0.20220623114205-916294467210 h1:kGfVCBSV1QLMk09/4ufnGk7lMYAZuLNdlFOS+5D7XHU=
+maunium.net/go/mautrix v0.11.1-0.20220623114205-916294467210/go.mod h1:CiKpMhAx5QZFHK03jpWb0iKI3sGU8x6+LfsOjDrcO8I=