Skip to content

fix: MN port validation on mainnet is broken after 6627 #6664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 3 commits into from
May 12, 2025
Merged

fix: MN port validation on mainnet is broken after 6627 #6664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20afc99
fix: MN port validation is broken after 6627
UdjinM6 May 10, 2025
78ebaeb
test: use mainnet setup in evo_netinfo_tests
kwvg May 11, 2025
2e8c7ef
refactor: simplify (non-)mainnet port check condition
UdjinM6 May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/evo/netinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,9 @@ NetInfoStatus MnNetInfo::ValidateService(const CService& service)
return NetInfoStatus::BadInput;
}

const auto default_port_main = MainParams().GetDefaultPort();
if (IsNodeOnMainnet() && service.GetPort() != default_port_main) {
// Must use mainnet port on mainnet
return NetInfoStatus::BadPort;
} else if (service.GetPort() == default_port_main) {
// Using mainnet port prohibited outside of mainnet
if (IsNodeOnMainnet() != (service.GetPort() == MainParams().GetDefaultPort())) {
// Must use mainnet port on mainnet.
// Must NOT use mainnet port on other networks.
return NetInfoStatus::BadPort;
}

Expand Down
22 changes: 12 additions & 10 deletions src/test/evo_netinfo_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,31 @@

#include <boost/test/unit_test.hpp>

BOOST_FIXTURE_TEST_SUITE(evo_netinfo_tests, BasicTestingSetup)

const std::vector<std::pair</*input=*/std::string, /*expected_ret=*/NetInfoStatus>> vals{
// Address and port specified
{"1.1.1.1:8888", NetInfoStatus::Success},
{"1.1.1.1:9999", NetInfoStatus::Success},
// Address specified, port should default to default P2P core
{"1.1.1.1", NetInfoStatus::Success},
// Mainnet P2P port on non-mainnet
{"1.1.1.1:9999", NetInfoStatus::BadPort},
// Non-mainnet port on mainnet
{"1.1.1.1:9998", NetInfoStatus::BadPort},
// Internal addresses not allowed on mainnet
{"127.0.0.1:9999", NetInfoStatus::BadInput},
// Valid IPv4 formatting but invalid IPv4 address
{"0.0.0.0:8888", NetInfoStatus::BadInput},
{"0.0.0.0:9999", NetInfoStatus::BadInput},
// Port greater than uint16_t max
{"1.1.1.1:99999", NetInfoStatus::BadInput},
// Only IPv4 allowed
{"[2606:4700:4700::1111]:8888", NetInfoStatus::BadInput},
{"[2606:4700:4700::1111]:9999", NetInfoStatus::BadInput},
// Domains are not allowed
{"example.com:8888", NetInfoStatus::BadInput},
{"example.com:9999", NetInfoStatus::BadInput},
// Incorrect IPv4 address
{"1.1.1.256:8888", NetInfoStatus::BadInput},
{"1.1.1.256:9999", NetInfoStatus::BadInput},
// Missing address
{":8888", NetInfoStatus::BadInput},
{":9999", NetInfoStatus::BadInput},
};

BOOST_FIXTURE_TEST_SUITE(evo_netinfo_tests, RegTestingSetup)

void ValidateGetEntries(const CServiceList& entries, const size_t expected_size)
{
BOOST_CHECK_EQUAL(entries.size(), expected_size);
Expand Down
Loading