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

Unified Diff: net/websockets/websocket_stream.cc

Issue 992733002: Remove //net (except for Android test stuff) and sdch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | « net/websockets/websocket_stream.h ('k') | net/websockets/websocket_stream_cookie_test.cc » ('j') | 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
deleted file mode 100644
index b5012bc2883e4cdc4b2acb2d956cb78f1c79bdee..0000000000000000000000000000000000000000
--- a/net/websockets/websocket_stream.cc
+++ /dev/null
@@ -1,372 +0,0 @@
-// Copyright 2013 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 "net/websockets/websocket_stream.h"
-
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/metrics/histogram.h"
-#include "base/metrics/sparse_histogram.h"
-#include "base/profiler/scoped_tracker.h"
-#include "base/strings/stringprintf.h"
-#include "base/time/time.h"
-#include "base/timer/timer.h"
-#include "net/base/load_flags.h"
-#include "net/http/http_request_headers.h"
-#include "net/http/http_response_headers.h"
-#include "net/http/http_status_code.h"
-#include "net/url_request/redirect_info.h"
-#include "net/url_request/url_request.h"
-#include "net/url_request/url_request_context.h"
-#include "net/websockets/websocket_errors.h"
-#include "net/websockets/websocket_event_interface.h"
-#include "net/websockets/websocket_handshake_constants.h"
-#include "net/websockets/websocket_handshake_stream_base.h"
-#include "net/websockets/websocket_handshake_stream_create_helper.h"
-#include "net/websockets/websocket_test_util.h"
-#include "url/gurl.h"
-#include "url/origin.h"
-
-namespace net {
-namespace {
-
-// The timeout duration of WebSocket handshake.
-// It is defined as the same value as the TCP connection timeout value in
-// net/socket/websocket_transport_client_socket_pool.cc to make it hard for
-// JavaScript programs to recognize the timeout cause.
-const int kHandshakeTimeoutIntervalInSeconds = 240;
-
-class StreamRequestImpl;
-
-class Delegate : public URLRequest::Delegate {
- public:
- enum HandshakeResult {
- INCOMPLETE,
- CONNECTED,
- FAILED,
- NUM_HANDSHAKE_RESULT_TYPES,
- };
-
- explicit Delegate(StreamRequestImpl* owner)
- : owner_(owner), result_(INCOMPLETE) {}
- ~Delegate() override {
- UMA_HISTOGRAM_ENUMERATION(
- "Net.WebSocket.HandshakeResult", result_, NUM_HANDSHAKE_RESULT_TYPES);
- }
-
- // Implementation of URLRequest::Delegate methods.
- void OnReceivedRedirect(URLRequest* request,
- const RedirectInfo& redirect_info,
- bool* defer_redirect) override {
- // HTTP status codes returned by HttpStreamParser are filtered by
- // WebSocketBasicHandshakeStream, and only 101, 401 and 407 are permitted
- // back up the stack to HttpNetworkTransaction. In particular, redirect
- // codes are never allowed, and so URLRequest never sees a redirect on a
- // WebSocket request.
- NOTREACHED();
- }
-
- void OnResponseStarted(URLRequest* request) override;
-
- void OnAuthRequired(URLRequest* request,
- AuthChallengeInfo* auth_info) override;
-
- void OnCertificateRequested(URLRequest* request,
- SSLCertRequestInfo* cert_request_info) override;
-
- void OnSSLCertificateError(URLRequest* request,
- const SSLInfo& ssl_info,
- bool fatal) override;
-
- void OnReadCompleted(URLRequest* request, int bytes_read) override;
-
- private:
- StreamRequestImpl* owner_;
- HandshakeResult result_;
-};
-
-class StreamRequestImpl : public WebSocketStreamRequest {
- public:
- StreamRequestImpl(
- const GURL& url,
- const URLRequestContext* context,
- const url::Origin& origin,
- scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
- scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper)
- : delegate_(new Delegate(this)),
- url_request_(context->CreateRequest(url, DEFAULT_PRIORITY,
- delegate_.get(), NULL)),
- connect_delegate_(connect_delegate.Pass()),
- create_helper_(create_helper.release()) {
- create_helper_->set_failure_message(&failure_message_);
- HttpRequestHeaders headers;
- headers.SetHeader(websockets::kUpgrade, websockets::kWebSocketLowercase);
- headers.SetHeader(HttpRequestHeaders::kConnection, websockets::kUpgrade);
- headers.SetHeader(HttpRequestHeaders::kOrigin, origin.string());
- headers.SetHeader(websockets::kSecWebSocketVersion,
- websockets::kSupportedVersion);
- url_request_->SetExtraRequestHeaders(headers);
-
- // This passes the ownership of |create_helper_| to |url_request_|.
- url_request_->SetUserData(
- WebSocketHandshakeStreamBase::CreateHelper::DataKey(),
- create_helper_);
- url_request_->SetLoadFlags(LOAD_DISABLE_CACHE | LOAD_BYPASS_CACHE);
- }
-
- // Destroying this object destroys the URLRequest, which cancels the request
- // and so terminates the handshake if it is incomplete.
- ~StreamRequestImpl() override {}
-
- void Start(scoped_ptr<base::Timer> timer) {
- DCHECK(timer);
- TimeDelta timeout(TimeDelta::FromSeconds(
- kHandshakeTimeoutIntervalInSeconds));
- timer_ = timer.Pass();
- timer_->Start(FROM_HERE, timeout,
- base::Bind(&StreamRequestImpl::OnTimeout,
- base::Unretained(this)));
- url_request_->Start();
- }
-
- void PerformUpgrade() {
- DCHECK(timer_);
- timer_->Stop();
- connect_delegate_->OnSuccess(create_helper_->Upgrade());
- }
-
- std::string FailureMessageFromNetError() {
- int error = url_request_->status().error();
- if (error == ERR_TUNNEL_CONNECTION_FAILED) {
- // This error is common and confusing, so special-case it.
- // TODO(ricea): Include the HostPortPair of the selected proxy server in
- // the error message. This is not currently possible because it isn't set
- // in HttpResponseInfo when a ERR_TUNNEL_CONNECTION_FAILED error happens.
- return "Establishing a tunnel via proxy server failed.";
- } else {
- return std::string("Error in connection establishment: ") +
- ErrorToString(url_request_->status().error());
- }
- }
-
- void ReportFailure() {
- DCHECK(timer_);
- timer_->Stop();
- if (failure_message_.empty()) {
- switch (url_request_->status().status()) {
- case URLRequestStatus::SUCCESS:
- case URLRequestStatus::IO_PENDING:
- break;
- case URLRequestStatus::CANCELED:
- if (url_request_->status().error() == ERR_TIMED_OUT)
- failure_message_ = "WebSocket opening handshake timed out";
- else
- failure_message_ = "WebSocket opening handshake was canceled";
- break;
- case URLRequestStatus::FAILED:
- failure_message_ = FailureMessageFromNetError();
- break;
- }
- }
- ReportFailureWithMessage(failure_message_);
- }
-
- void ReportFailureWithMessage(const std::string& failure_message) {
- connect_delegate_->OnFailure(failure_message);
- }
-
- void OnFinishOpeningHandshake() {
- WebSocketDispatchOnFinishOpeningHandshake(connect_delegate(),
- url_request_->url(),
- url_request_->response_headers(),
- url_request_->response_time());
- }
-
- WebSocketStream::ConnectDelegate* connect_delegate() const {
- return connect_delegate_.get();
- }
-
- void OnTimeout() {
- url_request_->CancelWithError(ERR_TIMED_OUT);
- }
-
- private:
- // |delegate_| needs to be declared before |url_request_| so that it gets
- // initialised first.
- scoped_ptr<Delegate> delegate_;
-
- // Deleting the StreamRequestImpl object deletes this URLRequest object,
- // cancelling the whole connection.
- scoped_ptr<URLRequest> url_request_;
-
- scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate_;
-
- // Owned by the URLRequest.
- WebSocketHandshakeStreamCreateHelper* create_helper_;
-
- // The failure message supplied by WebSocketBasicHandshakeStream, if any.
- std::string failure_message_;
-
- // A timer for handshake timeout.
- scoped_ptr<base::Timer> timer_;
-};
-
-class SSLErrorCallbacks : public WebSocketEventInterface::SSLErrorCallbacks {
- public:
- explicit SSLErrorCallbacks(URLRequest* url_request)
- : url_request_(url_request) {}
-
- void CancelSSLRequest(int error, const SSLInfo* ssl_info) override {
- if (ssl_info) {
- url_request_->CancelWithSSLError(error, *ssl_info);
- } else {
- url_request_->CancelWithError(error);
- }
- }
-
- void ContinueSSLRequest() override {
- url_request_->ContinueDespiteLastError();
- }
-
- private:
- URLRequest* url_request_;
-};
-
-void Delegate::OnResponseStarted(URLRequest* request) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION("423948 Delegate::OnResponseStarted"));
-
- // All error codes, including OK and ABORTED, as with
- // Net.ErrorCodesForMainFrame3
- UMA_HISTOGRAM_SPARSE_SLOWLY("Net.WebSocket.ErrorCodes",
- -request->status().error());
- if (!request->status().is_success()) {
- DVLOG(3) << "OnResponseStarted (request failed)";
- owner_->ReportFailure();
- return;
- }
- const int response_code = request->GetResponseCode();
- DVLOG(3) << "OnResponseStarted (response code " << response_code << ")";
- switch (response_code) {
- case HTTP_SWITCHING_PROTOCOLS:
- result_ = CONNECTED;
- owner_->PerformUpgrade();
- return;
-
- case HTTP_UNAUTHORIZED:
- result_ = FAILED;
- owner_->OnFinishOpeningHandshake();
- owner_->ReportFailureWithMessage(
- "HTTP Authentication failed; no valid credentials available");
- return;
-
- case HTTP_PROXY_AUTHENTICATION_REQUIRED:
- result_ = FAILED;
- owner_->OnFinishOpeningHandshake();
- owner_->ReportFailureWithMessage("Proxy authentication failed");
- return;
-
- default:
- result_ = FAILED;
- owner_->ReportFailure();
- }
-}
-
-void Delegate::OnAuthRequired(URLRequest* request,
- AuthChallengeInfo* auth_info) {
- // This should only be called if credentials are not already stored.
- request->CancelAuth();
-}
-
-void Delegate::OnCertificateRequested(URLRequest* request,
- SSLCertRequestInfo* cert_request_info) {
- // This method is called when a client certificate is requested, and the
- // request context does not already contain a client certificate selection for
- // the endpoint. In this case, a main frame resource request would pop-up UI
- // to permit selection of a client certificate, but since WebSockets are
- // sub-resources they should not pop-up UI and so there is nothing more we can
- // do.
- request->Cancel();
-}
-
-void Delegate::OnSSLCertificateError(URLRequest* request,
- const SSLInfo& ssl_info,
- bool fatal) {
- owner_->connect_delegate()->OnSSLCertificateError(
- scoped_ptr<WebSocketEventInterface::SSLErrorCallbacks>(
- new SSLErrorCallbacks(request)),
- ssl_info,
- fatal);
-}
-
-void Delegate::OnReadCompleted(URLRequest* request, int bytes_read) {
- NOTREACHED();
-}
-
-} // namespace
-
-WebSocketStreamRequest::~WebSocketStreamRequest() {}
-
-WebSocketStream::WebSocketStream() {}
-WebSocketStream::~WebSocketStream() {}
-
-WebSocketStream::ConnectDelegate::~ConnectDelegate() {}
-
-scoped_ptr<WebSocketStreamRequest> WebSocketStream::CreateAndConnectStream(
- const GURL& socket_url,
- const std::vector<std::string>& requested_subprotocols,
- const url::Origin& origin,
- URLRequestContext* url_request_context,
- const BoundNetLog& net_log,
- scoped_ptr<ConnectDelegate> connect_delegate) {
- scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper(
- new WebSocketHandshakeStreamCreateHelper(connect_delegate.get(),
- requested_subprotocols));
- scoped_ptr<StreamRequestImpl> request(
- new StreamRequestImpl(socket_url,
- url_request_context,
- origin,
- connect_delegate.Pass(),
- create_helper.Pass()));
- request->Start(scoped_ptr<base::Timer>(new base::Timer(false, false)));
- return request.Pass();
-}
-
-// This is declared in websocket_test_util.h.
-scoped_ptr<WebSocketStreamRequest> CreateAndConnectStreamForTesting(
- const GURL& socket_url,
- scoped_ptr<WebSocketHandshakeStreamCreateHelper> create_helper,
- const url::Origin& origin,
- URLRequestContext* url_request_context,
- const BoundNetLog& net_log,
- scoped_ptr<WebSocketStream::ConnectDelegate> connect_delegate,
- scoped_ptr<base::Timer> timer) {
- scoped_ptr<StreamRequestImpl> request(
- new StreamRequestImpl(socket_url,
- url_request_context,
- origin,
- connect_delegate.Pass(),
- create_helper.Pass()));
- request->Start(timer.Pass());
- return request.Pass();
-}
-
-void WebSocketDispatchOnFinishOpeningHandshake(
- WebSocketStream::ConnectDelegate* connect_delegate,
- const GURL& url,
- const scoped_refptr<HttpResponseHeaders>& headers,
- base::Time response_time) {
- DCHECK(connect_delegate);
- if (headers.get()) {
- connect_delegate->OnFinishOpeningHandshake(make_scoped_ptr(
- new WebSocketHandshakeResponseInfo(url,
- headers->response_code(),
- headers->GetStatusText(),
- headers,
- response_time)));
- }
-}
-
-} // namespace net
« no previous file with comments | « net/websockets/websocket_stream.h ('k') | net/websockets/websocket_stream_cookie_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698