Skip to content

Preserve UTF-8 SMTP domains #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vhafdal wants to merge 1 commit into from
Closed

Preserve UTF-8 SMTP domains #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/SmtpServer.Tests/SmtpParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public void CanNotMakeHelo(string input)
[InlineData("EHLO abc-1-def.mail.com", "abc-1-def.mail.com")]
[InlineData("EHLO 192.168.1.200", "192.168.1.200")]
[InlineData("EHLO [192.168.1.200]", "192.168.1.200")]
[InlineData("EHLO dæmi.is", "dæmi.is")]
[InlineData("EHLO [IPv6:ABCD:EF01:2345:6789:ABCD:EF01:2345:6789]", "IPv6:ABCD:EF01:2345:6789:ABCD:EF01:2345:6789")]
public void CanMakeEhlo(string input, string domainOrAddress)
{
Expand Down Expand Up @@ -153,6 +154,7 @@ public void CanMakeAuthLogin()
[InlineData("MAIL FROM:<cain.osullivan@gmail.com>", "cain.osullivan", "gmail.com")]
[InlineData(@"MAIL FROM:<""Abc@def""@example.com>", "Abc@def", "example.com")]
[InlineData("MAIL FROM:<pelé@example.com> SMTPUTF8", "pelé", "example.com", "SMTPUTF8")]
[InlineData("MAIL FROM:<þorsteinn@dæmi.is> SMTPUTF8", "þorsteinn", "dæmi.is", "SMTPUTF8")]
public void CanMakeMail(string input, string user, string host, string extension = null)
{
// arrange
Expand Down Expand Up @@ -226,6 +228,7 @@ public void CanNotMakeMail(string input)
[InlineData("RCPT TO:<cain.osullivan@gmail.com>", "cain.osullivan", "gmail.com")]
[InlineData(@"RCPT TO:<""Abc@def""@example.com>", "Abc@def", "example.com")]
[InlineData("RCPT TO:<pelé@example.com>", "pelé", "example.com")]
[InlineData("RCPT TO:<þorsteinn@dæmi.is>", "þorsteinn", "dæmi.is")]
[InlineData("RCPT TO:<@example1.com:someone@example.com>", "someone", "example.com")]
[InlineData("RCPT TO:<@example1.com,@example2.com:someone@example.com>", "someone", "example.com")]
[InlineData("RCPT TO:<example/example@example.com>", "example/example", "example.com")]
Expand Down
6 changes: 3 additions & 3 deletions src/SmtpServer/Protocol/SmtpParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public bool TryMakeHelo(ref TokenReader reader, out SmtpCommand command, out Smt

if (reader.TryMake(TryMakeDomain, out var domain))
{
command = _smtpCommandFactory.CreateHelo(StringUtil.Create(domain));
command = _smtpCommandFactory.CreateHelo(StringUtil.Create(domain, Encoding.UTF8));
return true;
}

Expand Down Expand Up @@ -148,7 +148,7 @@ public bool TryMakeEhlo(ref TokenReader reader, out SmtpCommand command, out Smt

if (reader.TryMake(TryMakeDomain, out var domain))
{
command = _smtpCommandFactory.CreateEhlo(StringUtil.Create(domain));
command = _smtpCommandFactory.CreateEhlo(StringUtil.Create(domain, Encoding.UTF8));
return true;
}

Expand Down Expand Up @@ -1119,7 +1119,7 @@ static Mailbox CreateMailbox(ReadOnlySequence<byte> localpart, ReadOnlySequence<
return null;
}

var tempDomain = StringUtil.Create(domainOrAddress);
var tempDomain = StringUtil.Create(domainOrAddress, Encoding.UTF8);
if (tempDomain == null)
{
return null;
Expand Down