From 8e007bacdafacbf74227c0879c772809f25013c3 Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Mon, 2 Oct 2023 13:39:26 +0000 Subject: [PATCH] Remove field trial WebRTC-Turn-AllowSystemPorts There's no trace of it being in use, so let's remove it. Bug: webrtc:12497 Change-Id: I9e81ef58b459b5a0b9f79b6638231a3a19eb8a0e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/322180 Commit-Queue: Jonas Oreland Reviewed-by: Jonas Oreland Auto-Submit: Harald Alvestrand Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#40855} --- experiments/field_trials.py | 3 --- p2p/base/turn_port.cc | 5 ----- p2p/base/turn_port_unittest.cc | 7 ------- 3 files changed, 15 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index e7e85948eb..f98abde567 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -757,9 +757,6 @@ POLICY_EXEMPT_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-TransientSuppressorForcedOff', 'chromium:1186705', INDEFINITE), - FieldTrial('WebRTC-Turn-AllowSystemPorts', - 'webrtc:12497', - date(2024, 4, 1)), FieldTrial('WebRTC-UseBaseHeavyVP8TL3RateAllocation', 'webrtc:9477', date(2024, 4, 1)), diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc index 88c9a45c61..1b05d82b89 100644 --- a/p2p/base/turn_port.cc +++ b/p2p/base/turn_port.cc @@ -956,11 +956,6 @@ bool TurnPort::AllowedTurnPort(int port, if (port == 53 || port == 80 || port == 443 || port >= 1024) { return true; } - // Allow any port if relevant field trial is set. This allows disabling the - // check. - if (field_trials && field_trials->IsEnabled("WebRTC-Turn-AllowSystemPorts")) { - return true; - } return false; } diff --git a/p2p/base/turn_port_unittest.cc b/p2p/base/turn_port_unittest.cc index a570fc70a7..cf9ca09853 100644 --- a/p2p/base/turn_port_unittest.cc +++ b/p2p/base/turn_port_unittest.cc @@ -1880,13 +1880,6 @@ TEST_F(TurnPortTest, TestTurnDangerousAlternateServer) { ASSERT_EQ(0U, turn_port_->Candidates().size()); } -TEST_F(TurnPortTest, TestTurnDangerousServerAllowedWithFieldTrial) { - webrtc::test::ScopedKeyValueConfig override_field_trials( - field_trials_, "WebRTC-Turn-AllowSystemPorts/Enabled/"); - CreateTurnPort(kTurnUsername, kTurnPassword, kTurnDangerousProtoAddr); - ASSERT_TRUE(turn_port_); -} - class TurnPortWithMockDnsResolverTest : public TurnPortTest { public: TurnPortWithMockDnsResolverTest()