remove stun origin support
Bug: webrtc:12132
Change-Id: I0f32e6af77e0c553b0c3b0d047ff03e14c492b31
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234384
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35202}
diff --git a/api/transport/stun.cc b/api/transport/stun.cc
index 0f86267..f774e98 100644
--- a/api/transport/stun.cc
+++ b/api/transport/stun.cc
@@ -31,7 +31,6 @@
namespace {
const int k127Utf8CharactersLengthInBytes = 508;
-const int kDefaultMaxAttributeLength = 508;
const int kMessageIntegrityAttributeLength = 20;
const int kTheoreticalMaximumAttributeLength = 65535;
@@ -68,12 +67,6 @@
case STUN_ATTR_SOFTWARE:
return length <=
k127Utf8CharactersLengthInBytes; // RFC 8489 section 14.14
- case STUN_ATTR_ORIGIN:
- // 0x802F is unassigned by IANA.
- // RESPONSE-ORIGIN is defined in RFC 5780 section 7.3, but does not
- // specify a maximum length. It's an URL, so return an arbitrary
- // restriction.
- return length <= kDefaultMaxAttributeLength;
case STUN_ATTR_DATA:
// No length restriction in RFC; it's the content of an UDP datagram,
// which in theory can be up to 65.535 bytes.
@@ -620,8 +613,6 @@
return STUN_VALUE_ADDRESS;
case STUN_ATTR_FINGERPRINT:
return STUN_VALUE_UINT32;
- case STUN_ATTR_ORIGIN:
- return STUN_VALUE_BYTE_STRING;
case STUN_ATTR_RETRANSMIT_COUNT:
return STUN_VALUE_UINT32;
case STUN_ATTR_GOOG_LAST_ICE_CHECK_RECEIVED:
diff --git a/api/transport/stun.h b/api/transport/stun.h
index b5f9ce1..766b9ec 100644
--- a/api/transport/stun.h
+++ b/api/transport/stun.h
@@ -62,7 +62,6 @@
STUN_ATTR_SOFTWARE = 0x8022, // ByteString
STUN_ATTR_ALTERNATE_SERVER = 0x8023, // Address
STUN_ATTR_FINGERPRINT = 0x8028, // UInt32
- STUN_ATTR_ORIGIN = 0x802F, // ByteString
STUN_ATTR_RETRANSMIT_COUNT = 0xFF00 // UInt32
};
diff --git a/api/transport/stun_unittest.cc b/api/transport/stun_unittest.cc
index bf791f2..e180703 100644
--- a/api/transport/stun_unittest.cc
+++ b/api/transport/stun_unittest.cc
@@ -199,20 +199,6 @@
0x69, 0x7a, 0x65, 0x64
};
-static const unsigned char kStunMessageWithOriginAttribute[] = {
- 0x00, 0x01, 0x00, 0x18, // message header (binding request), length 24
- 0x21, 0x12, 0xA4, 0x42, // magic cookie
- 0x29, 0x1f, 0xcd, 0x7c, // transaction id
- 0xba, 0x58, 0xab, 0xd7,
- 0xf2, 0x41, 0x01, 0x00,
- 0x80, 0x2f, 0x00, 0x12, // origin attribute (length 18)
- 0x68, 0x74, 0x74, 0x70, // http://example.com
- 0x3A, 0x2F, 0x2F, 0x65,
- 0x78, 0x61, 0x6d, 0x70,
- 0x6c, 0x65, 0x2e, 0x63,
- 0x6f, 0x6d, 0x00, 0x00,
-};
-
// Sample messages with an invalid length Field
// The actual length in bytes of the invalid messages (including STUN header)
@@ -551,7 +537,6 @@
const char kTestUserName1[] = "abcdefgh";
const char kTestUserName2[] = "abc";
const char kTestErrorReason[] = "Unauthorized";
-const char kTestOrigin[] = "http://example.com";
const int kTestErrorClass = 4;
const int kTestErrorNumber = 1;
const int kTestErrorCode = 401;
@@ -1097,15 +1082,6 @@
EXPECT_EQ(kTestUserName2, username->GetString());
}
-TEST_F(StunTest, ReadMessageWithOriginAttribute) {
- StunMessage msg;
- size_t size = ReadStunMessage(&msg, kStunMessageWithOriginAttribute);
- CheckStunHeader(msg, STUN_BINDING_REQUEST, size);
- const StunByteStringAttribute* origin = msg.GetByteString(STUN_ATTR_ORIGIN);
- ASSERT_TRUE(origin != NULL);
- EXPECT_EQ(kTestOrigin, origin->GetString());
-}
-
TEST_F(StunTest, WriteMessageWithAnErrorCodeAttribute) {
StunMessage msg;
size_t size = sizeof(kStunMessageWithErrorAttribute);
@@ -1152,25 +1128,6 @@
memcmp(out.Data(), kStunMessageWithUInt16ListAttribute, size - 2));
}
-TEST_F(StunTest, WriteMessageWithOriginAttribute) {
- StunMessage msg;
- size_t size = sizeof(kStunMessageWithOriginAttribute);
-
- msg.SetType(STUN_BINDING_REQUEST);
- msg.SetTransactionID(
- std::string(reinterpret_cast<const char*>(kTestTransactionId1),
- kStunTransactionIdLength));
- auto origin =
- std::make_unique<StunByteStringAttribute>(STUN_ATTR_ORIGIN, kTestOrigin);
- msg.AddAttribute(std::move(origin));
-
- rtc::ByteBufferWriter out;
- EXPECT_TRUE(msg.Write(&out));
- ASSERT_EQ(size, out.Length());
- // Check everything up to the padding
- ASSERT_EQ(0, memcmp(out.Data(), kStunMessageWithOriginAttribute, size - 2));
-}
-
// Test that we fail to read messages with invalid lengths.
void CheckFailureToRead(const unsigned char* testcase, size_t length) {
StunMessage msg;
diff --git a/p2p/base/fake_port_allocator.h b/p2p/base/fake_port_allocator.h
index 83b27db..6366ea8 100644
--- a/p2p/base/fake_port_allocator.h
+++ b/p2p/base/fake_port_allocator.h
@@ -36,11 +36,10 @@
uint16_t max_port,
const std::string& username,
const std::string& password,
- const std::string& origin,
bool emit_localhost_for_anyaddress) {
TestUDPPort* port =
new TestUDPPort(thread, factory, network, min_port, max_port, username,
- password, origin, emit_localhost_for_anyaddress);
+ password, emit_localhost_for_anyaddress);
if (!port->Init()) {
delete port;
port = nullptr;
@@ -56,7 +55,6 @@
uint16_t max_port,
const std::string& username,
const std::string& password,
- const std::string& origin,
bool emit_localhost_for_anyaddress)
: UDPPort(thread,
factory,
@@ -65,7 +63,6 @@
max_port,
username,
password,
- origin,
emit_localhost_for_anyaddress) {}
};
@@ -115,8 +112,7 @@
? ipv6_network_
: ipv4_network_;
port_.reset(TestUDPPort::Create(network_thread_, factory_, &network, 0, 0,
- username(), password(), std::string(),
- false));
+ username(), password(), false));
RTC_DCHECK(port_);
port_->SubscribePortDestroyed(
[this](PortInterface* port) { OnPortDestroyed(port); });
diff --git a/p2p/base/port_allocator.h b/p2p/base/port_allocator.h
index 1f37e86..08584d9 100644
--- a/p2p/base/port_allocator.h
+++ b/p2p/base/port_allocator.h
@@ -581,17 +581,6 @@
return turn_port_prune_policy_;
}
- // Gets/Sets the Origin value used for WebRTC STUN requests.
- const std::string& origin() const {
- CheckRunOnValidThreadIfInitialized();
- return origin_;
- }
-
- void set_origin(const std::string& origin) {
- CheckRunOnValidThreadIfInitialized();
- origin_ = origin;
- }
-
webrtc::TurnCustomizer* turn_customizer() {
CheckRunOnValidThreadIfInitialized();
return turn_customizer_;
diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index a610eb5..87f108c 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -506,8 +506,7 @@
std::unique_ptr<UDPPort> CreateUdpPort(const SocketAddress& addr,
PacketSocketFactory* socket_factory) {
return UDPPort::Create(&main_, socket_factory, MakeNetwork(addr), 0, 0,
- username_, password_, std::string(), true,
- absl::nullopt);
+ username_, password_, true, absl::nullopt);
}
std::unique_ptr<TCPPort> CreateTcpPort(const SocketAddress& addr) {
return CreateTcpPort(addr, &socket_factory_);
@@ -522,8 +521,7 @@
ServerAddresses stun_servers;
stun_servers.insert(kStunAddr);
return StunPort::Create(&main_, factory, MakeNetwork(addr), 0, 0, username_,
- password_, stun_servers, std::string(),
- absl::nullopt);
+ password_, stun_servers, absl::nullopt);
}
std::unique_ptr<Port> CreateRelayPort(const SocketAddress& addr,
ProtocolType int_proto,
@@ -548,7 +546,7 @@
return TurnPort::Create(&main_, socket_factory, MakeNetwork(addr), 0, 0,
username_, password_,
ProtocolAddress(server_addr, int_proto),
- kRelayCredentials, 0, "", {}, {}, nullptr, nullptr);
+ kRelayCredentials, 0, {}, {}, nullptr, nullptr);
}
std::unique_ptr<rtc::NATServer> CreateNatServer(const SocketAddress& addr,
rtc::NATType type) {
diff --git a/p2p/base/stun_port.cc b/p2p/base/stun_port.cc
index 7ae0557..55ff89f 100644
--- a/p2p/base/stun_port.cc
+++ b/p2p/base/stun_port.cc
@@ -13,6 +13,7 @@
#include <utility>
#include <vector>
+#include "absl/memory/memory.h"
#include "api/transport/stun.h"
#include "p2p/base/connection.h"
#include "p2p/base/p2p_constants.h"
@@ -156,7 +157,6 @@
rtc::AsyncPacketSocket* socket,
const std::string& username,
const std::string& password,
- const std::string& origin,
bool emit_local_for_anyaddress)
: Port(thread, LOCAL_PORT_TYPE, factory, network, username, password),
requests_(thread),
@@ -166,7 +166,6 @@
stun_keepalive_delay_(STUN_KEEPALIVE_INTERVAL),
dscp_(rtc::DSCP_NO_CHANGE),
emit_local_for_anyaddress_(emit_local_for_anyaddress) {
- requests_.set_origin(origin);
}
UDPPort::UDPPort(rtc::Thread* thread,
@@ -176,7 +175,6 @@
uint16_t max_port,
const std::string& username,
const std::string& password,
- const std::string& origin,
bool emit_local_for_anyaddress)
: Port(thread,
LOCAL_PORT_TYPE,
@@ -193,7 +191,6 @@
stun_keepalive_delay_(STUN_KEEPALIVE_INTERVAL),
dscp_(rtc::DSCP_NO_CHANGE),
emit_local_for_anyaddress_(emit_local_for_anyaddress) {
- requests_.set_origin(origin);
}
bool UDPPort::Init() {
@@ -610,12 +607,11 @@
const std::string& username,
const std::string& password,
const ServerAddresses& servers,
- const std::string& origin,
absl::optional<int> stun_keepalive_interval) {
// Using `new` to access a non-public constructor.
- auto port = absl::WrapUnique(new StunPort(thread, factory, network, min_port,
- max_port, username, password,
- servers, origin));
+ auto port =
+ absl::WrapUnique(new StunPort(thread, factory, network, min_port,
+ max_port, username, password, servers));
port->set_stun_keepalive_delay(stun_keepalive_interval);
if (!port->Init()) {
return nullptr;
@@ -630,8 +626,7 @@
uint16_t max_port,
const std::string& username,
const std::string& password,
- const ServerAddresses& servers,
- const std::string& origin)
+ const ServerAddresses& servers)
: UDPPort(thread,
factory,
network,
@@ -639,7 +634,6 @@
max_port,
username,
password,
- origin,
false) {
// UDPPort will set these to local udp, updating these to STUN.
set_type(STUN_PORT_TYPE);
diff --git a/p2p/base/stun_port.h b/p2p/base/stun_port.h
index 5a76767..af9d04d 100644
--- a/p2p/base/stun_port.h
+++ b/p2p/base/stun_port.h
@@ -32,6 +32,8 @@
// Communicates using the address on the outside of a NAT.
class UDPPort : public Port {
public:
+ // TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
+ ABSL_DEPRECATED("Use variant without origin attribute below")
static std::unique_ptr<UDPPort> Create(
rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
@@ -39,13 +41,26 @@
rtc::AsyncPacketSocket* socket,
const std::string& username,
const std::string& password,
- const std::string& origin,
+ const std::string& /*unused, was origin*/,
+ bool emit_local_for_anyaddress,
+ absl::optional<int> stun_keepalive_interval) {
+ return Create(thread, factory, network, socket, username, password,
+ emit_local_for_anyaddress, stun_keepalive_interval);
+ }
+
+ static std::unique_ptr<UDPPort> Create(
+ rtc::Thread* thread,
+ rtc::PacketSocketFactory* factory,
+ rtc::Network* network,
+ rtc::AsyncPacketSocket* socket,
+ const std::string& username,
+ const std::string& password,
bool emit_local_for_anyaddress,
absl::optional<int> stun_keepalive_interval) {
// Using `new` to access a non-public constructor.
- auto port = absl::WrapUnique(new UDPPort(thread, factory, network, socket,
- username, password, origin,
- emit_local_for_anyaddress));
+ auto port =
+ absl::WrapUnique(new UDPPort(thread, factory, network, socket, username,
+ password, emit_local_for_anyaddress));
port->set_stun_keepalive_delay(stun_keepalive_interval);
if (!port->Init()) {
return nullptr;
@@ -53,6 +68,23 @@
return port;
}
+ // TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
+ ABSL_DEPRECATED("Use variant without origin attribute below")
+ static std::unique_ptr<UDPPort> Create(
+ rtc::Thread* thread,
+ rtc::PacketSocketFactory* factory,
+ rtc::Network* network,
+ uint16_t min_port,
+ uint16_t max_port,
+ const std::string& username,
+ const std::string& password,
+ const std::string& /*unused, was origin*/,
+ bool emit_local_for_anyaddress,
+ absl::optional<int> stun_keepalive_interval) {
+ return Create(thread, factory, network, min_port, max_port, username,
+ password, emit_local_for_anyaddress, stun_keepalive_interval);
+ }
+
static std::unique_ptr<UDPPort> Create(
rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
@@ -61,13 +93,12 @@
uint16_t max_port,
const std::string& username,
const std::string& password,
- const std::string& origin,
bool emit_local_for_anyaddress,
absl::optional<int> stun_keepalive_interval) {
// Using `new` to access a non-public constructor.
- auto port = absl::WrapUnique(
- new UDPPort(thread, factory, network, min_port, max_port, username,
- password, origin, emit_local_for_anyaddress));
+ auto port = absl::WrapUnique(new UDPPort(thread, factory, network, min_port,
+ max_port, username, password,
+ emit_local_for_anyaddress));
port->set_stun_keepalive_delay(stun_keepalive_interval);
if (!port->Init()) {
return nullptr;
@@ -126,7 +157,6 @@
uint16_t max_port,
const std::string& username,
const std::string& password,
- const std::string& origin,
bool emit_local_for_anyaddress);
UDPPort(rtc::Thread* thread,
@@ -135,7 +165,6 @@
rtc::AsyncPacketSocket* socket,
const std::string& username,
const std::string& password,
- const std::string& origin,
bool emit_local_for_anyaddress);
bool Init();
@@ -274,7 +303,6 @@
const std::string& username,
const std::string& password,
const ServerAddresses& servers,
- const std::string& origin,
absl::optional<int> stun_keepalive_interval);
void PrepareAddress() override;
@@ -287,8 +315,7 @@
uint16_t max_port,
const std::string& username,
const std::string& password,
- const ServerAddresses& servers,
- const std::string& origin);
+ const ServerAddresses& servers);
};
} // namespace cricket
diff --git a/p2p/base/stun_port_unittest.cc b/p2p/base/stun_port_unittest.cc
index 5ee707b..d483baf 100644
--- a/p2p/base/stun_port_unittest.cc
+++ b/p2p/base/stun_port_unittest.cc
@@ -77,7 +77,7 @@
stun_port_ = cricket::StunPort::Create(
rtc::Thread::Current(), &socket_factory_, &network_, 0, 0,
rtc::CreateRandomString(16), rtc::CreateRandomString(22), stun_servers,
- std::string(), absl::nullopt);
+ absl::nullopt);
stun_port_->set_stun_keepalive_delay(stun_keepalive_delay_);
// If `stun_keepalive_lifetime_` is negative, let the stun port
// choose its lifetime from the network type.
@@ -103,8 +103,8 @@
socket_->SignalReadPacket.connect(this, &StunPortTestBase::OnReadPacket);
stun_port_ = cricket::UDPPort::Create(
rtc::Thread::Current(), &socket_factory_, &network_, socket_.get(),
- rtc::CreateRandomString(16), rtc::CreateRandomString(22), std::string(),
- false, absl::nullopt);
+ rtc::CreateRandomString(16), rtc::CreateRandomString(22), false,
+ absl::nullopt);
ASSERT_TRUE(stun_port_ != NULL);
ServerAddresses stun_servers;
stun_servers.insert(server_addr);
diff --git a/p2p/base/stun_request.cc b/p2p/base/stun_request.cc
index 0dd85c6..b271daa 100644
--- a/p2p/base/stun_request.cc
+++ b/p2p/base/stun_request.cc
@@ -59,7 +59,6 @@
void StunRequestManager::SendDelayed(StunRequest* request, int delay) {
request->set_manager(this);
RTC_DCHECK(requests_.find(request->id()) == requests_.end());
- request->set_origin(origin_);
request->Construct();
requests_[request->id()] = request;
if (delay > 0) {
@@ -213,10 +212,6 @@
void StunRequest::Construct() {
if (msg_->type() == 0) {
- if (!origin_.empty()) {
- msg_->AddAttribute(
- std::make_unique<StunByteStringAttribute>(STUN_ATTR_ORIGIN, origin_));
- }
Prepare(msg_);
RTC_DCHECK(msg_->type() != 0);
}
diff --git a/p2p/base/stun_request.h b/p2p/base/stun_request.h
index 566478c..b417c70 100644
--- a/p2p/base/stun_request.h
+++ b/p2p/base/stun_request.h
@@ -67,9 +67,6 @@
bool empty() { return requests_.empty(); }
- // Set the Origin header for outgoing stun messages.
- void set_origin(const std::string& origin) { origin_ = origin; }
-
// Raised when there are bytes to be sent.
sigslot::signal3<const void*, size_t, StunRequest*> SignalSendPacket;
@@ -78,7 +75,6 @@
rtc::Thread* const thread_;
RequestMap requests_;
- std::string origin_;
friend class StunRequest;
};
@@ -105,10 +101,6 @@
return msg_->reduced_transaction_id();
}
- // the origin value
- const std::string& origin() const { return origin_; }
- void set_origin(const std::string& origin) { origin_ = origin; }
-
// Returns the STUN type of the request message.
int type();
@@ -124,7 +116,6 @@
protected:
int count_;
bool timeout_;
- std::string origin_;
// Fills in a request object to be sent. Note that request's transaction ID
// will already be set and cannot be changed.
diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc
index b7d37b3..07c1060 100644
--- a/p2p/base/turn_port.cc
+++ b/p2p/base/turn_port.cc
@@ -223,7 +223,6 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
webrtc::TurnCustomizer* customizer)
: Port(thread, RELAY_PORT_TYPE, factory, network, username, password),
server_address_(server_address),
@@ -239,7 +238,6 @@
allocate_mismatch_retries_(0),
turn_customizer_(customizer) {
request_manager_.SignalSendPacket.connect(this, &TurnPort::OnSendStunPacket);
- request_manager_.set_origin(origin);
}
TurnPort::TurnPort(rtc::Thread* thread,
@@ -252,7 +250,6 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
const std::vector<std::string>& tls_alpn_protocols,
const std::vector<std::string>& tls_elliptic_curves,
webrtc::TurnCustomizer* customizer,
@@ -280,7 +277,6 @@
allocate_mismatch_retries_(0),
turn_customizer_(customizer) {
request_manager_.SignalSendPacket.connect(this, &TurnPort::OnSendStunPacket);
- request_manager_.set_origin(origin);
}
TurnPort::~TurnPort() {
diff --git a/p2p/base/turn_port.h b/p2p/base/turn_port.h
index 1863373..934c65d 100644
--- a/p2p/base/turn_port.h
+++ b/p2p/base/turn_port.h
@@ -51,6 +51,25 @@
STATE_DISCONNECTED, // TCP connection died, cannot send/receive any
// packets.
};
+
+ // TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
+ static std::unique_ptr<TurnPort> Create(
+ rtc::Thread* thread,
+ rtc::PacketSocketFactory* factory,
+ rtc::Network* network,
+ rtc::AsyncPacketSocket* socket,
+ const std::string& username, // ice username.
+ const std::string& password, // ice password.
+ const ProtocolAddress& server_address,
+ const RelayCredentials& credentials,
+ int server_priority,
+ const std::string& /*unused, was origin*/,
+ const std::string& origin,
+ webrtc::TurnCustomizer* customizer) {
+ return Create(thread, factory, network, socket, username, password,
+ server_address, credentials, server_priority, customizer);
+ }
+
// Create a TURN port using the shared UDP socket, `socket`.
static std::unique_ptr<TurnPort> Create(
rtc::Thread* thread,
@@ -62,7 +81,6 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
webrtc::TurnCustomizer* customizer) {
// Do basic parameter validation.
if (credentials.username.size() > kMaxTurnUsernameLength) {
@@ -77,10 +95,11 @@
return nullptr;
}
// Using `new` to access a non-public constructor.
- return absl::WrapUnique(new TurnPort(
- thread, factory, network, socket, username, password, server_address,
- credentials, server_priority, origin, customizer));
+ return absl::WrapUnique(
+ new TurnPort(thread, factory, network, socket, username, password,
+ server_address, credentials, server_priority, customizer));
}
+
// TODO(steveanton): Remove once downstream clients have moved to `Create`.
static std::unique_ptr<TurnPort> CreateUnique(
rtc::Thread* thread,
@@ -92,11 +111,32 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
webrtc::TurnCustomizer* customizer) {
return Create(thread, factory, network, socket, username, password,
- server_address, credentials, server_priority, origin,
- customizer);
+ server_address, credentials, server_priority, customizer);
+ }
+
+ // TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
+ static std::unique_ptr<TurnPort> Create(
+ rtc::Thread* thread,
+ rtc::PacketSocketFactory* factory,
+ rtc::Network* network,
+ uint16_t min_port,
+ uint16_t max_port,
+ const std::string& username, // ice username.
+ const std::string& password, // ice password.
+ const ProtocolAddress& server_address,
+ const RelayCredentials& credentials,
+ int server_priority,
+ const std::string& /*unused, was origin*/,
+ const std::vector<std::string>& tls_alpn_protocols,
+ const std::vector<std::string>& tls_elliptic_curves,
+ webrtc::TurnCustomizer* customizer,
+ rtc::SSLCertificateVerifier* tls_cert_verifier = nullptr) {
+ return Create(thread, factory, network, min_port, max_port, username,
+ password, server_address, credentials, server_priority,
+ tls_alpn_protocols, tls_elliptic_curves, customizer,
+ tls_cert_verifier);
}
// Create a TURN port that will use a new socket, bound to `network` and
@@ -112,7 +152,6 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
const std::vector<std::string>& tls_alpn_protocols,
const std::vector<std::string>& tls_elliptic_curves,
webrtc::TurnCustomizer* customizer,
@@ -130,12 +169,12 @@
return nullptr;
}
// Using `new` to access a non-public constructor.
- return absl::WrapUnique(
- new TurnPort(thread, factory, network, min_port, max_port, username,
- password, server_address, credentials, server_priority,
- origin, tls_alpn_protocols, tls_elliptic_curves,
- customizer, tls_cert_verifier));
+ return absl::WrapUnique(new TurnPort(
+ thread, factory, network, min_port, max_port, username, password,
+ server_address, credentials, server_priority, tls_alpn_protocols,
+ tls_elliptic_curves, customizer, tls_cert_verifier));
}
+
// TODO(steveanton): Remove once downstream clients have moved to `Create`.
static std::unique_ptr<TurnPort> CreateUnique(
rtc::Thread* thread,
@@ -148,14 +187,13 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
const std::vector<std::string>& tls_alpn_protocols,
const std::vector<std::string>& tls_elliptic_curves,
webrtc::TurnCustomizer* customizer,
rtc::SSLCertificateVerifier* tls_cert_verifier = nullptr) {
return Create(thread, factory, network, min_port, max_port, username,
password, server_address, credentials, server_priority,
- origin, tls_alpn_protocols, tls_elliptic_curves, customizer,
+ tls_alpn_protocols, tls_elliptic_curves, customizer,
tls_cert_verifier);
}
@@ -267,7 +305,6 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
webrtc::TurnCustomizer* customizer);
TurnPort(rtc::Thread* thread,
@@ -280,7 +317,6 @@
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
- const std::string& origin,
const std::vector<std::string>& tls_alpn_protocols,
const std::vector<std::string>& tls_elliptic_curves,
webrtc::TurnCustomizer* customizer,
diff --git a/p2p/base/turn_port_unittest.cc b/p2p/base/turn_port_unittest.cc
index 7854fdb..e441657 100644
--- a/p2p/base/turn_port_unittest.cc
+++ b/p2p/base/turn_port_unittest.cc
@@ -85,7 +85,6 @@
static const char kIcePwd2[] = "TESTICEPWD00000000000002";
static const char kTurnUsername[] = "test";
static const char kTurnPassword[] = "test";
-static const char kTestOrigin[] = "http://example.com";
// This test configures the virtual socket server to simulate delay so that we
// can verify operations take no more than the expected number of round trips.
static constexpr unsigned int kSimulatedRtt = 50;
@@ -259,25 +258,14 @@
const std::string& password,
const ProtocolAddress& server_address) {
return CreateTurnPortWithAllParams(MakeNetwork(kLocalAddr1), username,
- password, server_address, std::string());
+ password, server_address);
}
bool CreateTurnPort(const rtc::SocketAddress& local_address,
const std::string& username,
const std::string& password,
const ProtocolAddress& server_address) {
return CreateTurnPortWithAllParams(MakeNetwork(local_address), username,
- password, server_address, std::string());
- }
-
- // Should be identical to CreateTurnPort but specifies an origin value
- // when creating the instance of TurnPort.
- bool CreateTurnPortWithOrigin(const rtc::SocketAddress& local_address,
- const std::string& username,
- const std::string& password,
- const ProtocolAddress& server_address,
- const std::string& origin) {
- return CreateTurnPortWithAllParams(MakeNetwork(local_address), username,
- password, server_address, origin);
+ password, server_address);
}
bool CreateTurnPortWithNetwork(rtc::Network* network,
@@ -285,7 +273,7 @@
const std::string& password,
const ProtocolAddress& server_address) {
return CreateTurnPortWithAllParams(network, username, password,
- server_address, std::string());
+ server_address);
}
// Version of CreateTurnPort that takes all possible parameters; all other
@@ -294,12 +282,11 @@
bool CreateTurnPortWithAllParams(rtc::Network* network,
const std::string& username,
const std::string& password,
- const ProtocolAddress& server_address,
- const std::string& origin) {
+ const ProtocolAddress& server_address) {
RelayCredentials credentials(username, password);
turn_port_ = TurnPort::Create(
&main_, &socket_factory_, network, 0, 0, kIceUfrag1, kIcePwd1,
- server_address, credentials, 0, origin, {}, {}, turn_customizer_.get());
+ server_address, credentials, 0, {}, {}, turn_customizer_.get());
if (!turn_port_) {
return false;
}
@@ -331,10 +318,9 @@
}
RelayCredentials credentials(username, password);
- turn_port_ =
- TurnPort::Create(&main_, &socket_factory_, MakeNetwork(kLocalAddr1),
- socket_.get(), kIceUfrag1, kIcePwd1, server_address,
- credentials, 0, std::string(), nullptr);
+ turn_port_ = TurnPort::Create(
+ &main_, &socket_factory_, MakeNetwork(kLocalAddr1), socket_.get(),
+ kIceUfrag1, kIcePwd1, server_address, credentials, 0, nullptr);
// This TURN port will be the controlling.
turn_port_->SetIceRole(ICEROLE_CONTROLLING);
ConnectSignals();
@@ -361,9 +347,9 @@
void CreateUdpPort() { CreateUdpPort(kLocalAddr2); }
void CreateUdpPort(const SocketAddress& address) {
- udp_port_ = UDPPort::Create(&main_, &socket_factory_, MakeNetwork(address),
- 0, 0, kIceUfrag2, kIcePwd2, std::string(),
- false, absl::nullopt);
+ udp_port_ =
+ UDPPort::Create(&main_, &socket_factory_, MakeNetwork(address), 0, 0,
+ kIceUfrag2, kIcePwd2, false, absl::nullopt);
// UDP port will be controlled.
udp_port_->SetIceRole(ICEROLE_CONTROLLED);
udp_port_->SignalPortComplete.connect(this,
@@ -1551,17 +1537,6 @@
EXPECT_EQ(nullptr, conn);
}
-TEST_F(TurnPortTest, TestOriginHeader) {
- CreateTurnPortWithOrigin(kLocalAddr1, kTurnUsername, kTurnPassword,
- kTurnUdpProtoAddr, kTestOrigin);
- turn_port_->PrepareAddress();
- EXPECT_TRUE_SIMULATED_WAIT(turn_ready_, kSimulatedRtt * 2, fake_clock_);
- ASSERT_GT(turn_server_.server()->allocations().size(), 0U);
- SocketAddress local_address = turn_port_->GetLocalAddress();
- ASSERT_TRUE(turn_server_.FindAllocation(local_address) != NULL);
- EXPECT_EQ(kTestOrigin, turn_server_.FindAllocation(local_address)->origin());
-}
-
// Test that a CreatePermission failure will result in the connection being
// pruned and failed.
TEST_F(TurnPortTest, TestConnectionFailedAndPrunedOnCreatePermissionFailure) {
diff --git a/p2p/base/turn_server.cc b/p2p/base/turn_server.cc
index fd9cd16..41ee43c 100644
--- a/p2p/base/turn_server.cc
+++ b/p2p/base/turn_server.cc
@@ -655,11 +655,6 @@
msg->GetByteString(STUN_ATTR_USERNAME);
RTC_DCHECK(username_attr != NULL);
username_ = username_attr->GetString();
- const StunByteStringAttribute* origin_attr =
- msg->GetByteString(STUN_ATTR_ORIGIN);
- if (origin_attr) {
- origin_ = origin_attr->GetString();
- }
// Figure out the lifetime and start the allocation timer.
int lifetime_secs = ComputeLifetime(msg);
diff --git a/p2p/base/turn_server.h b/p2p/base/turn_server.h
index 7942c09..e197a8e 100644
--- a/p2p/base/turn_server.h
+++ b/p2p/base/turn_server.h
@@ -79,7 +79,6 @@
const std::string& key() const { return key_; }
const std::string& transaction_id() const { return transaction_id_; }
const std::string& username() const { return username_; }
- const std::string& origin() const { return origin_; }
const std::string& last_nonce() const { return last_nonce_; }
void set_last_nonce(const std::string& nonce) { last_nonce_ = nonce; }
@@ -135,7 +134,6 @@
std::string key_;
std::string transaction_id_;
std::string username_;
- std::string origin_;
std::string last_nonce_;
PermissionList perms_;
ChannelList channels_;
diff --git a/p2p/client/basic_port_allocator.cc b/p2p/client/basic_port_allocator.cc
index 2a601d5..5a26934 100644
--- a/p2p/client/basic_port_allocator.cc
+++ b/p2p/client/basic_port_allocator.cc
@@ -1430,14 +1430,14 @@
port = UDPPort::Create(
session_->network_thread(), session_->socket_factory(), network_,
udp_socket_.get(), session_->username(), session_->password(),
- session_->allocator()->origin(), emit_local_candidate_for_anyaddress,
+ emit_local_candidate_for_anyaddress,
session_->allocator()->stun_candidate_keepalive_interval());
} else {
port = UDPPort::Create(
session_->network_thread(), session_->socket_factory(), network_,
session_->allocator()->min_port(), session_->allocator()->max_port(),
session_->username(), session_->password(),
- session_->allocator()->origin(), emit_local_candidate_for_anyaddress,
+ emit_local_candidate_for_anyaddress,
session_->allocator()->stun_candidate_keepalive_interval());
}
@@ -1502,7 +1502,6 @@
session_->network_thread(), session_->socket_factory(), network_,
session_->allocator()->min_port(), session_->allocator()->max_port(),
session_->username(), session_->password(), config_->StunServers(),
- session_->allocator()->origin(),
session_->allocator()->stun_candidate_keepalive_interval());
if (port) {
session_->AddAllocatedPort(port.release(), this);
@@ -1564,7 +1563,6 @@
args.password = session_->password();
args.server_address = &(*relay_port);
args.config = &config;
- args.origin = session_->allocator()->origin();
args.turn_customizer = session_->allocator()->turn_customizer();
std::unique_ptr<cricket::Port> port;
diff --git a/p2p/client/relay_port_factory_interface.h b/p2p/client/relay_port_factory_interface.h
index c1cf51e..d388412 100644
--- a/p2p/client/relay_port_factory_interface.h
+++ b/p2p/client/relay_port_factory_interface.h
@@ -43,7 +43,6 @@
const RelayServerConfig* config;
std::string username;
std::string password;
- std::string origin;
webrtc::TurnCustomizer* turn_customizer;
};
diff --git a/p2p/client/turn_port_factory.cc b/p2p/client/turn_port_factory.cc
index fd3420c..feaada3 100644
--- a/p2p/client/turn_port_factory.cc
+++ b/p2p/client/turn_port_factory.cc
@@ -26,8 +26,7 @@
auto port = TurnPort::CreateUnique(
args.network_thread, args.socket_factory, args.network, udp_socket,
args.username, args.password, *args.server_address,
- args.config->credentials, args.config->priority, args.origin,
- args.turn_customizer);
+ args.config->credentials, args.config->priority, args.turn_customizer);
if (!port)
return nullptr;
port->SetTlsCertPolicy(args.config->tls_cert_policy);
@@ -41,7 +40,7 @@
auto port = TurnPort::CreateUnique(
args.network_thread, args.socket_factory, args.network, min_port,
max_port, args.username, args.password, *args.server_address,
- args.config->credentials, args.config->priority, args.origin,
+ args.config->credentials, args.config->priority,
args.config->tls_alpn_protocols, args.config->tls_elliptic_curves,
args.turn_customizer, args.config->tls_cert_verifier);
if (!port)
