evo: disallow setting PLATFORM_{HTTPS,P2P} without setting CORE_P2P

Author: kwvg

src/evo/deterministicmns.cpp

@@ -1193,6 +1193,8 @@ static bool CheckService(const ProTx& proTx, TxValidationState& state)
         return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-netinfo-addr-unroutable");
     case NetInfoStatus::Malformed:
         return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-netinfo-bad");
+    case NetInfoStatus::MissingData:
+        return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-netinfo-missing-data");
     case NetInfoStatus::Success:
         return true;
     // Shouldn't be possible during self-checks

src/evo/netinfo.cpp

@@ -357,6 +357,10 @@ NetInfoStatus ExtNetInfo::ProcessCandidate(const uint8_t purpose, const NetInfoE
         entries.push_back(candidate);
         return NetInfoStatus::Success;
     } else {
+        if (purpose != Purpose::CORE_P2P && m_data.find(Purpose::CORE_P2P) == m_data.end()) {
+            // May not register with any other purpose code if CORE_P2P is not defined first
+            return NetInfoStatus::MissingData;
+        }
         // First entry for purpose code, create new entries list
         auto [_, status] = m_data.try_emplace(purpose, std::vector<NetInfoEntry>({candidate}));
         assert(status); // We did just check to see if our value already existed, try_emplace shouldn't fail
@@ -492,6 +496,7 @@ NetInfoStatus ExtNetInfo::Validate() const
         // Exact duplicates are prohibited *across* lists
         return NetInfoStatus::Duplicate;
     }
+    const bool has_core_p2p{m_data.find(Purpose::CORE_P2P) != m_data.end()};
     for (const auto& [purpose, entries] : m_data) {
         if (!IsValidPurpose(purpose)) {
             return NetInfoStatus::Malformed;
@@ -500,6 +505,10 @@ NetInfoStatus ExtNetInfo::Validate() const
             // Purpose if present in map must have at least one entry
             return NetInfoStatus::Malformed;
         }
+        if (purpose != Purpose::CORE_P2P && !has_core_p2p) {
+            // Other purpose codes may only be defined *after* CORE_P2P
+            return NetInfoStatus::MissingData;
+        }
         if (HasDuplicates(&entries)) {
             // Partial duplicates are prohibited *within* a list
             return NetInfoStatus::Duplicate;

src/evo/netinfo.h

@@ -31,6 +31,7 @@ enum class NetInfoStatus : uint8_t {
     BadType,
     NotRoutable,
     Malformed,
+    MissingData,
 
     Success
 };
@@ -52,6 +53,8 @@ constexpr std::string_view NISToString(const NetInfoStatus code)
         return "unroutable address";
     case NetInfoStatus::Malformed:
         return "malformed";
+    case NetInfoStatus::MissingData:
+        return "missing data";
     case NetInfoStatus::MaxLimit:
         return "too many entries";
     case NetInfoStatus::Success:

src/test/evo_netinfo_tests.cpp

@@ -96,16 +96,27 @@ void TestExtNetInfo(const TestVectors& vals)
     for (const auto& [input, _, expected_ret] : vals) {
         const auto& [purpose, addr] = input;
         ExtNetInfo netInfo;
+        if (purpose != Purpose::CORE_P2P) {
+            // Entries could get rejected because a CORE_P2P entry wasn't added first, we'll do it for them
+            BOOST_CHECK_EQUAL(netInfo.AddEntry(Purpose::CORE_P2P, strprintf("1.1.1.1:%u", Params().GetDefaultPort())), NetInfoStatus::Success);
+        }
         BOOST_CHECK_EQUAL(netInfo.AddEntry(purpose, addr), expected_ret);
         if (expected_ret != NetInfoStatus::Success) {
-            // An empty ExtNetInfo is considered malformed
-            BOOST_CHECK_EQUAL(netInfo.Validate(), NetInfoStatus::Malformed);
-            BOOST_CHECK(!netInfo.HasEntries(purpose));
-            BOOST_CHECK(netInfo.GetEntries().empty());
+            if (purpose != Purpose::CORE_P2P) {
+                // The dummy entry makes the constructed ExtNetInfo valid
+                BOOST_CHECK_EQUAL(netInfo.Validate(), NetInfoStatus::Success);
+                BOOST_CHECK(!netInfo.HasEntries(purpose));
+                ValidateGetEntries(netInfo.GetEntries(), /*expected_size=*/1);
+            } else {
+                // An empty ExtNetInfo is considered malformed
+                BOOST_CHECK_EQUAL(netInfo.Validate(), NetInfoStatus::Malformed);
+                BOOST_CHECK(!netInfo.HasEntries(purpose));
+                BOOST_CHECK(netInfo.GetEntries().empty());
+            }
         } else {
             BOOST_CHECK_EQUAL(netInfo.Validate(), NetInfoStatus::Success);
             BOOST_CHECK(netInfo.HasEntries(purpose));
-            ValidateGetEntries(netInfo.GetEntries(), /*expected_size=*/1);
+            ValidateGetEntries(netInfo.GetEntries(), /*expected_size=*/purpose == Purpose::CORE_P2P ? 1 : 2);
         }
     }
 }
@@ -124,7 +135,29 @@ BOOST_AUTO_TEST_CASE(mnnetinfo_rules_main)
     }
 }
 
-BOOST_AUTO_TEST_CASE(extnetinfo_rules_main) { TestExtNetInfo(vals_main); }
+BOOST_AUTO_TEST_CASE(extnetinfo_rules_main)
+{
+    TestExtNetInfo(vals_main);
+
+    {
+        // ExtNetInfo requires adding a CORE_P2P entry before adding an entry for any other purpose
+        ExtNetInfo netInfo;
+        BOOST_CHECK_EQUAL(netInfo.AddEntry(Purpose::PLATFORM_HTTPS, "1.1.1.1:443"), NetInfoStatus::MissingData);
+        BOOST_CHECK_EQUAL(netInfo.AddEntry(Purpose::PLATFORM_P2P, "1.1.1.1:26656"), NetInfoStatus::MissingData);
+
+        // Emptiness checks
+        BOOST_CHECK_EQUAL(netInfo.Validate(), NetInfoStatus::Malformed);
+        BOOST_CHECK(netInfo.IsEmpty() && netInfo.GetEntries().empty());
+
+        BOOST_CHECK_EQUAL(netInfo.AddEntry(Purpose::CORE_P2P, "1.1.1.1:9999"), NetInfoStatus::Success);
+        BOOST_CHECK_EQUAL(netInfo.AddEntry(Purpose::PLATFORM_HTTPS, "1.1.1.1:443"), NetInfoStatus::Success);
+        BOOST_CHECK_EQUAL(netInfo.AddEntry(Purpose::PLATFORM_P2P, "1.1.1.1:26656"), NetInfoStatus::Success);
+
+        // Presence checks
+        BOOST_CHECK_EQUAL(netInfo.Validate(), NetInfoStatus::Success);
+        ValidateGetEntries(netInfo.GetEntries(), /*expected_size=*/3);
+    }
+}
 
 static const TestVectors vals_reg{
     // - MnNetInfo doesn't mind using port 0