diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-10 10:33:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 10:33:00 +0100 |
| commit | 88d7182adaef8711bf3cc80ff604e566e517b6e6 (patch) | |
| tree | fba8485a8869449496bc148a5a006b7dfbb6a67f /synapse/crypto/keyring.py | |
| parent | 1.0.0rc1 (diff) | |
| download | synapse-88d7182adaef8711bf3cc80ff604e566e517b6e6.tar.xz | |
Improve startup checks for insecure notary configs (#5392)
It's not really a problem to trust notary responses signed by the old key so long as we are also doing TLS validation. This commit adds a check to the config parsing code at startup to check that we do not have the insecure matrix.org key without tls validation, and refuses to start without it. This allows us to remove the rather alarming-looking warning which happens at runtime.
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 96964b0d50..6f603f1961 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -750,13 +750,6 @@ class PerspectivesKeyFetcher(BaseV2KeyFetcher): verify_signed_json(response, perspective_name, perspective_keys[key_id]) verified = True - if perspective_name == "matrix.org" and key_id == "ed25519:auto": - logger.warning( - "Trusting trusted_key_server responses signed by the " - "compromised matrix.org signing key 'ed25519:auto'. " - "This is a placebo." - ) - if not verified: raise KeyLookupError( "Response not signed with a known key: signed with: %r, known keys: %r" |