Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1822)

Unified Diff: net/websockets/websocket_stream.cc

Issue 2846793003: Network traffic annotation added to websocket_stream. (Closed)
Patch Set: Annotation updated. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_stream.cc
diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc
index 3219c91a26a4b8307e5a4ca5443e63b8496f1102..7487ef4fd04cde7d1fb63f1aa2bdc9c26daf6887 100644
--- a/net/websockets/websocket_stream.cc
+++ b/net/websockets/websocket_stream.cc
@@ -17,6 +17,7 @@
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
#include "net/url_request/redirect_info.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -28,6 +29,34 @@
#include "url/gurl.h"
#include "url/origin.h"
+namespace {
+
+constexpr net::NetworkTrafficAnnotationTag kTrafficAnnotation =
+ net::DefineNetworkTrafficAnnotation("websocket_stream", R"(
+ semantics {
+ sender: "WebSocket Handshake"
+ description:
+ "Renderer process initiated WebSocket handshake. The WebSocket "
+ "handshake is used to establish a connection between a web page "
+ "and a consenting server for bi-directional communication."
+ trigger:
+ "A handshake is performed every time a new connection is "
+ "established via the Javascript or PPAPI WebSocket API. Any web "
+ "page or extension can create a WebSocket connection."
+ data: "The path and sub-protocols requested when the WebSocket was "
+ "created, plus the origin of the creating page."
+ destination: OTHER
+ }
+ policy {
+ cookies_allowed: true
+ cookies_store: "user or per-app cookie store"
+ setting: "These requests cannot be disabled."
+ policy_exception_justification:
+ "Not implemented. WebSocket is a core web platform API."
+ })");
+
+} // namespace
+
namespace net {
namespace {
@@ -90,8 +119,10 @@ class WebSocketStreamRequestImpl : public WebSocketStreamRequest {
std::unique_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
std::unique_ptr<WebSocketHandshakeStreamCreateHelper> create_helper)
: delegate_(new Delegate(this)),
- url_request_(
- context->CreateRequest(url, DEFAULT_PRIORITY, delegate_.get())),
+ url_request_(context->CreateRequest(url,
+ DEFAULT_PRIORITY,
+ delegate_.get(),
+ kTrafficAnnotation)),
connect_delegate_(std::move(connect_delegate)),
handshake_stream_(nullptr) {
create_helper->set_stream_request(this);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698