Skip to content
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

Modify regex in the RcptCommand class to allow adding parameters. #822

Merged
merged 2 commits into from
Nov 27, 2024
Merged

Modify regex in the RcptCommand class to allow adding parameters. #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e2a701
refact RcptCommand regex
ghdcksgml1 Nov 26, 2024
fb75602
add test rcptToWithParameter
ghdcksgml1 Nov 26, 2024
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
2 changes: 1 addition & 1 deletion greenmail-core/src/main/java/com/icegreen/greenmail/smtp/commands/RcptCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/
public class RcptCommand
extends SmtpCommand {
static Pattern param = Pattern.compile("RCPT TO:\\s?<([^>]+)>",
static Pattern param = Pattern.compile("RCPT TO:\\s?<([^>]*)>.*",
Pattern.CASE_INSENSITIVE);

@Override
Expand Down
14 changes: 14 additions & 0 deletions greenmail-core/src/test/java/com/icegreen/greenmail/smtp/SMTPCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,18 @@ public void mailSenderAUTHSuffix() throws IOException, MessagingException {
}
}


@Test
public void rcptToWithParameter() throws IOException, MessagingException {
Session smtpSession = greenMail.getSmtp().createSession();

try (SMTPTransport smtpTransport = new SMTPTransport(smtpSession, smtpURL)) {
Socket smtpSocket = new Socket(hostAddress, port); // Closed by transport
smtpTransport.connect(smtpSocket);
assertThat(smtpTransport.isConnected()).isTrue();
smtpTransport.issueCommand("MAIL FROM: <[email protected]>", -1);
smtpTransport.issueCommand("RCPT TO: <test@localhost> NOTIFY=SUCCESS,FAILURE", -1);
assertThat(smtpTransport.getLastServerResponse()).isEqualToNormalizingWhitespace("250 OK");
}
}
}