From 183c8804b5f83dca52a79769e546b9f665cb9c1a Mon Sep 17 00:00:00 2001
From: Hang Zheng <hazheng@microstrategy.com>
Date: Thu, 10 Oct 2024 06:05:10 -0400
Subject: [PATCH] using the fixed localhost as the endpoint, so that the client
 verify the host could success during the TLS handshake

---
 cpp/src/arrow/filesystem/s3_test_util.cc | 2 +-
 cpp/src/arrow/testing/util.cc            | 6 ++++++
 cpp/src/arrow/testing/util.h             | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cpp/src/arrow/filesystem/s3_test_util.cc b/cpp/src/arrow/filesystem/s3_test_util.cc
index 15b124f321a0b..99a4c42afc26c 100644
--- a/cpp/src/arrow/filesystem/s3_test_util.cc
+++ b/cpp/src/arrow/filesystem/s3_test_util.cc
@@ -50,7 +50,7 @@ const char* kEnvConnectString = "ARROW_TEST_S3_CONNECT_STRING";
 const char* kEnvAccessKey = "ARROW_TEST_S3_ACCESS_KEY";
 const char* kEnvSecretKey = "ARROW_TEST_S3_SECRET_KEY";
 
-std::string GenerateConnectString() { return GetListenAddress(); }
+std::string GenerateConnectString() { return GetListenAddress("localhost"); }
 
 }  // namespace
 
diff --git a/cpp/src/arrow/testing/util.cc b/cpp/src/arrow/testing/util.cc
index 7bef9f7d4756d..e5e53801df949 100644
--- a/cpp/src/arrow/testing/util.cc
+++ b/cpp/src/arrow/testing/util.cc
@@ -206,6 +206,12 @@ std::string GetListenAddress() {
   return ss.str();
 }
 
+std::string GetListenAddress(const std::string& host) {
+  std::stringstream ss;
+  ss << host << ":" << GetListenPort();
+  return ss.str();
+}
+
 const std::vector<std::shared_ptr<DataType>>& all_dictionary_index_types() {
   static std::vector<std::shared_ptr<DataType>> types = {
       int8(), uint8(), int16(), uint16(), int32(), uint32(), int64(), uint64()};
diff --git a/cpp/src/arrow/testing/util.h b/cpp/src/arrow/testing/util.h
index b4b2785a36292..8cc28a8b073a4 100644
--- a/cpp/src/arrow/testing/util.h
+++ b/cpp/src/arrow/testing/util.h
@@ -128,6 +128,10 @@ ARROW_TESTING_EXPORT int GetListenPort();
 // port conflicts.
 ARROW_TESTING_EXPORT std::string GetListenAddress();
 
+// Get a "host:port" to listen on. Compared to GetListenAddress(), this function would use
+// the host passed in.
+ARROW_TESTING_EXPORT std::string GetListenAddress(const std::string& host);
+
 ARROW_TESTING_EXPORT
 const std::vector<std::shared_ptr<DataType>>& all_dictionary_index_types();