feat: support optional SMTP auth #14533
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Danny Kopping <danny@coder.com>
johnstcn
approved these changes
Sep 3, 2024
mafredri
approved these changes
Sep 3, 2024
| s.log.Warn(ctx, "skipping auth; no username configured", slog.F("support_mechanisms", mechs)) | ||
| }) | ||
| // nolint:nilnil // This is a valid response. | ||
| return nil, nil |
There was a problem hiding this comment.
Is the new return signature handled by the caller(s)? I see that nilnil is new (unless sasl lib also returns it).
Edit: Might be good to mention this return signature in the function comment as well.
There was a problem hiding this comment.
Yup.
// Check for authentication capabilities.
if ok, avail := c.Extension("AUTH"); ok { <--- enters if auth is supported
// Ensure the auth mechanisms available are ones we can use.
auth, err := s.auth(ctx, avail)
if err != nil {
return true, xerrors.Errorf("determine auth mechanism: %w", err)
}
// If so, use the auth mechanism to authenticate.
if auth != nil { <--- bails out because auth is nil
if err := c.Auth(auth); err != nil {
return true, xerrors.Errorf("%T auth: %w", auth, err)
}
}
} else if !s.cfg.Auth.Empty() {
return false, xerrors.New("no authentication mechanisms supported by server")
}
<--- ... continues to process message without auth ...There was a problem hiding this comment.
Admittedly the comments could be better about this case, lemme add that.
Signed-off-by: Danny Kopping <danny@coder.com>
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.
Currently if an SMTP smarthost supports auth mechanisms but does not enforce one to be used, messages will fail to be delivered if blank authentication details are configured.
Currently messages will fail with this misleading error message:
This is a red herring. It stems from always creating an authentication client even if authentication details are not configured - but the smarthost advertises one or more auth mechanisms.
This change bails out of creating the client if authentication details are blank.