[chip-tool] Add config_enable_https_requests flag to examples/chip-tool/BUILD.gn and replace gethostbyname by getaddrinfo

Author: vivien-apple

examples/chip-tool/BUILD.gn

@@ -47,6 +47,10 @@ config("config") {
     defines += [ "CONFIG_USE_LOCAL_STORAGE" ]
   }
 
+  if (config_enable_https_requests) {
+    defines += [ "CONFIG_ENABLE_HTTPS_REQUESTS" ]
+  }
+
   cflags = [ "-Wconversion" ]
 }
 

examples/chip-tool/chip-tool.gni

@@ -21,4 +21,5 @@ declare_args() {
   config_use_interactive_mode = true
   config_enable_yaml_tests = true
   config_use_local_storage = true
+  config_enable_https_requests = true
 }

examples/chip-tool/commands/dcl/HTTPSRequest.cpp

@@ -25,6 +25,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <system/SystemError.h>
 
+#ifdef CONFIG_ENABLE_HTTPS_REQUESTS
 #if (CHIP_CRYPTO_OPENSSL || CHIP_CRYPTO_BORINGSSL)
 #include <netdb.h>
 #include <openssl/ssl.h>
@@ -33,6 +34,7 @@
 #define USE_CHIP_CRYPTO 1
 #endif
 #endif //(CHIP_CRYPTO_OPENSSL || CHIP_CRYPTO_BORINGSSL)
+#endif // CONFIG_ENABLE_HTTPS_REQUESTS
 
 namespace {
 constexpr const char * kHttpsPrefix        = "https://";
@@ -68,9 +70,18 @@ class HTTPSSessionHolder
 private:
     CHIP_ERROR LogNotImplementedError() const
     {
+#ifndef CONFIG_ENABLE_HTTPS_REQUESTS
+        ChipLogError(chipTool, "HTTPS requests are disabled via build configuration (config_enable_https_requests=false).");
+#elif !(CHIP_CRYPTO_OPENSSL || CHIP_CRYPTO_BORINGSSL)
         ChipLogError(chipTool,
                      "HTTPS requests are not available because neither OpenSSL nor BoringSSL is enabled. Contributions for "
                      "alternative implementations are welcome!");
+#elif !defined(SHA256_DIGEST_LENGTH)
+        ChipLogError(chipTool,
+                     "HTTPS requests are not available because SHA256_DIGEST_LENGTH is not defined, meaning response integrity "
+                     "verification via SHA-256 digest checking cannot be performed.");
+#endif
+
         return CHIP_ERROR_NOT_IMPLEMENTED;
     }
 };
@@ -134,19 +145,21 @@ class HTTPSSessionHolder
 private:
     CHIP_ERROR InitSocket(std::string & hostname, uint16_t port, int & sock)
     {
-        auto * server = gethostbyname(hostname.c_str());
-        VerifyOrReturnError(nullptr != server, CHIP_ERROR_NOT_CONNECTED);
+        struct addrinfo * res = nullptr;
+        struct addrinfo hints = {};
+        hints.ai_family       = AF_INET;
+        hints.ai_socktype     = SOCK_STREAM;
 
-        sock = socket(AF_INET, SOCK_STREAM, 0);
-        VerifyOrReturnError(sock >= 0, CHIP_ERROR_NOT_CONNECTED);
+        int err = getaddrinfo(hostname.c_str(), std::to_string(port).c_str(), &hints, &res);
+        VerifyOrReturnError(err == 0 && res != nullptr, CHIP_ERROR_NOT_CONNECTED,
+                            ChipLogError(chipTool, "getaddrinfo failed: %s", gai_strerror(err)));
 
-        struct sockaddr_in server_addr;
-        memset(&server_addr, 0, sizeof(server_addr));
-        server_addr.sin_family = AF_INET;
-        server_addr.sin_port   = htons(port);
-        memcpy(&server_addr.sin_addr.s_addr, server->h_addr, (size_t) server->h_length);
+        sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+        VerifyOrReturnError(sock >= 0, CHIP_ERROR_NOT_CONNECTED,
+                            ChipLogError(chipTool, "%s%s:%u", kErrorConnection, hostname.c_str(), port));
 
-        int rv = connect(sock, (struct sockaddr *) &server_addr, sizeof(server_addr));
+        int rv = connect(sock, res->ai_addr, res->ai_addrlen);
+        freeaddrinfo(res);
         VerifyOrReturnError(rv >= 0, CHIP_ERROR_POSIX(errno),
                             ChipLogError(chipTool, "%s%s:%u", kErrorConnection, hostname.c_str(), port));