Option to disable API for MQTT

Author: awawa-dev

include/mqtt/mqtt.h

@@ -56,6 +56,7 @@ private slots:
 	QTimer*		_retryTimer;
 	bool		_initialized;
 	QJsonArray	_resultArray;
+	bool		_disableApiAccess;
 
 	Logger*		_log;
 	QMQTT::Client*	_clientInstance;	

sources/base/schema/schema-mqtt.json

@@ -38,6 +38,7 @@
 		},
 		"password" : {
 			"type": "string",
+			"format": "password",
 			"title":"edt_conf_mqtt_password_title",
 			"required" : true,
 			"default" : "",
@@ -74,6 +75,15 @@
 			"default" : "",
 			"propertyOrder" : 8
 		},
+		"disableApiAccess" :
+		{
+			"type" : "boolean",
+			"format": "checkbox",
+			"title" : "edt_conf_mqtt_disableApiAccess_title",
+			"default" : false,
+			"required" : true,
+			"propertyOrder" : 9
+		},
 		"maxRetry":
 		{
 			"type" : "integer",
@@ -84,7 +94,7 @@
 			"maximum" : 120,
 			"default" : 0,
 			"required" : true,
-			"propertyOrder" : 9
+			"propertyOrder" : 10
 		}
 	},
 	"additionalProperties" : false

sources/mqtt/mqtt.cpp

@@ -24,6 +24,7 @@ mqtt::mqtt(const QJsonDocument& mqttConfig)
 	, _currentRetry(0)
 	, _retryTimer(nullptr)
 	, _initialized(false)
+	, _disableApiAccess(false)
 	, _log(Logger::getInstance("MQTT"))
 	, _clientInstance(nullptr)
 {
@@ -210,6 +211,7 @@ void mqtt::handleSettingsUpdate(settings::type type, const QJsonDocument& config
 		_is_ssl = obj["is_ssl"].toBool(false);
 		_ignore_ssl_errors = obj["ignore_ssl_errors"].toBool(true);
 		_maxRetry = obj["maxRetry"].toInt(120);
+		_disableApiAccess = obj["disableApiAccess"].toBool(false);
 
 		_customTopic = obj["custom_topic"].toString().trimmed();
 		if (_customTopic.isEmpty())
@@ -233,7 +235,13 @@ void mqtt::begin()
 }
 
 void mqtt::executeJson(QString origin, const QJsonDocument& input, QJsonDocument& result)
-{	
+{
+	if (_disableApiAccess)
+	{
+		Error(_log, "API access is disabled in MQTT configuration");
+		return;
+	}
+
 	HyperAPI* _hyperAPI = new HyperAPI(origin, _log, true, this);
 
 	_resultArray = QJsonArray();

www/i18n/en.json

@@ -1269,5 +1269,7 @@
   "select_ha_intro": "Select Home Assistant",
   "edt_dev_spec_constantBrightness_title": "Constant brightness",
   "edt_conf_reorder_displays_title": "Reorder displays",
-  "edt_conf_reorder_displays_expl": "Manipulate the order (permutations) of the displays until you get the correct one in multi-monitor mode"
+  "edt_conf_reorder_displays_expl": "Manipulate the order (permutations) of the displays until you get the correct one in multi-monitor mode",
+  "edt_conf_mqtt_disableApiAccess_title" : "Disable API access",
+  "edt_conf_mqtt_disableApiAccess_expl" : "Block execution of API commands sent via MQTT"
 }