andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix switch to secure mqtt #2492

Browse Source
This commit is contained in:
MichaelDvP
2025-03-27 13:57:59 +01:00
parent 6f4cdb7122
commit 3a0b4ea587
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ESP32React/MqttSettingsService.cpp
View File

@@ -34,7 +34,7 @@ void MqttSettingsService::startClient() {
static bool isSecure = false; static bool isSecure = false;
if (_mqttClient != nullptr) { if (_mqttClient != nullptr) {
// do we need to change the client? // do we need to change the client?
if ((isSecure && _state.enableTLS) || (!isSecure && _state.enableTLS)) { if ((isSecure && _state.enableTLS) || (!isSecure && !_state.enableTLS)) {
return; return;
} }
delete _mqttClient; delete _mqttClient;
@@ -48,11 +48,9 @@ void MqttSettingsService::startClient() {
} else { } else {
_mqttClient = new espMqttClientSecure(espMqttClientTypes::UseInternalTask::NO); _mqttClient = new espMqttClientSecure(espMqttClientTypes::UseInternalTask::NO);
} }
if (_state.rootCA == "insecure") { if (!_mqttClient) {
static_cast<espMqttClientSecure *>(_mqttClient)->setInsecure(); emsesp::EMSESP::logger().warning("MQTT Client alloc failed");
} else { return;
String certificate = "-----BEGIN CERTIFICATE-----\n" + _state.rootCA + "\n-----END CERTIFICATE-----\n";
static_cast<espMqttClientSecure *>(_mqttClient)->setCACert(certificate.c_str());
} }
static_cast<espMqttClientSecure *>(_mqttClient)->onConnect([this](bool sessionPresent) { onMqttConnect(sessionPresent); }); static_cast<espMqttClientSecure *>(_mqttClient)->onConnect([this](bool sessionPresent) { onMqttConnect(sessionPresent); });
static_cast<espMqttClientSecure *>(_mqttClient)->onDisconnect([this](espMqttClientTypes::DisconnectReason reason) { onMqttDisconnect(reason); }); static_cast<espMqttClientSecure *>(_mqttClient)->onDisconnect([this](espMqttClientTypes::DisconnectReason reason) { onMqttDisconnect(reason); });
@@ -185,9 +183,14 @@ bool MqttSettingsService::configureMqtt() {
_reconfigureMqtt = false; _reconfigureMqtt = false;
#ifndef TASMOTA_SDK #ifndef TASMOTA_SDK
if (_state.enableTLS) { if (_state.enableTLS) {
#if defined(EMSESP_DEBUG) if (_state.rootCA == "insecure") {
emsesp::EMSESP::logger().debug("Start secure MQTT with rootCA"); emsesp::EMSESP::logger().debug("Start insecure MQTT");
#endif static_cast<espMqttClientSecure *>(_mqttClient)->setInsecure();
} else {
emsesp::EMSESP::logger().debug("Start secure MQTT with rootCA");
String certificate = "-----BEGIN CERTIFICATE-----\n" + _state.rootCA + "\n-----END CERTIFICATE-----\n";
static_cast<espMqttClientSecure *>(_mqttClient)->setCACert(certificate.c_str());
}
static_cast<espMqttClientSecure *>(_mqttClient)->setServer(_state.host.c_str(), _state.port); static_cast<espMqttClientSecure *>(_mqttClient)->setServer(_state.host.c_str(), _state.port);
if (_state.username.length() > 0) { if (_state.username.length() > 0) {
static_cast<espMqttClientSecure *>(_mqttClient) static_cast<espMqttClientSecure *>(_mqttClient)