components/esp_matter_console: fix input validation and command dispatch

- fix command search to break outer loop when command found
- validate hex prefix (0x) on console attribute get/set arguments
- add bounds check for UDC client index

Author: shubhamdp

components/esp_matter_console/esp_matter_console.cpp

@@ -48,20 +48,21 @@ void engine::for_each_command(command_iterator_t *on_command, void *arg)
 
 esp_err_t engine::exec_command(int argc, char *argv[])
 {
-    esp_err_t err = ESP_ERR_INVALID_ARG;
     if (argc <= 0) {
-        return err;
+        return ESP_ERR_INVALID_ARG;
     }
+
     // find the command from the command set
     for (unsigned i = 0; i < _command_set_count; ++i) {
         for (unsigned j = 0; j < _command_set_size[i]; ++j) {
             if (strcmp(argv[0], _command_set[i][j].name) == 0 && _command_set[i][j].handler) {
-                err = _command_set[i][j].handler(argc - 1, &argv[1]);
-                break;
+                return _command_set[i][j].handler(argc - 1, &argv[1]);
             }
         }
     }
-    return err;
+
+    return ESP_ERR_INVALID_ARG;
+
 }
 
 esp_err_t engine::register_commands(const command_t *command_set, unsigned count)

components/esp_matter_console/esp_matter_console_attribute.cpp

@@ -17,9 +17,9 @@ static esp_err_t console_set_handler(int argc, char **argv)
 {
     VerifyOrReturnError(argc >= 4, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "The arguments for this command is invalid"));
 
-    uint16_t endpoint_id = strtoul((const char *)&argv[0][2], NULL, 16);
-    uint32_t cluster_id = strtoul((const char *)&argv[1][2], NULL, 16);
-    uint32_t attribute_id = strtoul((const char *)&argv[2][2], NULL, 16);
+    uint16_t endpoint_id = strtoul(argv[0], NULL, 0);
+    uint32_t cluster_id = strtoul(argv[1], NULL, 0);
+    uint32_t attribute_id = strtoul(argv[2], NULL, 0);
 
     attribute_t *attr = attribute::get(endpoint_id, cluster_id, attribute_id);
     if (!attr) {
@@ -158,9 +158,9 @@ static esp_err_t console_set_handler(int argc, char **argv)
 static esp_err_t console_get_handler(int argc, char **argv)
 {
     VerifyOrReturnError(argc >= 3, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "The arguments for this command is invalid"));
-    uint16_t endpoint_id = strtoul((const char *)&argv[0][2], NULL, 16);
-    uint32_t cluster_id = strtoul((const char *)&argv[1][2], NULL, 16);
-    uint32_t attribute_id = strtoul((const char *)&argv[2][2], NULL, 16);
+    uint16_t endpoint_id = strtoul(argv[0], NULL, 0);
+    uint32_t cluster_id = strtoul(argv[1], NULL, 0);
+    uint32_t attribute_id = strtoul(argv[2], NULL, 0);
 
     attribute_t *attr = attribute::get(endpoint_id, cluster_id, attribute_id);
     if (!attr) {

components/esp_matter_console/esp_matter_console_udc.cpp

@@ -32,7 +32,8 @@ static esp_err_t send_udc_request(int argc, char *argv[])
 {
     ESP_RETURN_ON_FALSE(argc == 2, ESP_ERR_INVALID_ARG, TAG, "Incorrect arguments");
     chip::Inet::IPAddress commissioner;
-    chip::Inet::IPAddress::FromString(argv[0], commissioner);
+    ESP_RETURN_ON_FALSE(chip::Inet::IPAddress::FromString(argv[0], commissioner),
+                        ESP_ERR_INVALID_ARG, TAG, "Invalid IP address");
     uint16_t port = (uint16_t)strtol(argv[1], nullptr, 10);
     chip::Protocols::UserDirectedCommissioning::IdentificationDeclaration id;
     chip::Server::GetInstance().SendUserDirectedCommissioningRequest(
@@ -44,7 +45,8 @@ static esp_err_t send_udc_cancel(int argc, char *argv[])
 {
     ESP_RETURN_ON_FALSE(argc == 2, ESP_ERR_INVALID_ARG, TAG, "Incorrect arguments");
     chip::Inet::IPAddress commissioner;
-    chip::Inet::IPAddress::FromString(argv[0], commissioner);
+    ESP_RETURN_ON_FALSE(chip::Inet::IPAddress::FromString(argv[0], commissioner),
+                        ESP_ERR_INVALID_ARG, TAG, "Invalid IP address");
     uint16_t port = (uint16_t)strtol(argv[1], nullptr, 10);
     chip::Protocols::UserDirectedCommissioning::IdentificationDeclaration id;
     id.SetCancelPasscode(true);