zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strip IP addresses in NDEBUG (release) builds.

Browse Source 
Also removes the ability to override (set) this.

BUG=
R=pthatcher@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#10796}
This commit is contained in:
Peter Boström
2015-11-26 00:35:49 +01:00
parent b86c5027a0
commit cdb38e5397
4 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/base/socketaddress_unittest.cc
View File

@ -325,23 +325,26 @@ TEST(SocketAddressTest, TestToSensitiveString) {
SocketAddress addr_v4("1.2.3.4", 5678);
EXPECT_EQ("1.2.3.4", addr_v4.HostAsURIString());
EXPECT_EQ("1.2.3.4:5678", addr_v4.ToString());
EXPECT_EQ("1.2.3.4", addr_v4.HostAsSensitiveURIString());
EXPECT_EQ("1.2.3.4:5678", addr_v4.ToSensitiveString());
IPAddress::set_strip_sensitive(true);
#if defined(NDEBUG)
EXPECT_EQ("1.2.3.x", addr_v4.HostAsSensitiveURIString());
EXPECT_EQ("1.2.3.x:5678", addr_v4.ToSensitiveString());
IPAddress::set_strip_sensitive(false);
#else
EXPECT_EQ("1.2.3.4", addr_v4.HostAsSensitiveURIString());
EXPECT_EQ("1.2.3.4:5678", addr_v4.ToSensitiveString());
#endif // defined(NDEBUG)
SocketAddress addr_v6(kTestV6AddrString, 5678);
EXPECT_EQ("[" + kTestV6AddrString + "]", addr_v6.HostAsURIString());
EXPECT_EQ(kTestV6AddrFullString, addr_v6.ToString());
EXPECT_EQ("[" + kTestV6AddrString + "]", addr_v6.HostAsSensitiveURIString());
EXPECT_EQ(kTestV6AddrFullString, addr_v6.ToSensitiveString());
IPAddress::set_strip_sensitive(true);
#if defined(NDEBUG)
EXPECT_EQ("[" + kTestV6AddrAnonymizedString + "]",
addr_v6.HostAsSensitiveURIString());
EXPECT_EQ(kTestV6AddrFullAnonymizedString, addr_v6.ToSensitiveString());
IPAddress::set_strip_sensitive(false);
#else
EXPECT_EQ("[" + kTestV6AddrString + "]", addr_v6.HostAsSensitiveURIString());
EXPECT_EQ(kTestV6AddrFullString, addr_v6.ToSensitiveString());
#endif // defined(NDEBUG)
}
} // namespace rtc