From bfb9bd697a67811aaaf784684ad4909cb8ac9221 Mon Sep 17 00:00:00 2001
From: Richard Holland <richard.holland@starstone.co.nz>
Date: Mon, 24 Oct 2022 11:51:47 +0000
Subject: [PATCH] Allow port numbers be be specified using a either a colon or
 a space (e.g 1.2.3.4:51235 and 1.2.3.4 51235)

---
 src/ripple/core/impl/Config.cpp     | 20 ++++++++++++
 src/ripple/net/impl/RPCCall.cpp     | 22 ++++++++++---
 src/ripple/rpc/handlers/Connect.cpp |  8 +++--
 src/test/core/Config_test.cpp       | 48 +++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/src/ripple/core/impl/Config.cpp b/src/ripple/core/impl/Config.cpp
index e53d9688392..7a1e444ce99 100644
--- a/src/ripple/core/impl/Config.cpp
+++ b/src/ripple/core/impl/Config.cpp
@@ -37,6 +37,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <iterator>
+#include <regex>
 #include <thread>
 
 #if BOOST_OS_WINDOWS
@@ -469,6 +470,25 @@ Config::loadFromString(std::string const& fileContents)
     if (auto s = getIniFileSection(secConfig, SECTION_SNTP))
         SNTP_SERVERS = *s;
 
+    // if the user has specified ip:port then replace : with a space.
+    {
+        auto replaceColons = [](std::vector<std::string>& strVec) {
+            const std::regex e(":([0-9]+)$");
+
+            for (size_t i = 0; i < strVec.size(); ++i)
+                strVec[i] = std::regex_replace(strVec[i], e, " $1");
+        };
+
+        replaceColons(IPS_FIXED);
+        replaceColons(IPS);
+    }
+
+    for (auto const& s : IPS_FIXED)
+        std::cout << s << "\n";
+
+    for (auto const& s : IPS)
+        std::cout << s << "\n";
+
     {
         std::string dbPath;
         if (getSingleSection(secConfig, "database_path", dbPath, j_))
diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp
index 334ca8693e3..2c84814a381 100644
--- a/src/ripple/net/impl/RPCCall.cpp
+++ b/src/ripple/net/impl/RPCCall.cpp
@@ -482,17 +482,31 @@ class RPCParser
         return jvRequest;
     }
 
-    // connect <ip> [port]
+    // connect <ip[:port]> [port]
     Json::Value
     parseConnect(Json::Value const& jvParams)
     {
         Json::Value jvRequest(Json::objectValue);
-
-        jvRequest[jss::ip] = jvParams[0u].asString();
-
+        std::string ip = jvParams[0u].asString();
         if (jvParams.size() == 2)
+        {
+            jvRequest[jss::ip] = ip;
             jvRequest[jss::port] = jvParams[1u].asUInt();
+            return jvRequest;
+        }
+
+        // handle case where there is one argument of the form ip:port
+        std::size_t colon = ip.find_last_of(":");
+        if (colon != std::string::npos)
+        {
+            jvRequest[jss::ip] = std::string{ip, 0, colon};
+            jvRequest[jss::port] =
+                Json::Value{std::string{ip, colon + 1}}.asUInt();
+            return jvRequest;
+        }
 
+        // default case, no port
+        jvRequest[jss::ip] = ip;
         return jvRequest;
     }
 
diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp
index 532e04087aa..ca567118246 100644
--- a/src/ripple/rpc/handlers/Connect.cpp
+++ b/src/ripple/rpc/handlers/Connect.cpp
@@ -59,13 +59,15 @@ doConnect(RPC::JsonContext& context)
     else
         iPort = DEFAULT_PEER_PORT;
 
-    auto ip =
-        beast::IP::Endpoint::from_string(context.params[jss::ip].asString());
+    auto const ip_str = context.params[jss::ip].asString();
+    auto ip = beast::IP::Endpoint::from_string(ip_str);
 
     if (!is_unspecified(ip))
         context.app.overlay().connect(ip.at_port(iPort));
 
-    return RPC::makeObjectValue("connecting");
+    return RPC::makeObjectValue(
+        "attempting connection to " + ip_str + ":" +
+        Json::Value{iPort}.asString());
 }
 
 }  // namespace ripple
diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp
index da29fafaca2..28d5ad9a6fb 100644
--- a/src/test/core/Config_test.cpp
+++ b/src/test/core/Config_test.cpp
@@ -856,6 +856,53 @@ r.ripple.com 51235
             cfg.section(SECTION_IPS_FIXED).values().size() == 2);
     }
 
+    void
+    testColons()
+    {
+        Config cfg;
+        /* NOTE: this string includes some explicit
+         * space chars in order to verify proper trimming */
+        std::string toLoad(R"(
+[port_rpc])"
+                           "\x20"
+                           R"(
+# comment
+    # indented comment
+)"
+                           "\x20\x20"
+                           R"(
+[ips])"
+                           "\x20"
+                           R"(
+r.ripple.com:51235
+
+  [ips_fixed])"
+                           "\x20\x20"
+                           R"(
+    # COMMENT
+    s1.ripple.com:51235
+    s2.ripple.com 51235
+    anotherserversansport
+
+)");
+        cfg.loadFromString(toLoad);
+        BEAST_EXPECT(
+            cfg.exists("port_rpc") && cfg.section("port_rpc").lines().empty() &&
+            cfg.section("port_rpc").values().empty());
+        BEAST_EXPECT(
+            cfg.exists(SECTION_IPS) &&
+            cfg.section(SECTION_IPS).lines().size() == 1 &&
+            cfg.section(SECTION_IPS).values().size() == 1);
+        BEAST_EXPECT(
+            cfg.exists(SECTION_IPS_FIXED) &&
+            cfg.section(SECTION_IPS_FIXED).lines().size() == 3 &&
+            cfg.section(SECTION_IPS_FIXED).values().size() == 3);
+        BEAST_EXPECT(cfg.IPS[0] == "r.ripple.com 51235");
+        BEAST_EXPECT(cfg.IPS_FIXED[0] == "s1.ripple.com 51235");
+        BEAST_EXPECT(cfg.IPS_FIXED[1] == "s2.ripple.com 51235");
+        BEAST_EXPECT(cfg.IPS_FIXED[2] == "anotherserversansport");
+    }
+
     void
     testComments()
     {
@@ -1147,6 +1194,7 @@ r.ripple.com 51235
         testSetup(true);
         testPort();
         testWhitespace();
+        testColons();
         testComments();
         testGetters();
         testAmendment();