From bee2b1f191e3a2d2a9dca9605f5dece83a8bbc43 Mon Sep 17 00:00:00 2001 From: rodriguezst <2828844+rodriguezst@users.noreply.github.com> Date: Fri, 10 Jun 2022 08:29:19 +0000 Subject: [PATCH] Add MQTT SSL preference keys --- PreferencesKeys.h | 3 +++ WebCfgServer.cpp | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/PreferencesKeys.h b/PreferencesKeys.h index 8e48fc1..56466db 100644 --- a/PreferencesKeys.h +++ b/PreferencesKeys.h @@ -10,6 +10,9 @@ #define preference_mqtt_lock_path "mqttpath" #define preference_opener_enabled "openerena" #define preference_mqtt_opener_path "mqttoppath" +#define preference_mqtt_ca "mqttca" +#define preference_mqtt_crt "mqttcrt" +#define preference_mqtt_key "mqttkey" #define preference_hostname "hostname" #define preference_network_timeout "nettmout" #define preference_query_interval_lockstate "lockStInterval" diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp index ac258e9..adc1448 100644 --- a/WebCfgServer.cpp +++ b/WebCfgServer.cpp @@ -168,6 +168,21 @@ bool WebCfgServer::processArgs(String& message) _preferences->putString(preference_mqtt_opener_path, value); configChanged = true; } + else if(key == "MQTTCA") + { + _preferences->putString(preference_mqtt_ca, value); + configChanged = true; + } + else if(key == "MQTTCRT") + { + _preferences->putString(preference_mqtt_crt, value); + configChanged = true; + } + else if(key == "MQTTKEY") + { + _preferences->putString(preference_mqtt_key, value); + configChanged = true; + } else if(key == "HOSTNAME") { _preferences->putString(preference_hostname, value); @@ -437,6 +452,9 @@ void WebCfgServer::buildMqttConfigHtml(String &response) printInputField(response, "MQTTPORT", "MQTT Broker port", _preferences->getInt(preference_mqtt_broker_port), 5); printInputField(response, "MQTTUSER", "MQTT User (# to clear)", _preferences->getString(preference_mqtt_user).c_str(), 30); printInputField(response, "MQTTPASS", "MQTT Password", "*", 30, true); + printInputField(response, "MQTTCA", "MQTT SSL CA Certificate", _preferences->getString(preference_mqtt_ca).c_str(), 180); + printInputField(response, "MQTTCRT", "MQTT SSL Client Certificate", _preferences->getString(preference_mqtt_crt).c_str(), 180); + printInputField(response, "MQTTKEY", "MQTT SSL Client Key", _preferences->getString(preference_mqtt_key).c_str(), 180); printInputField(response, "NETTIMEOUT", "Network Timeout until restart (seconds; -1 to disable)", _preferences->getInt(preference_network_timeout), 5); response.concat(""); response.concat("
");