andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 13:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for email service

Browse Source
This commit is contained in:
proddy
2026-08-29 11:18:53 +02:00
parent 416fecfaed
commit 98a6199a69
4 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interface/src/app/settings/ApplicationSettings.tsx
+9 -1
View File
@@ -430,7 +430,15 @@ const ApplicationSettings = () => {
label={LL.SECURITY(0)}
value={data.email_security}
variant="outlined"
onChange={updateFormValue}
onChange={(event) =>
updateFormValue({
target: {
name: 'email_security',
type: 'number',
value: event.target.value
}
} as React.ChangeEvent<HTMLInputElement>)
}
margin="normal"
select
>
mock-api/restServer.ts
+10 -1
View File
@@ -65,7 +65,16 @@ let settings = {
modbus_max_clients: 10,
modbus_timeout: 10000,
developer_mode: true,
disable_reset: false
disable_reset: false,
email_enabled: false,
email_security: 2,
email_server: 'smtp.gmail.com',
email_port: 587,
email_login: 'test@emsesp.org',
email_pass: 'password',
email_sender: 'test@emsesp.org',
email_recp: 'test@emsesp.org',
email_subject: 'ems-esp notification'
};
// EMS-ESP System Settings
src/core/system.cpp
+9 -4
View File
@@ -147,7 +147,7 @@ bool System::command_sendmail(const char * value, const int8_t) {
port,
security == EMAIL_SECURITY::SSL ? " (SSL)"
: security == EMAIL_SECURITY::STARTTLS ? " (STARTTLS)"
: "",
: " (plain)",
value);
bool success = false;
@@ -158,7 +158,11 @@ bool System::command_sendmail(const char * value, const int8_t) {
auto * r_client = new ReadyClient(*ssl_client);
auto * smtp = new SMTPClient(*r_client);
ssl_client->setClient(basic_client);
// enableSSL is baked in at setClient() time (same as HTTP fetch). Default true
// would send a TLS Client Hello on connect — which a plain port-25 server
// logs as "SMTP syntax error" / NUL characters.
const bool implicit_ssl = (security == EMAIL_SECURITY::SSL);
ssl_client->setClient(basic_client, implicit_ssl);
ssl_client->setInsecure();
ssl_client->setBufferSizes(16384, 1024);
basic_client->setTimeout(5000); // socket-level read timeout
@@ -168,7 +172,6 @@ bool System::command_sendmail(const char * value, const int8_t) {
: security == EMAIL_SECURITY::SSL ? readymail_protocol_ssl
: readymail_protocol_tls);
// smtp->connect(server, port, sendmailCallback);
smtp->connect(server, port);
if (!smtp->isConnected()) {
@@ -180,7 +183,8 @@ bool System::command_sendmail(const char * value, const int8_t) {
return false;
}
// LOG_INFO("authenticate %s:%s", login.c_str(), pass.c_str());
// internal/open relays often have no AUTH; empty login means skip it
if (!login.isEmpty()) {
smtp->authenticate(login, pass, readymail_auth_password);
if (!smtp->isAuthenticated()) {
LOG_ERROR("send email authentication error");
@@ -190,6 +194,7 @@ bool System::command_sendmail(const char * value, const int8_t) {
delete basic_client;
return false;
}
}
JsonDocument doc(PSRAM_DOC);
String body = value;
if (body.length()) {
src/web/WebSettingsService.cpp
+2 -1
View File
@@ -317,7 +317,8 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
settings.weblog_compact = root["weblog_compact"] | EMSESP_DEFAULT_WEBLOG_COMPACT;
settings.email_enabled = root["email_enabled"] | FACTORY_EMAIL_ENABLE;
settings.email_security = root["email_security"] | FACTORY_EMAIL_SECURITY;
// Off is 0, so `| FACTORY_EMAIL_SECURITY` would replace it with STARTTLS (2)
settings.email_security = root["email_security"].isNull() ? FACTORY_EMAIL_SECURITY : root["email_security"].as<uint8_t>();
settings.email_server = root["email_server"] | FACTORY_EMAIL_SERVER;
settings.email_port = root["email_port"] | FACTORY_EMAIL_PORT;
settings.email_login = root["email_login"] | FACTORY_EMAIL_LOGIN;