Add support for SMTPUTF8 extension, RFC-6531 #280
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
seriyps
commented
Sep 16, 2021
| @@ -546,7 +554,7 @@ handle_request({<<"MAIL">>, Args}, | |||
| ?log(debug, "error: ~s~n", [Message]), | |||
| send(State, Message), | |||
| {ok, State}; | |||
| NewState -> | |||
| #state{envelope = Envelope} = NewState -> | |||
There was a problem hiding this comment.
it's actually a small bugfix, because we used to loose the value of #envelope.expectedsize we set on lines 522 and 528
| @@ -756,62 +764,73 @@ handle_error(Kind, Details, #state{module=Module, callbackstate = OldCallbackSta | |||
| State | |||
| end. | |||
|
|
|||
| -spec parse_encoded_address(Address :: binary()) -> {binary(), binary()} | 'error'. | |||
| parse_encoded_address(<<>>) -> | |||
There was a problem hiding this comment.
most of the diff in parse_encoded_address is just me replacing the tuple with the record (except one clause I added and changing list_to_binary to unicode:characters_to_binary)
| parse_encoded_address(Tail, [H | Acc], {false, AB}); % dash, dot, underscore | ||
| parse_encoded_address(<<H/utf8, Tail/binary>>, Acc, #pa{utf8 = true} = F) when H > 127 -> | ||
| %% https://datatracker.ietf.org/doc/html/rfc6531#section-3.3 | ||
| parse_encoded_address(Tail, [H | Acc], F); % UTF-8 above 7bit (when allowed) |
There was a problem hiding this comment.
this is the only new clause I added
| ?assertEqual({<<"God2@heaven.af.mil">>, <<>>}, parse_encoded_address(<<"<God2@heaven.af.mil>">>, false)), | ||
| ?assertEqual({<<"God+extension@heaven.af.mil">>, <<>>}, parse_encoded_address(<<"<God+extension@heaven.af.mil>">>, false)), | ||
| ?assertEqual({<<"God~*$@heaven.af.mil">>, <<>>}, parse_encoded_address(<<"<God~*$@heaven.af.mil>">>, false)), | ||
| ?assertEqual({<<"God~!#$%^&*()_+123@heaven.af.mil">>, <<>>}, parse_encoded_address(<<"<\"God~!#$%^&*()_+123\"@heaven.af.mil>">>, false)) |
There was a problem hiding this comment.
the only extra test in "Valid addresses should parse" section, and it is not related to the PR's topic. I just noticed that quoted address is not covered by tests
|
I agree, supporting this is good, even if we didn't see it in the wild yet. |
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.
https://datatracker.ietf.org/doc/html/rfc6531
It's relatively simple extension that allows SMTP clients send
MAIL FROM: <utf-8 email>andRCPT TO: <utf-8 email>.I never seen UTF-8 email addresses in a wild so far, but I saw many SMTP servers implementing this extension (including gmail and outlook).