Skip to content

fix: smtp without username password #39987

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
NilanshBansal wants to merge 2 commits into from
Closed

fix: smtp without username password #39987

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f6790
potential fix for the smtp issue
NilanshBansal Mar 31, 2025
869767e
Merge branch 'release' of github.com:appsmithorg/appsmith into fix/is…
NilanshBansal Mar 31, 2025
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
71 changes: 54 additions & 17 deletions app/server/appsmith-plugins/smtpPlugin/src/main/java/com/external/plugins/SmtpPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import jakarta.mail.Message;
import jakarta.mail.MessagingException;
import jakarta.mail.Multipart;
import jakarta.mail.NoSuchProviderException;
import jakarta.mail.Part;
import jakarta.mail.PasswordAuthentication;
import jakarta.mail.Session;
Expand Down Expand Up @@ -205,19 +204,20 @@ public Mono<Session> datasourceCreate(DatasourceConfiguration datasourceConfigur

Properties prop = new Properties();
prop.put("mail.transport.protocol", "smtp");
prop.put("mail.smtp.auth", true);
prop.put("mail.smtp.starttls.enable", "true");
prop.put("mail.smtp.host", endpoint.getHost());
Long port = (endpoint.getPort() == null || endpoint.getPort() < 0) ? 25 : endpoint.getPort();
prop.put("mail.smtp.port", String.valueOf(port));
prop.put("mail.smtp.ssl.trust", endpoint.getHost());

// Don't set mail.smtp.auth initially - let the server determine if auth is needed
Session session;

if (authentication != null
&& StringUtils.hasText(authentication.getUsername())
&& StringUtils.hasText(authentication.getPassword())) {

// If credentials are provided, enable auth
prop.put("mail.smtp.auth", "true");
String username = authentication.getUsername();
String password = authentication.getPassword();

Expand All @@ -228,6 +228,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
}
});
} else {
// If no credentials provided, try without auth first
prop.put("mail.smtp.auth", "false");
session = Session.getInstance(prop);
}
Expand Down Expand Up @@ -262,28 +263,64 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
}

@Override
public Mono<DatasourceTestResult> testDatasource(Session connection) {
public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
log.debug(Thread.currentThread().getName() + ": testDatasource() called for SMTP plugin.");
return Mono.fromCallable(() -> {
Set<String> invalids = new HashSet<>();
Set<String> invalids = new HashSet<>();
try {
// Create a session using the datasource configuration
Session session = Session.getInstance(createProperties(datasourceConfiguration));
Transport transport = session.getTransport("smtp");

if (transport != null) {
try {
Transport transport = connection.getTransport();
if (transport != null) {
transport.connect();
}
return invalids;
} catch (NoSuchProviderException e) {
invalids.add(SMTPErrorMessages.DS_NO_SUCH_PROVIDER_ERROR_MSG);
transport.connect();
// If we get here, connection was successful
return new DatasourceTestResult();
} catch (AuthenticationFailedException e) {
// If auth fails, try without auth if we were using auth
if ("true".equals(session.getProperty("mail.smtp.auth"))) {
log.debug("Authentication failed, retrying without authentication");
Properties newProps = createProperties(datasourceConfiguration);
newProps.put("mail.smtp.auth", "false");
Session newSession = Session.getInstance(newProps);
Transport newTransport = newSession.getTransport("smtp");
newTransport.connect();
return new DatasourceTestResult();
}
invalids.add(SMTPErrorMessages.DS_AUTHENTICATION_FAILED_ERROR_MSG);
} catch (MessagingException e) {
log.error(e.getMessage());
invalids.add(SMTPErrorMessages.DS_CONNECTION_FAILED_TO_SMTP_SERVER_ERROR_MSG);
invalids.add(e.getMessage());
Copy link

Copilot AI Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider standardizing the error message to provide more context rather than using the raw exception message, to help users better understand the failure.

Copilot uses AI. Check for mistakes.
}
return invalids;
})
.map(DatasourceTestResult::new);
}
} catch (Exception e) {
invalids.add(e.getMessage());
}
return new DatasourceTestResult(invalids);
});
}

private Properties createProperties(DatasourceConfiguration datasourceConfiguration) {
Endpoint endpoint = datasourceConfiguration.getEndpoints().get(0);
DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();

Properties prop = new Properties();
prop.put("mail.transport.protocol", "smtp");
prop.put("mail.smtp.starttls.enable", "true");
prop.put("mail.smtp.host", endpoint.getHost());
Long port = (endpoint.getPort() == null || endpoint.getPort() < 0) ? 25 : endpoint.getPort();
prop.put("mail.smtp.port", String.valueOf(port));
prop.put("mail.smtp.ssl.trust", endpoint.getHost());

if (authentication != null
&& StringUtils.hasText(authentication.getUsername())
&& StringUtils.hasText(authentication.getPassword())) {
prop.put("mail.smtp.auth", "true");
} else {
prop.put("mail.smtp.auth", "false");
}

return prop;
}

@Override
Expand Down