Add separate HELO SPF check with helo_check config option#172
Open
fkoyer wants to merge 3 commits intofastmail:masterfrom
Open
Add separate HELO SPF check with helo_check config option#172fkoyer wants to merge 3 commits intofastmail:masterfrom
fkoyer wants to merge 3 commits intofastmail:masterfrom
Conversation
Always perform a HELO SPF check in addition to the MAIL FROM check, gated behind a new helo_check config variable (default off). Also fix the SPF auth header to include smtp.mailfrom or smtp.helo based on scope rather than always including both.
Comment on lines
+180
to
+185
| if ( $scope eq 'mfrom' ) { | ||
| $header->add_child( Mail::AuthenticationResults::Header::SubEntry->new()->set_key( 'smtp.mailfrom' )->safe_set_value( $self->get_address_from( $env_from ) ) ); | ||
| } | ||
| else { | ||
| $header->add_child( Mail::AuthenticationResults::Header::SubEntry->new()->set_key( 'smtp.helo' )->safe_set_value( $self->{ 'helo_name' } ) ); | ||
| } |
Member
There was a problem hiding this comment.
rfc7208 is ambiguous as to when these should be included, there is an example included in the rfc where both are present. It is reasonable to assume that there exists consumers of this field which expect the current behaviour, so this change to expected behaviour is likely to break some existing installations.
marcbradshaw
requested changes
Mar 16, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Always perform a HELO SPF check in addition to the MAIL FROM check, gated behind a new helo_check config variable (default off). Also fix the SPF auth header to include smtp.mailfrom or smtp.helo based on scope rather than always including both.