admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetDefaultLocalAddress should return the bestIP

Browse Source 
on an IPv6 network that contains the actual default local address. This is for preventing potential IP leaking.

BUG=webrtc:5376

Review URL: https://codereview.webrtc.org/1837823005

Cr-Commit-Position: refs/heads/master@{#12417}
This commit is contained in:
honghaiz 2016-04-18 14:50:44 -07:00 committed by Commit bot
parent b9e77097ed
commit af83fe65d9
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/base/network.cc
View File

@ -357,12 +357,34 @@ bool NetworkManagerBase::GetDefaultLocalAddress(int family,
*ipaddr = default_local_ipv4_address_;
return true;
} else if (family == AF_INET6 && !default_local_ipv6_address_.IsNil()) {
*ipaddr = default_local_ipv6_address_;
Network* ipv6_network = GetNetworkFromAddress(default_local_ipv6_address_);
if (ipv6_network) {
// If the default ipv6 network's BestIP is different than
// default_local_ipv6_address_, use it instead.
// This is to prevent potential IP address leakage. See WebRTC bug 5376.
*ipaddr = ipv6_network->GetBestIP();
} else {
*ipaddr = default_local_ipv6_address_;
}
return true;
}
return false;
}
Network* NetworkManagerBase::GetNetworkFromAddress(
const rtc::IPAddress& ip) const {
for (Network* network : networks_) {
const auto& ips = network->GetIPs();
if (std::find_if(ips.begin(), ips.end(),
[ip](const InterfaceAddress& existing_ip) {
return ip == static_cast<rtc::IPAddress>(existing_ip);
}) != ips.end()) {
return network;
}
}
return nullptr;
}
BasicNetworkManager::BasicNetworkManager()
: thread_(NULL), sent_first_update_(false), start_count_(0),
ignore_non_default_routes_(false) {

2
webrtc/base/network.h
View File

@ -160,6 +160,8 @@ class NetworkManagerBase : public NetworkManager {
private:
friend class NetworkTest;
Network* GetNetworkFromAddress(const rtc::IPAddress& ip) const;
EnumerationPermission enumeration_permission_;
NetworkList networks_;

29
webrtc/base/network_unittest.cc
View File

@ -1006,6 +1006,35 @@ TEST_F(NetworkTest, DefaultLocalAddress) {
EXPECT_EQ(ip, GetLoopbackIP(AF_INET));
EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
EXPECT_EQ(ip, GetLoopbackIP(AF_INET6));
// More tests on GetDefaultLocalAddress with ipv6 addresses where the set
// default address may be different from the best IP address of any network.
InterfaceAddress ip1;
EXPECT_TRUE(IPFromString("abcd::1234:5678:abcd:1111",
IPV6_ADDRESS_FLAG_TEMPORARY, &ip1));
// Create a network with a prefix of ip1.
Network ipv6_network("test_eth0", "Test NetworkAdapter", TruncateIP(ip1, 64),
64);
IPAddress ip2;
EXPECT_TRUE(IPFromString("abcd::1234:5678:abcd:2222", &ip2));
ipv6_network.AddIP(ip1);
ipv6_network.AddIP(ip2);
BasicNetworkManager::NetworkList list(1, new Network(ipv6_network));
bool changed;
MergeNetworkList(manager, list, &changed);
// If the set default address is not in any network, GetDefaultLocalAddress
// should return it.
IPAddress ip3;
EXPECT_TRUE(IPFromString("abcd::1234:5678:abcd:3333", &ip3));
manager.set_default_local_addresses(GetLoopbackIP(AF_INET), ip3);
EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
EXPECT_EQ(ip3, ip);
// If the set default address is in a network, GetDefaultLocalAddress will
// return the best IP in that network.
manager.set_default_local_addresses(GetLoopbackIP(AF_INET), ip2);
EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
EXPECT_EQ(static_cast<IPAddress>(ip1), ip);
manager.StopUpdating();
}