From 3d992bf47f8253788c76f76b4e5087d7e9b66783 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 11 Oct 2022 11:45:09 +0000 Subject: [PATCH] Revert "Add test for StunMessage::ValidateMessageIntegrity" This reverts commit 1f4f672687861cae29259dd0c652d58de373dcac. Reason for revert: Breaks downstream test. Original change's description: > Add test for StunMessage::ValidateMessageIntegrity > > This also tests the UMA stats newly added to it. > > Bug: chromium:1177125 > Change-Id: I89bb17c1897565cd91ea5bbd92062018317738ca > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/278600 > Reviewed-by: Johannes Kron > Commit-Queue: Harald Alvestrand > Cr-Commit-Position: refs/heads/main@{#38345} Bug: chromium:1177125 Change-Id: I2490f2f740db8282ab293583013a50d03ead9141 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/278801 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Owners-Override: Mirko Bonadei Commit-Queue: Mirko Bonadei Auto-Submit: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#38349} --- api/transport/BUILD.gn | 1 - api/transport/stun_unittest.cc | 23 ----------------------- 2 files changed, 24 deletions(-) diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn index 3cc3559f30..c3f6f9fa83 100644 --- a/api/transport/BUILD.gn +++ b/api/transport/BUILD.gn @@ -146,7 +146,6 @@ if (rtc_include_tests) { "../../rtc_base:byte_order", "../../rtc_base:macromagic", "../../rtc_base:socket_address", - "../../system_wrappers:metrics", "../../test:test_support", "//testing/gtest", ] diff --git a/api/transport/stun_unittest.cc b/api/transport/stun_unittest.cc index a7315404e7..54f91c522c 100644 --- a/api/transport/stun_unittest.cc +++ b/api/transport/stun_unittest.cc @@ -20,7 +20,6 @@ #include "rtc_base/byte_buffer.h" #include "rtc_base/byte_order.h" #include "rtc_base/socket_address.h" -#include "system_wrappers/include/metrics.h" #include "test/gtest.h" namespace cricket { @@ -1856,26 +1855,4 @@ TEST_F(StunTest, SizeRestrictionOnAttributes) { ASSERT_FALSE(msg.Write(&out)); } -TEST_F(StunTest, ValidateMessageIntegrityWithParser) { - // Try the messages from RFC 5769. - StunMessage message; - rtc::ByteBufferReader reader( - reinterpret_cast(kRfc5769SampleRequest), - sizeof(kRfc5769SampleRequest)); - EXPECT_TRUE(message.Read(&reader)); - EXPECT_EQ(message.ValidateMessageIntegrity(kRfc5769SampleMsgPassword), - StunMessage::IntegrityStatus::kIntegrityOk); - EXPECT_EQ(webrtc::metrics::NumEvents( - "WebRTC.Stun.Integrity.Request", - static_cast(StunMessage::IntegrityStatus::kIntegrityOk)), - 1); - EXPECT_EQ(message.ValidateMessageIntegrity("Invalid password"), - StunMessage::IntegrityStatus::kIntegrityBad); - EXPECT_EQ(webrtc::metrics::NumEvents( - "WebRTC.Stun.Integrity.Request", - static_cast(StunMessage::IntegrityStatus::kIntegrityBad)), - 1); - EXPECT_EQ(webrtc::metrics::NumSamples("WebRTC.Stun.Integrity.Request"), 2); -} - } // namespace cricket