User asked for TLS client certificate based login from DTU to MQTT server. This PR implements storage and use of x509 client certificate and private key. Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
327 lines
13 KiB
C++
327 lines
13 KiB
C++
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2022 Thomas Basler and others
|
|
*/
|
|
#include "Configuration.h"
|
|
#include "MessageOutput.h"
|
|
#include "defaults.h"
|
|
#include <ArduinoJson.h>
|
|
#include <LittleFS.h>
|
|
|
|
CONFIG_T config;
|
|
|
|
void ConfigurationClass::init()
|
|
{
|
|
memset(&config, 0x0, sizeof(config));
|
|
}
|
|
|
|
bool ConfigurationClass::write()
|
|
{
|
|
File f = LittleFS.open(CONFIG_FILENAME, "w");
|
|
if (!f) {
|
|
return false;
|
|
}
|
|
config.Cfg_SaveCount++;
|
|
|
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
|
|
|
JsonObject cfg = doc.createNestedObject("cfg");
|
|
cfg["version"] = config.Cfg_Version;
|
|
cfg["save_count"] = config.Cfg_SaveCount;
|
|
|
|
JsonObject wifi = doc.createNestedObject("wifi");
|
|
wifi["ssid"] = config.WiFi_Ssid;
|
|
wifi["password"] = config.WiFi_Password;
|
|
wifi["ip"] = IPAddress(config.WiFi_Ip).toString();
|
|
wifi["netmask"] = IPAddress(config.WiFi_Netmask).toString();
|
|
wifi["gateway"] = IPAddress(config.WiFi_Gateway).toString();
|
|
wifi["dns1"] = IPAddress(config.WiFi_Dns1).toString();
|
|
wifi["dns2"] = IPAddress(config.WiFi_Dns2).toString();
|
|
wifi["dhcp"] = config.WiFi_Dhcp;
|
|
wifi["hostname"] = config.WiFi_Hostname;
|
|
|
|
JsonObject ntp = doc.createNestedObject("ntp");
|
|
ntp["server"] = config.Ntp_Server;
|
|
ntp["timezone"] = config.Ntp_Timezone;
|
|
ntp["timezone_descr"] = config.Ntp_TimezoneDescr;
|
|
ntp["latitude"] = config.Ntp_Latitude;
|
|
ntp["longitude"] = config.Ntp_Longitude;
|
|
|
|
JsonObject mqtt = doc.createNestedObject("mqtt");
|
|
mqtt["enabled"] = config.Mqtt_Enabled;
|
|
mqtt["hostname"] = config.Mqtt_Hostname;
|
|
mqtt["port"] = config.Mqtt_Port;
|
|
mqtt["username"] = config.Mqtt_Username;
|
|
mqtt["password"] = config.Mqtt_Password;
|
|
mqtt["topic"] = config.Mqtt_Topic;
|
|
mqtt["retain"] = config.Mqtt_Retain;
|
|
mqtt["publish_interval"] = config.Mqtt_PublishInterval;
|
|
|
|
JsonObject mqtt_lwt = mqtt.createNestedObject("lwt");
|
|
mqtt_lwt["topic"] = config.Mqtt_LwtTopic;
|
|
mqtt_lwt["value_online"] = config.Mqtt_LwtValue_Online;
|
|
mqtt_lwt["value_offline"] = config.Mqtt_LwtValue_Offline;
|
|
|
|
JsonObject mqtt_tls = mqtt.createNestedObject("tls");
|
|
mqtt_tls["enabled"] = config.Mqtt_Tls;
|
|
mqtt_tls["root_ca_cert"] = config.Mqtt_RootCaCert;
|
|
mqtt_tls["certlogin"] = config.Mqtt_TlsCertLogin;
|
|
mqtt_tls["client_cert"] = config.Mqtt_ClientCert;
|
|
mqtt_tls["client_key"] = config.Mqtt_ClientKey;
|
|
|
|
JsonObject mqtt_hass = mqtt.createNestedObject("hass");
|
|
mqtt_hass["enabled"] = config.Mqtt_Hass_Enabled;
|
|
mqtt_hass["retain"] = config.Mqtt_Hass_Retain;
|
|
mqtt_hass["topic"] = config.Mqtt_Hass_Topic;
|
|
mqtt_hass["individual_panels"] = config.Mqtt_Hass_IndividualPanels;
|
|
mqtt_hass["expire"] = config.Mqtt_Hass_Expire;
|
|
|
|
JsonObject dtu = doc.createNestedObject("dtu");
|
|
dtu["serial"] = config.Dtu_Serial;
|
|
dtu["poll_interval"] = config.Dtu_PollInterval;
|
|
dtu["pa_level"] = config.Dtu_PaLevel;
|
|
|
|
JsonObject security = doc.createNestedObject("security");
|
|
security["password"] = config.Security_Password;
|
|
security["allow_readonly"] = config.Security_AllowReadonly;
|
|
|
|
JsonObject device = doc.createNestedObject("device");
|
|
device["pinmapping"] = config.Dev_PinMapping;
|
|
|
|
JsonObject display = device.createNestedObject("display");
|
|
display["powersafe"] = config.Display_PowerSafe;
|
|
display["screensaver"] = config.Display_ScreenSaver;
|
|
display["rotation"] = config.Display_Rotation;
|
|
display["contrast"] = config.Display_Contrast;
|
|
|
|
JsonArray inverters = doc.createNestedArray("inverters");
|
|
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
|
JsonObject inv = inverters.createNestedObject();
|
|
inv["serial"] = config.Inverter[i].Serial;
|
|
inv["name"] = config.Inverter[i].Name;
|
|
inv["poll_enable"] = config.Inverter[i].Poll_Enable;
|
|
inv["poll_enable_night"] = config.Inverter[i].Poll_Enable_Night;
|
|
inv["command_enable"] = config.Inverter[i].Command_Enable;
|
|
inv["command_enable_night"] = config.Inverter[i].Command_Enable_Night;
|
|
|
|
JsonArray channel = inv.createNestedArray("channel");
|
|
for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) {
|
|
JsonObject chanData = channel.createNestedObject();
|
|
chanData["name"] = config.Inverter[i].channel[c].Name;
|
|
chanData["max_power"] = config.Inverter[i].channel[c].MaxChannelPower;
|
|
chanData["yield_total_offset"] = config.Inverter[i].channel[c].YieldTotalOffset;
|
|
}
|
|
}
|
|
|
|
// Serialize JSON to file
|
|
if (serializeJson(doc, f) == 0) {
|
|
MessageOutput.println("Failed to write file");
|
|
return false;
|
|
}
|
|
|
|
f.close();
|
|
return true;
|
|
}
|
|
|
|
bool ConfigurationClass::read()
|
|
{
|
|
File f = LittleFS.open(CONFIG_FILENAME, "r", false);
|
|
|
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
|
// Deserialize the JSON document
|
|
DeserializationError error = deserializeJson(doc, f);
|
|
if (error) {
|
|
MessageOutput.println("Failed to read file, using default configuration");
|
|
}
|
|
|
|
JsonObject cfg = doc["cfg"];
|
|
config.Cfg_Version = cfg["version"] | CONFIG_VERSION;
|
|
config.Cfg_SaveCount = cfg["save_count"] | 0;
|
|
|
|
JsonObject wifi = doc["wifi"];
|
|
strlcpy(config.WiFi_Ssid, wifi["ssid"] | WIFI_SSID, sizeof(config.WiFi_Ssid));
|
|
strlcpy(config.WiFi_Password, wifi["password"] | WIFI_PASSWORD, sizeof(config.WiFi_Password));
|
|
strlcpy(config.WiFi_Hostname, wifi["hostname"] | APP_HOSTNAME, sizeof(config.WiFi_Hostname));
|
|
|
|
IPAddress wifi_ip;
|
|
wifi_ip.fromString(wifi["ip"] | "");
|
|
config.WiFi_Ip[0] = wifi_ip[0];
|
|
config.WiFi_Ip[1] = wifi_ip[1];
|
|
config.WiFi_Ip[2] = wifi_ip[2];
|
|
config.WiFi_Ip[3] = wifi_ip[3];
|
|
|
|
IPAddress wifi_netmask;
|
|
wifi_netmask.fromString(wifi["netmask"] | "");
|
|
config.WiFi_Netmask[0] = wifi_netmask[0];
|
|
config.WiFi_Netmask[1] = wifi_netmask[1];
|
|
config.WiFi_Netmask[2] = wifi_netmask[2];
|
|
config.WiFi_Netmask[3] = wifi_netmask[3];
|
|
|
|
IPAddress wifi_gateway;
|
|
wifi_gateway.fromString(wifi["gateway"] | "");
|
|
config.WiFi_Gateway[0] = wifi_gateway[0];
|
|
config.WiFi_Gateway[1] = wifi_gateway[1];
|
|
config.WiFi_Gateway[2] = wifi_gateway[2];
|
|
config.WiFi_Gateway[3] = wifi_gateway[3];
|
|
|
|
IPAddress wifi_dns1;
|
|
wifi_dns1.fromString(wifi["dns1"] | "");
|
|
config.WiFi_Dns1[0] = wifi_dns1[0];
|
|
config.WiFi_Dns1[1] = wifi_dns1[1];
|
|
config.WiFi_Dns1[2] = wifi_dns1[2];
|
|
config.WiFi_Dns1[3] = wifi_dns1[3];
|
|
|
|
IPAddress wifi_dns2;
|
|
wifi_dns2.fromString(wifi["dns2"] | "");
|
|
config.WiFi_Dns2[0] = wifi_dns2[0];
|
|
config.WiFi_Dns2[1] = wifi_dns2[1];
|
|
config.WiFi_Dns2[2] = wifi_dns2[2];
|
|
config.WiFi_Dns2[3] = wifi_dns2[3];
|
|
|
|
config.WiFi_Dhcp = wifi["dhcp"] | WIFI_DHCP;
|
|
|
|
JsonObject ntp = doc["ntp"];
|
|
strlcpy(config.Ntp_Server, ntp["server"] | NTP_SERVER, sizeof(config.Ntp_Server));
|
|
strlcpy(config.Ntp_Timezone, ntp["timezone"] | NTP_TIMEZONE, sizeof(config.Ntp_Timezone));
|
|
strlcpy(config.Ntp_TimezoneDescr, ntp["timezone_descr"] | NTP_TIMEZONEDESCR, sizeof(config.Ntp_TimezoneDescr));
|
|
config.Ntp_Latitude = ntp["latitude"] | NTP_LATITUDE;
|
|
config.Ntp_Longitude = ntp["longitude"] | NTP_LONGITUDE;
|
|
|
|
JsonObject mqtt = doc["mqtt"];
|
|
config.Mqtt_Enabled = mqtt["enabled"] | MQTT_ENABLED;
|
|
strlcpy(config.Mqtt_Hostname, mqtt["hostname"] | MQTT_HOST, sizeof(config.Mqtt_Hostname));
|
|
config.Mqtt_Port = mqtt["port"] | MQTT_PORT;
|
|
strlcpy(config.Mqtt_Username, mqtt["username"] | MQTT_USER, sizeof(config.Mqtt_Username));
|
|
strlcpy(config.Mqtt_Password, mqtt["password"] | MQTT_PASSWORD, sizeof(config.Mqtt_Password));
|
|
strlcpy(config.Mqtt_Topic, mqtt["topic"] | MQTT_TOPIC, sizeof(config.Mqtt_Topic));
|
|
config.Mqtt_Retain = mqtt["retain"] | MQTT_RETAIN;
|
|
config.Mqtt_PublishInterval = mqtt["publish_interval"] | MQTT_PUBLISH_INTERVAL;
|
|
|
|
JsonObject mqtt_lwt = mqtt["lwt"];
|
|
strlcpy(config.Mqtt_LwtTopic, mqtt_lwt["topic"] | MQTT_LWT_TOPIC, sizeof(config.Mqtt_LwtTopic));
|
|
strlcpy(config.Mqtt_LwtValue_Online, mqtt_lwt["value_online"] | MQTT_LWT_ONLINE, sizeof(config.Mqtt_LwtValue_Online));
|
|
strlcpy(config.Mqtt_LwtValue_Offline, mqtt_lwt["value_offline"] | MQTT_LWT_OFFLINE, sizeof(config.Mqtt_LwtValue_Offline));
|
|
|
|
JsonObject mqtt_tls = mqtt["tls"];
|
|
config.Mqtt_Tls = mqtt_tls["enabled"] | MQTT_TLS;
|
|
strlcpy(config.Mqtt_RootCaCert, mqtt_tls["root_ca_cert"] | MQTT_ROOT_CA_CERT, sizeof(config.Mqtt_RootCaCert));
|
|
config.Mqtt_TlsCertLogin = mqtt_tls["certlogin"] | MQTT_TLSCERTLOGIN;
|
|
strlcpy(config.Mqtt_ClientCert, mqtt_tls["client_cert"] | MQTT_TLSCLIENTCERT, sizeof(config.Mqtt_ClientCert));
|
|
strlcpy(config.Mqtt_ClientKey, mqtt_tls["client_key"] | MQTT_TLSCLIENTKEY, sizeof(config.Mqtt_ClientKey));
|
|
|
|
JsonObject mqtt_hass = mqtt["hass"];
|
|
config.Mqtt_Hass_Enabled = mqtt_hass["enabled"] | MQTT_HASS_ENABLED;
|
|
config.Mqtt_Hass_Retain = mqtt_hass["retain"] | MQTT_HASS_RETAIN;
|
|
config.Mqtt_Hass_Expire = mqtt_hass["expire"] | MQTT_HASS_EXPIRE;
|
|
config.Mqtt_Hass_IndividualPanels = mqtt_hass["individual_panels"] | MQTT_HASS_INDIVIDUALPANELS;
|
|
strlcpy(config.Mqtt_Hass_Topic, mqtt_hass["topic"] | MQTT_HASS_TOPIC, sizeof(config.Mqtt_Hass_Topic));
|
|
|
|
JsonObject dtu = doc["dtu"];
|
|
config.Dtu_Serial = dtu["serial"] | DTU_SERIAL;
|
|
config.Dtu_PollInterval = dtu["poll_interval"] | DTU_POLL_INTERVAL;
|
|
config.Dtu_PaLevel = dtu["pa_level"] | DTU_PA_LEVEL;
|
|
|
|
JsonObject security = doc["security"];
|
|
strlcpy(config.Security_Password, security["password"] | ACCESS_POINT_PASSWORD, sizeof(config.Security_Password));
|
|
config.Security_AllowReadonly = security["allow_readonly"] | SECURITY_ALLOW_READONLY;
|
|
|
|
JsonObject device = doc["device"];
|
|
strlcpy(config.Dev_PinMapping, device["pinmapping"] | DEV_PINMAPPING, sizeof(config.Dev_PinMapping));
|
|
|
|
JsonObject display = device["display"];
|
|
config.Display_PowerSafe = display["powersafe"] | DISPLAY_POWERSAFE;
|
|
config.Display_ScreenSaver = display["screensaver"] | DISPLAY_SCREENSAVER;
|
|
config.Display_Rotation = display["rotation"] | DISPLAY_ROTATION;
|
|
config.Display_Contrast = display["contrast"] | DISPLAY_CONTRAST;
|
|
|
|
JsonArray inverters = doc["inverters"];
|
|
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
|
JsonObject inv = inverters[i].as<JsonObject>();
|
|
config.Inverter[i].Serial = inv["serial"] | 0ULL;
|
|
strlcpy(config.Inverter[i].Name, inv["name"] | "", sizeof(config.Inverter[i].Name));
|
|
|
|
config.Inverter[i].Poll_Enable = inv["poll_enable"] | true;
|
|
config.Inverter[i].Poll_Enable_Night = inv["poll_enable_night"] | true;
|
|
config.Inverter[i].Command_Enable = inv["command_enable"] | true;
|
|
config.Inverter[i].Command_Enable_Night = inv["command_enable_night"] | true;
|
|
|
|
JsonArray channel = inv["channel"];
|
|
for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) {
|
|
config.Inverter[i].channel[c].MaxChannelPower = channel[c]["max_power"] | 0;
|
|
config.Inverter[i].channel[c].YieldTotalOffset = channel[c]["yield_total_offset"] | 0.0f;
|
|
strlcpy(config.Inverter[i].channel[c].Name, channel[c]["name"] | "", sizeof(config.Inverter[i].channel[c].Name));
|
|
}
|
|
}
|
|
|
|
f.close();
|
|
return true;
|
|
}
|
|
|
|
void ConfigurationClass::migrate()
|
|
{
|
|
File f = LittleFS.open(CONFIG_FILENAME, "r", false);
|
|
if (!f) {
|
|
MessageOutput.println("Failed to open file, cancel migration");
|
|
return;
|
|
}
|
|
|
|
DynamicJsonDocument doc(JSON_BUFFER_SIZE);
|
|
// Deserialize the JSON document
|
|
DeserializationError error = deserializeJson(doc, f);
|
|
if (error) {
|
|
MessageOutput.printf("Failed to read file, cancel migration: %s\r\n", error.c_str());
|
|
return;
|
|
}
|
|
|
|
if (config.Cfg_Version < 0x00011700) {
|
|
JsonArray inverters = doc["inverters"];
|
|
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
|
JsonObject inv = inverters[i].as<JsonObject>();
|
|
JsonArray channels = inv["channels"];
|
|
for (uint8_t c = 0; c < INV_MAX_CHAN_COUNT; c++) {
|
|
config.Inverter[i].channel[c].MaxChannelPower = channels[c];
|
|
strlcpy(config.Inverter[i].channel[c].Name, "", sizeof(config.Inverter[i].channel[c].Name));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (config.Cfg_Version < 0x00011800) {
|
|
JsonObject mqtt = doc["mqtt"];
|
|
config.Mqtt_PublishInterval = mqtt["publish_invterval"];
|
|
}
|
|
|
|
f.close();
|
|
|
|
config.Cfg_Version = CONFIG_VERSION;
|
|
write();
|
|
read();
|
|
}
|
|
|
|
CONFIG_T& ConfigurationClass::get()
|
|
{
|
|
return config;
|
|
}
|
|
|
|
INVERTER_CONFIG_T* ConfigurationClass::getFreeInverterSlot()
|
|
{
|
|
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
|
if (config.Inverter[i].Serial == 0) {
|
|
return &config.Inverter[i];
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
INVERTER_CONFIG_T* ConfigurationClass::getInverterConfig(uint64_t serial)
|
|
{
|
|
for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
|
|
if (config.Inverter[i].Serial == serial) {
|
|
return &config.Inverter[i];
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
ConfigurationClass Configuration; |