Skip to content
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

Jump to bottom

Filter non-local addresses on whitelist [5041] #476

Merged
merged 3 commits into from Apr 29, 2019
Merged

Filter non-local addresses on whitelist [5041] #476

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
cada35a
Refs #5041. Filter non-local addresses on whitelist.
MiguelCompany Apr 2, 2019
cfb3afb
Refs #5041. Fixed unit tests.
MiguelCompany Apr 5, 2019
106d643
Refs #5041. Handling case for all whitelist filtered-out.
MiguelCompany Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/cpp/transport/UDPTransportInterface.cpp
View file
Open in desktop
Expand Up @@ -609,7 +609,6 @@ LocatorList_t UDPTransportInterface::ShrinkLocatorLists(const std::vector<Locato
// Loopback locator
IPLocator::setPhysicalPort(loopbackLocator, IPLocator::getPhysicalPort(*it));
pendingUnicast.push_back(loopbackLocator);
break;
}
else
{
Expand All @@ -618,9 +617,9 @@ LocatorList_t UDPTransportInterface::ShrinkLocatorLists(const std::vector<Locato
{
// Custom Loopback locator
pendingUnicast.push_back(*it);
break;
}
}
break;
LuisGP marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
74 changes: 33 additions & 41 deletions src/cpp/transport/UDPv4Transport.cpp
View file
Open in desktop
Expand Up @@ -83,8 +83,27 @@ UDPv4Transport::UDPv4Transport(const UDPv4TransportDescriptor& descriptor)
{
mSendBufferSize = descriptor.sendBufferSize;
mReceiveBufferSize = descriptor.receiveBufferSize;
for (const auto& interface : descriptor.interfaceWhiteList)
interface_whitelist_.emplace_back(ip::address_v4::from_string(interface));
if (!descriptor.interfaceWhiteList.empty())
{
const auto white_begin = descriptor.interfaceWhiteList.begin();
const auto white_end = descriptor.interfaceWhiteList.end();

std::vector<IPFinder::info_IP> local_interfaces;
get_ipv4s(local_interfaces, true);
for (const IPFinder::info_IP& infoIP : local_interfaces)
{
if(std::find(white_begin, white_end, infoIP.name) != white_end)
{
interface_whitelist_.emplace_back(ip::address_v4::from_string(infoIP.name));
}
}

if (interface_whitelist_.empty())
{
logError(TRANSPORT, "All whitelist interfaces where filtered out");
interface_whitelist_.emplace_back(ip::address_v4::from_string("192.0.2.0"));
}
}
}

UDPv4Transport::UDPv4Transport()
Expand Down Expand Up @@ -129,25 +148,11 @@ bool UDPv4Transport::getDefaultMetatrafficUnicastLocators(
LocatorList_t &locators,
uint32_t metatraffic_unicast_port) const
{
if (interface_whitelist_.empty())
{
Locator_t locator;
locator.kind = LOCATOR_KIND_UDPv4;
locator.port = static_cast<uint16_t>(metatraffic_unicast_port);
locator.set_Invalid_Address();
locators.push_back(locator);
}
else
{
for (auto& it : interface_whitelist_)
{
Locator_t locator;
locator.kind = LOCATOR_KIND_UDPv4;
locator.port = static_cast<uint16_t>(metatraffic_unicast_port);
IPLocator::setIPv4(locator, it.to_string());
locators.push_back(locator);
}
}
Locator_t locator;
locator.kind = LOCATOR_KIND_UDPv4;
locator.port = static_cast<uint16_t>(metatraffic_unicast_port);
locator.set_Invalid_Address();
locators.push_back(locator);

return true;
}
Expand All @@ -156,25 +161,12 @@ bool UDPv4Transport::getDefaultUnicastLocators(
LocatorList_t &locators,
uint32_t unicast_port) const
{
if (interface_whitelist_.empty())
{
Locator_t locator;
locator.kind = LOCATOR_KIND_UDPv4;
locator.set_Invalid_Address();
fillUnicastLocator(locator, unicast_port);
locators.push_back(locator);
}
else
{
for (auto& it : interface_whitelist_)
{
Locator_t locator;
locator.kind = LOCATOR_KIND_UDPv4;
IPLocator::setIPv4(locator, it.to_string());
fillUnicastLocator(locator, unicast_port);
locators.push_back(locator);
}
}
Locator_t locator;
locator.kind = LOCATOR_KIND_UDPv4;
locator.set_Invalid_Address();
fillUnicastLocator(locator, unicast_port);
locators.push_back(locator);

return true;
}

Expand Down Expand Up @@ -295,7 +287,7 @@ bool UDPv4Transport::OpenInputChannel(
uint32_t maxMsgSize)
{
std::unique_lock<std::recursive_mutex> scopedLock(mInputMapMutex);
if (!IsLocatorSupported(locator))
if (!is_locator_allowed(locator))
return false;

bool success = false;
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/transport/UDPv6Transport.cpp
View file
Open in desktop
Expand Up @@ -297,7 +297,7 @@ bool UDPv6Transport::OpenInputChannel(
uint32_t maxMsgSize)
{
std::unique_lock<std::recursive_mutex> scopedLock(mInputMapMutex);
if (!IsLocatorSupported(locator))
if (!is_locator_allowed(locator))
return false;

bool success = false;
Expand Down
28 changes: 19 additions & 9 deletions test/unittest/transport/UDPv4Tests.cpp
View file
Open in desktop
Expand Up @@ -525,17 +525,27 @@ TEST_F(UDPv4Tests, send_and_receive_between_allowed_sockets_using_unicast_to_mul

TEST_F(UDPv4Tests, open_a_blocked_socket)
{
descriptor.interfaceWhiteList.emplace_back("111.111.111.111");
UDPv4Transport transportUnderTest(descriptor);
transportUnderTest.init();
std::vector<IPFinder::info_IP> ip_list;
IPFinder::getIPs(&ip_list);

Locator_t multicastLocator;
multicastLocator.port = g_default_port;
multicastLocator.kind = LOCATOR_KIND_UDPv4;
IPLocator::setIPv4(multicastLocator, 239, 255, 0, 1);
for (const IPFinder::info_IP& ip : ip_list)
{
if (IPFinder::IP4 == ip.type)
{
descriptor.interfaceWhiteList.emplace_back("127.0.0.1");
UDPv4Transport transportUnderTest(descriptor);
transportUnderTest.init();

MockReceiverResource receiver(transportUnderTest, multicastLocator);
ASSERT_FALSE(transportUnderTest.IsInputChannelOpen(multicastLocator));
Locator_t multicastLocator;
multicastLocator.port = g_default_port;
multicastLocator.kind = LOCATOR_KIND_UDPv4;
IPLocator::setIPv4(multicastLocator, ip.name);

MockReceiverResource receiver(transportUnderTest, multicastLocator);
ASSERT_FALSE(transportUnderTest.IsInputChannelOpen(multicastLocator));
break;
}
}
}

TEST_F(UDPv4Tests, shrink_locator_lists)
Expand Down