A couple of small fixes in the recently-added Azure blob storage support #910
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
Notably, renaming the "access-key" configuration field to "azure-access-key", not because stalwart-mailserver needs the field name to change, but because having a field whose name is the same between Azure and S3 but whose function is different, causes headaches for webadmin.
tamwuff
commented
Nov 11, 2024
| @@ -126,6 +126,7 @@ impl AzureStore { | |||
| } | |||
| Err(e) => { | |||
| err = Some(e); | |||
| break; | |||
There was a problem hiding this comment.
This was something I noticed after I submitted my previous PR; if we get an error, we don't have to keep consuming from the stream, we can just break out right away and return the error to the caller.
The code would be correct either way, but it seems more efficient to do it this way and break out as soon as we know for sure we have an error.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a followup to #907
I was working on the webadmin changes, and I realized that the way that webadmin works, there's only one field in the form that is named "access-key". If we try to use that one field from both the Azure and the S3 back ends, yes, the field will get hidden and un-hidden based on what type of store we're adding. But it's still the same field.
This is not wonderful, because in the case of S3, "access-key" is not particularly secret. It's the "login name", if you will, not the "password". But Azure uses the same terminology to refer to what is, in effect, the "password". And we really want to display those two types of things differently from each other. The non-secret "access key" in S3 should be displayed as a regular text input field; the secret "access key" in Azure should be displayed as a password-type field.
We can't change the name of the field used by S3, because that would be a breaking change. But we can change the name of the field used by Azure. This PR makes the Azure back end use the config field name "azure-access-key" instead of "access-key".