fix sdk parse domain name fail because boostssl don't support domain …

…name
LucasLi1024 · Jan 29, 2024 · 0d1de5e · 0d1de5e
1 parent ec0a5d6
commit 0d1de5e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/bcos-boostssl/bcos-boostssl/websocket/WsInitializer.cpp b/bcos-boostssl/bcos-boostssl/websocket/WsInitializer.cpp
@@ -31,6 +31,7 @@
 #include <bcos-utilities/BoostLog.h>
 #include <bcos-utilities/IOServicePool.h>
 #include <bcos-utilities/ThreadPool.h>
+#include <boost/system/detail/error_code.hpp>
 #include <cstddef>
 #include <memory>
 
@@ -130,16 +131,32 @@ void WsInitializer::initWsService(WsService::Ptr _wsService)
         auto connectPeers = _config->connectPeers();
         WEBSOCKET_INITIALIZER(INFO)
             << LOG_BADGE("initWsService") << LOG_DESC("start websocket service as client")
-            << LOG_KV("connected size", connectPeers ? connectPeers->size() : 0);
+            << LOG_KV("connected endpoints size", connectPeers ? connectPeers->size() : 0);
 
         if (connectPeers)
         {
             for (const auto& peer : *connectPeers)
             {
                 if (!WsTools::validIP(peer.address()))
                 {
-                    BOOST_THROW_EXCEPTION(InvalidParameter() << errinfo_comment(
-                                              "invalid connected peer, value: " + peer.address()));
+                    boost::system::error_code err;
+
+                    // test if the address domain name
+                    boost::asio::ip::tcp::resolver::query qry(
+                        peer.address(), boost::lexical_cast<std::string>(0));
+                    resolver->resolve(qry, err);
+
+                    if (err)
+                    {
+                        BOOST_THROW_EXCEPTION(InvalidParameter() << errinfo_comment(
+                                                  "invalid connection host, ipv4/ipv6/domain name "
+                                                  "support, current: " +
+                                                  peer.address()));
+                    }
+
+                    WEBSOCKET_INITIALIZER(INFO)
+                        << LOG_BADGE("initWsService") << LOG_DESC("domain name has been set")
+                        << LOG_KV("host", peer.address());
                 }
 
                 if (!WsTools::validPort(peer.port()))

diff --git a/bcos-boostssl/bcos-boostssl/websocket/WsTools.h b/bcos-boostssl/bcos-boostssl/websocket/WsTools.h
@@ -42,7 +42,7 @@ class WsTools
         return !static_cast<bool>(ec);
     }
 
-    static bool validPort(uint16_t _port) { return _port > 1024; }
+    static bool validPort(uint16_t _port) { return _port > 0; }
 
     static bool stringToEndPoint(const std::string& peer, NodeIPEndpoint& _endpoint);
 

diff --git a/bcos-boostssl/test/unittests/websocket/WsConfigTest.cpp b/bcos-boostssl/test/unittests/websocket/WsConfigTest.cpp
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(test_WsToolsTest)
     BOOST_CHECK_EQUAL(WsTools::validIP("::1"), true);
 
     BOOST_CHECK_EQUAL(WsTools::validPort(1111), true);
-    BOOST_CHECK_EQUAL(WsTools::validPort(10), false);
+    BOOST_CHECK_EQUAL(WsTools::validPort(10), true);
     BOOST_CHECK_EQUAL(WsTools::validPort(65535), true);
 }