This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Improve startup checks for insecure notary configs #5392
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
| @@ -41,6 +41,15 @@ | |||
| you are *sure* you want to do this, set 'accept_keys_insecurely' on the | |||
| keyserver configuration.""" | |||
|
|
|||
| RELYING_ON_MATRIX_KEY_ERROR = """\ | |||
There was a problem hiding this comment.
Suggested change
| RELYING_ON_MATRIX_KEY_ERROR = """\ | |
| RELYING_ON_MATRIX_KEY_ERROR = """ |
There was a problem hiding this comment.
nope, this is deliberate. I don't want the leading newline.
erikjohnston
approved these changes
Jun 10, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.