Index: remoting/protocol/port_allocator.cc |
diff --git a/remoting/protocol/port_allocator.cc b/remoting/protocol/port_allocator.cc |
index 5a0666886139190a2129a153ae684b6e5f530792..8b6c0a4fb6c46a338c9f418aa8de4d51dde0beca 100644 |
--- a/remoting/protocol/port_allocator.cc |
+++ b/remoting/protocol/port_allocator.cc |
@@ -13,6 +13,7 @@ |
#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" |
@@ -150,9 +151,39 @@ void PortAllocatorSession::TryCreateRelaySession() { |
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, c
Sergey Ulanov
2017/04/18 18:40:51
Maybe reword as:
"Request is sent by Chrome Remote
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 con
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); |