Network traffic annotation added to chromium_url_request.

remoting/protocol/port_allocator.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/port_allocator.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "net/base/escape.h"
 #include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/protocol/transport_context.h"
 
 namespace {
 
 typedef std::map<std::string, std::string> StringMap;
 
 // Parses the lines in the result of the HTTP request that are of the form
 // 'a=b' and returns them in a map.
 StringMap ParseMap(const std::string& string) {
@@ skipping 117 matching lines @@
   std::string host =
       ice_config_.relay_servers[attempts_ % ice_config_.relay_servers.size()];
   attempts_++;
 
   DCHECK(!username().empty());
   DCHECK(!password().empty());
   std::string url = "https://" + host + "/create_session?username=" +
                     net::EscapeUrlEncodedData(username(), false) +
                     "&password=" +
                     net::EscapeUrlEncodedData(password(), false) + "&sn=1";
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("CRD_relay_session_request", R"(
+        semantics {
+          sender: "Chrome Remote Desktop"
+          description:
+            "Request is used by Chrome Remote Desktop to allocate relay "
+            "session."

[Ramin Halavati, 2017/04/13 06:59:04]

Since this is read by non-very-technical admins, can we be a little more
specific on what are relay sessions?

[Sergey Ulanov, 2017/04/18 18:40:51]

Maybe reword as:
"Request is sent by Chrome Remote Desktop to allocate relay session. Returned
relay session credentials are used over UDP to connect to Google-owned relay
servers, which is required for NAT traversal."

Or do we need more details?

[Ramin Halavati, 2017/04/19 05:45:15]

Thank you, that's more than enough!

+          trigger: "Chrome Remote Desktop usage."

[Ramin Halavati, 2017/04/13 06:59:04]

Can we be more specific on WHEN?

[Sergey Ulanov, 2017/04/18 18:40:51]

Start of each Chrome Remote Desktop and during connection when peer-to-peer
transport needs to be reconnected.

[Ramin Halavati, 2017/04/19 05:45:15]

Done.

+          data:
+            "A temporary authentication token issued by Google services (over "
+            "XMPP connection)."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: false
+          setting:
+            "This feature cannot be disabled by settings. You can block Chrome "
+            "Remote Desktop as specified here: "
+            "https://support.google.com/chrome/?p=remote_desktop"
+          chrome_policy {
+            RemoteAccessHostFirewallTraversal {
+              policy_options {mode: MANDATORY}
+              RemoteAccessHostFirewallTraversal: false
+            }
+          }
+          policy_exception_justification:
+            "Above specified policy is only applicable on the host side and "
+            "doesn't have effect in Android and iOS client apps. The product "
+            "is shipped separately from Chromium, except on Chrome OS."
+        })");
   std::unique_ptr<UrlRequest> url_request =
       transport_context_->url_request_factory()->CreateUrlRequest(
-          UrlRequest::Type::GET, url);
+          UrlRequest::Type::GET, url, traffic_annotation);
   url_request->AddHeader("X-Talk-Google-Relay-Auth: " +
                          ice_config_.relay_token);
   url_request->AddHeader("X-Google-Relay-Auth: " + ice_config_.relay_token);
   url_request->AddHeader("X-Stream-Type: chromoting");
   url_request->Start(base::Bind(&PortAllocatorSession::OnSessionRequestResult,
                                 base::Unretained(this)));
   url_requests_.insert(std::move(url_request));
 }
 
 void PortAllocatorSession::OnSessionRequestResult(
@@ skipping 27 matching lines @@
     relay_config.ports.push_back(
         cricket::ProtocolAddress(address, cricket::PROTO_UDP));
     config->AddRelay(relay_config);
   }
 
   ConfigReady(config.release());
 }
 
 }  // namespace protocol
 }  // namespace remoting