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("...", R"(

[Sergey Ulanov, 2017/03/17 18:59:33]

"CRD Relay Session Request"

[Ramin Halavati, 2017/04/03 10:01:25]

Done.

+        semantics {
+          sender: "..."

[Sergey Ulanov, 2017/03/17 18:59:33]

Chrome Remote Desktop

[Ramin Halavati, 2017/04/03 10:01:26]

Done.

+          description: "..."

[Sergey Ulanov, 2017/03/17 18:59:33]

"Request used by Chrome Remote Desktop to allocate relay session."

[Ramin Halavati, 2017/04/03 10:01:26]

Done.

+          trigger: "..."

[Sergey Ulanov, 2017/03/17 18:59:33]

Chrome Remote Desktop usage.

[Ramin Halavati, 2017/04/03 10:01:25]

Again, please elaborate if possible.

+          data: "..."

[Sergey Ulanov, 2017/03/17 18:59:33]

Relay token (received over XMPP)

[Ramin Halavati, 2017/04/03 10:01:25]

Please either elaborate here or in description. This is going to be read by
administrators that are not necessarily very technical, and it should be
understandable for them.

[Sergey Ulanov, 2017/04/04 00:16:48]

Maybe "A temporary authentication token issues by Google services (over XMPP
connection)"?

[Ramin Halavati, 2017/04/04 07:37:18]

Done.

+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER

[Sergey Ulanov, 2017/03/17 18:59:33]

GOOGLE_OWNED_SERVICE

[Ramin Halavati, 2017/04/03 10:01:25]

Done.

+        }
+        policy {
+          cookies_allowed: false/true

[Sergey Ulanov, 2017/03/17 18:59:33]

false

[Ramin Halavati, 2017/04/03 10:01:25]

Again, cookies are not specifically disabled. Can I disable them in another CL?

[Sergey Ulanov, 2017/04/04 00:16:47]

Yes, please

[Ramin Halavati, 2017/04/04 07:37:18]

Done, in https://codereview.chromium.org/2792283002

+          cookies_store: "..."

[Sergey Ulanov, 2017/03/17 18:59:33]

N/A

[Ramin Halavati, 2017/04/03 10:01:25]

Acknowledged.

+          setting: "..."

[Sergey Ulanov, 2017/03/17 18:59:33]

Block Chrome Remote Desktop (see
https://support.google.com/chrome/a/answer/2799701?hl=en).

[Ramin Halavati, 2017/04/03 10:01:25]

Done.

+          chrome_policy {
+            [POLICY_NAME] {

[Sergey Ulanov, 2017/03/17 18:59:33]

RemoteAccessHostFirewallTraversal
(only applicable on the host side, doesn't have effect in Android and iOS client
apps).

[Ramin Halavati, 2017/04/03 10:01:26]

Done.

+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              [POLICY_NAME]: ... //(value to disable it)

[Sergey Ulanov, 2017/03/17 18:59:33]

0, false

[Ramin Halavati, 2017/04/03 10:01:25]

Done.

+            }
+          }
+          policy_exception_justification: "..."

[Sergey Ulanov, 2017/03/17 18:59:33]

The product is shipped separate from Chrome, except on Chrome OS.

[Ramin Halavati, 2017/04/03 10:01:26]

Done.

+        })");
   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