Merge branch 'pr801' into dev

webapp/src/locales/de.json

@@ -259,6 +259,8 @@
         "Retain": "Retain",
         "Tls": "TLS",
         "RootCertifcateInfo": "Root CA-Zertifikat-Informationen",
+        "TlsCertLogin": "Anmeldung mit TLS Zertifikat",
+        "ClientCertifcateInfo": "Client Zertifikat-Informationen",
         "HassSummary": "Home Assistant MQTT-Auto-Discovery Konfigurationszusammenfassung",
         "Expire": "Ablaufen",
         "IndividualPanels": "Einzelne Paneele",
@@ -387,6 +389,9 @@
         "EnableRetain": "Retain Flag aktivieren",
         "EnableTls": "TLS aktivieren",
         "RootCa": "CA-Root-Zertifikat (Standard Letsencrypt):",
+        "TlsCertLoginEnable": "TLS Zertifikat Login",
+        "ClientCert": "TLS Client-Zertifikat:",
+        "ClientKey": "TLS Client-Key:",
         "LwtParameters": "LWT-Parameter",
         "LwtTopic": "LWT-Topic:",
         "LwtTopicHint": "LWT-Topic, wird der Basis Topic angehängt",

webapp/src/locales/en.json

@@ -259,6 +259,8 @@
         "Retain": "Retain",
         "Tls": "TLS",
         "RootCertifcateInfo": "Root CA Certifcate Info",
+        "TlsCertLogin": "Login with TLS Certificate",
+        "ClientCertifcateInfo": "Client Certifcate Info",
         "HassSummary": "Home Assistant MQTT Auto Discovery Configuration Summary",
         "Expire": "Expire",
         "IndividualPanels": "Individual Panels",
@@ -387,6 +389,9 @@
         "EnableRetain": "Enable Retain Flag",
         "EnableTls": "Enable TLS",
         "RootCa": "CA-Root-Certificate (default Letsencrypt):",
+        "TlsCertLoginEnable": "Enable TLS Certificate Login",
+        "ClientCert": "TLS Client-Certificate:",
+        "ClientKey": "TLS Client-Key:",
         "LwtParameters": "LWT Parameters",
         "LwtTopic": "LWT Topic:",
         "LwtTopicHint": "LWT topic, will be append base topic",

webapp/src/locales/fr.json

@@ -259,6 +259,8 @@
         "Retain": "Conserver",
         "Tls": "TLS",
         "RootCertifcateInfo": "Informations sur le certificat de l'autorité de certification racine",
+        "TlsCertLogin": "Connexion avec un certificat TLS",
+        "ClientCertifcateInfo": "Informations sur le certificat du client",
         "HassSummary": "Résumé de la configuration de la découverte automatique du MQTT de Home Assistant",
         "Expire": "Expiration",
         "IndividualPanels": "Panneaux individuels",
@@ -387,6 +389,9 @@
         "EnableRetain": "Activation du maintien",
         "EnableTls": "Activer le TLS",
         "RootCa": "Certificat CA-Root (par défaut Letsencrypt)",
+        "TlsCertLoginEnable": "Activer la connexion par certificat TLS",
+        "ClientCert": "Certificat client TLS:",
+        "ClientKey": "Clé client TLS:",
         "LwtParameters": "Paramètres LWT",
         "LwtTopic": "Sujet LWT",
         "LwtTopicHint": "Sujet LWT, sera ajouté comme sujet de base",

webapp/src/types/MqttConfig.ts

@@ -9,6 +9,9 @@ export interface MqttConfig {
     mqtt_retain: boolean;
     mqtt_tls: boolean;
     mqtt_root_ca_cert: string;
+    mqtt_tls_cert_login: boolean;
+    mqtt_client_cert: string;
+    mqtt_client_key: string;
     mqtt_lwt_topic: string;
     mqtt_lwt_online: string;
     mqtt_lwt_offline: string;

webapp/src/types/MqttStatus.ts

@@ -8,6 +8,8 @@ export interface MqttStatus {
     mqtt_retain: boolean;
     mqtt_tls: boolean;
     mqtt_root_ca_cert_info: string;
+    mqtt_tls_cert_login: boolean;
+    mqtt_client_cert_info: string;
     mqtt_connected: boolean;
     mqtt_hass_enabled: boolean;
     mqtt_hass_expire: boolean;

webapp/src/views/MqttAdminView.vue

@@ -60,6 +60,21 @@
                               :label="$t('mqttadmin.RootCa')"
                               v-model="mqttConfigList.mqtt_root_ca_cert"
                               type="textarea" maxlength="2560" rows="10"/>
+
+                <InputElement v-show="mqttConfigList.mqtt_tls"
+                              :label="$t('mqttadmin.TlsCertLoginEnable')"
+                              v-model="mqttConfigList.mqtt_tls_cert_login"
+                              type="checkbox"/>
+
+                <InputElement v-show="mqttConfigList.mqtt_tls_cert_login"
+                              :label="$t('mqttadmin.ClientCert')"
+                              v-model="mqttConfigList.mqtt_client_cert"
+                              type="textarea" maxlength="2560" rows="10"/>
+
+                <InputElement v-show="mqttConfigList.mqtt_tls_cert_login"
+                              :label="$t('mqttadmin.ClientKey')"
+                              v-model="mqttConfigList.mqtt_client_key"
+                              type="textarea" maxlength="2560" rows="10"/>
             </CardElement>
 
             <CardElement :text="$t('mqttadmin.LwtParameters')" textVariant="text-bg-primary" add-space

webapp/src/views/MqttInfoView.vue

@@ -46,6 +46,16 @@
                             <th>{{ $t('mqttinfo.RootCertifcateInfo') }}</th>
                             <td>{{ mqttDataList.mqtt_root_ca_cert_info }}</td>
                         </tr>
+                        <tr>
+                            <th>{{ $t('mqttinfo.TlsCertLogin') }}</th>
+                            <td>
+                                <StatusBadge :status="mqttDataList.mqtt_tls_cert_login" true_text="mqttinfo.Enabled" false_text="mqttinfo.Disabled" />
+                            </td>
+                        </tr>
+                        <tr v-show="mqttDataList.mqtt_tls_cert_login">
+                            <th>{{ $t('mqttinfo.ClientCertifcateInfo') }}</th>
+                            <td>{{ mqttDataList.mqtt_client_cert_info }}</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>