commit 573ca2beb74eef2646a3e2173331ff6bc3a9a990
author Tommi <tommi@webrtc.org> Tue Aug 29 09:05:16 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 29 11:26:59 2023
tree ede7d57bd030caf3226a5cd02dd8f717cf0e5889
parent f53597140f2485871f0e54b26c3d5b0feb5bcc14

Add thread guards for username/pwd

Also change return type for username_fragment() to be const& and not
create a copy.

Bug: none
Change-Id: I8591af3da54fc8a9784e13cb000c4e02c0cd2f40
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/317980
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40651}

p2p/base/port.cc

diff --git a/p2p/base/port.cc b/p2p/base/port.cc
index 3a1032a..ca0a6c5 100644
--- a/p2p/base/port.cc
+++ b/p2p/base/port.cc
@@ -169,6 +169,7 @@
 }
 
 void Port::Construct() {
+  RTC_DCHECK_RUN_ON(thread_);
   // TODO(pthatcher): Remove this old behavior once we're sure no one
   // relies on it.  If the username_fragment and password are empty,
   // we should just create one.
@@ -430,6 +431,7 @@
                           const rtc::SocketAddress& addr,
                           std::unique_ptr<IceMessage>* out_msg,
                           std::string* out_username) {
+  RTC_DCHECK_RUN_ON(thread_);
   // NOTE: This could clearly be optimized to avoid allocating any memory.
   //       However, at the data rates we'll be looking at on the client side,
   //       this probably isn't worth worrying about.
@@ -658,6 +660,7 @@
 bool Port::MaybeIceRoleConflict(const rtc::SocketAddress& addr,
                                 IceMessage* stun_msg,
                                 absl::string_view remote_ufrag) {
+  RTC_DCHECK_RUN_ON(thread_);
   // Validate ICE_CONTROLLING or ICE_CONTROLLED attributes.
   bool ret = true;
   IceRole remote_ice_role = ICEROLE_UNKNOWN;
@@ -717,6 +720,7 @@
 }
 
 std::string Port::CreateStunUsername(absl::string_view remote_username) const {
+  RTC_DCHECK_RUN_ON(thread_);
   return std::string(remote_username) + ":" + username_fragment();
 }
 
@@ -737,6 +741,7 @@
                                     const rtc::SocketAddress& addr,
                                     int error_code,
                                     absl::string_view reason) {
+  RTC_DCHECK_RUN_ON(thread_);
   RTC_DCHECK(message->type() == STUN_BINDING_REQUEST ||
              message->type() == GOOG_PING_REQUEST);
 
@@ -786,6 +791,7 @@
     StunMessage* message,
     const rtc::SocketAddress& addr,
     const std::vector<uint16_t>& unknown_types) {
+  RTC_DCHECK_RUN_ON(thread_);
   RTC_DCHECK(message->type() == STUN_BINDING_REQUEST);
 
   // Fill in the response message.
@@ -959,7 +965,8 @@
   delete this;
 }
 
-const std::string Port::username_fragment() const {
+const std::string& Port::username_fragment() const {
+  RTC_DCHECK_RUN_ON(thread_);
   return ice_username_fragment_;
 }
 

p2p/base/port.h

diff --git a/p2p/base/port.h b/p2p/base/port.h
index 31091eb..2678df8 100644
--- a/p2p/base/port.h
+++ b/p2p/base/port.h
@@ -255,7 +255,7 @@
   uint32_t generation() const { return generation_; }
   void set_generation(uint32_t generation) { generation_ = generation; }
 
-  const std::string username_fragment() const;
+  const std::string& username_fragment() const;
   const std::string& password() const { return password_; }
 
   // May be called when this port was initially created by a pooled
@@ -496,12 +496,8 @@
   // sent through), the other side must send us a STUN binding request that is
   // authenticated with this username_fragment and password.
   // PortAllocatorSession will provide these username_fragment and password.
-  //
-  // Note: we should always use username_fragment() instead of using
-  // `ice_username_fragment_` directly. For the details see the comment on
-  // username_fragment().
-  std::string ice_username_fragment_;
-  std::string password_;
+  std::string ice_username_fragment_ RTC_GUARDED_BY(thread_);
+  std::string password_ RTC_GUARDED_BY(thread_);
   std::vector<Candidate> candidates_ RTC_GUARDED_BY(thread_);
   AddressMap connections_;
   int timeout_delay_;