evo: fast-fail MnNetInfo::AddEntry() if invalid characters found

Author: kwvg

src/evo/netinfo.cpp

@@ -15,6 +15,8 @@ static std::unique_ptr<const CChainParams> g_main_params{nullptr};
 static std::once_flag g_main_params_flag;
 static const CService empty_service{CService()};
 
+static constexpr std::string_view SAFE_CHARS_IPV4{"1234567890."};
+
 bool IsNodeOnMainnet() { return Params().NetworkIDString() == CBaseChainParams::MAIN; }
 const CChainParams& MainParams()
 {
@@ -23,6 +25,11 @@ const CChainParams& MainParams()
                    [&]() { g_main_params = CreateChainParams(ArgsManager{}, CBaseChainParams::MAIN); });
     return *Assert(g_main_params);
 }
+
+bool MatchCharsFilter(std::string_view input, std::string_view filter)
+{
+    return std::all_of(input.begin(), input.end(), [&filter](char c) { return filter.find(c) != std::string_view::npos; });
+}
 } // anonymous namespace
 
 bool NetInfoEntry::operator==(const NetInfoEntry& rhs) const
@@ -176,7 +183,16 @@ NetInfoStatus MnNetInfo::AddEntry(const std::string& input)
     if (!IsEmpty()) {
         return NetInfoStatus::MaxLimit;
     }
-    if (auto service_opt{Lookup(input, /*portDefault=*/Params().GetDefaultPort(), /*fAllowLookup=*/false)}) {
+
+    std::string addr;
+    uint16_t port{Params().GetDefaultPort()};
+    SplitHostPort(input, port, addr);
+    // Contains invalid characters, unlikely to pass Lookup(), fast-fail
+    if (!MatchCharsFilter(addr, SAFE_CHARS_IPV4)) {
+        return NetInfoStatus::BadInput;
+    }
+
+    if (auto service_opt{Lookup(addr, /*portDefault=*/port, /*fAllowLookup=*/false)}) {
         const auto ret{ValidateService(*service_opt)};
         if (ret == NetInfoStatus::Success) {
             m_addr = NetInfoEntry{*service_opt};

src/test/evo_netinfo_tests.cpp

@@ -28,7 +28,7 @@ const std::vector<std::pair</*input=*/std::string, /*expected_ret=*/NetInfoStatu
     // Port greater than uint16_t max
     {"1.1.1.1:99999", NetInfoStatus::BadInput},
     // Only IPv4 allowed
-    {"[2606:4700:4700::1111]:9999", NetInfoStatus::BadType},
+    {"[2606:4700:4700::1111]:9999", NetInfoStatus::BadInput},
     // Domains are not allowed
     {"example.com:9999", NetInfoStatus::BadInput},
     // Incorrect IPv4 address
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(cservice_compatible)
     // Validation failure (non-IPv4 not allowed), MnNetInfo should remain empty if ValidateService() failed
     service = CService();
     netInfo.Clear();
-    BOOST_CHECK_EQUAL(netInfo.AddEntry("[2606:4700:4700::1111]:9999"), NetInfoStatus::BadType);
+    BOOST_CHECK_EQUAL(netInfo.AddEntry("[2606:4700:4700::1111]:9999"), NetInfoStatus::BadInput);
     BOOST_CHECK(CheckIfSerSame(service, netInfo));
 }