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

Unified Diff: net/socket_stream/socket_stream_job.cc

Issue 6873029: Apply HSTS rules to also upgrade ws:// -> wss:// if appropriate. This avoids (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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
Index: net/socket_stream/socket_stream_job.cc
===================================================================
--- net/socket_stream/socket_stream_job.cc (revision 81709)
+++ net/socket_stream/socket_stream_job.cc (working copy)
@@ -5,7 +5,9 @@
#include "net/socket_stream/socket_stream_job.h"
#include "base/memory/singleton.h"
+#include "net/base/transport_security_state.h"
#include "net/socket_stream/socket_stream_job_manager.h"
+#include "net/url_request/url_request_context.h"
namespace net {
@@ -18,8 +20,23 @@
// static
SocketStreamJob* SocketStreamJob::CreateSocketStreamJob(
- const GURL& url, SocketStream::Delegate* delegate) {
- return SocketStreamJobManager::GetInstance()->CreateJob(url, delegate);
+ const GURL& url,
+ SocketStream::Delegate* delegate,
+ const URLRequestContext& context) {
+ GURL socket_url(url);
+ TransportSecurityState::DomainState domain_state;
+ if (url.scheme() == "ws" &&
+ context.transport_security_state() &&
+ context.transport_security_state()->IsEnabledForHost(
+ &domain_state, url.host(), context.IsSNIAvailable()) &&
+ domain_state.mode == TransportSecurityState::DomainState::MODE_STRICT) {
+ url_canon::Replacements<char> replacements;
+ static const char kNewScheme[] = "wss";
+ replacements.SetScheme(kNewScheme,
+ url_parse::Component(0, strlen(kNewScheme)));
+ socket_url = url.ReplaceComponents(replacements);
+ }
+ return SocketStreamJobManager::GetInstance()->CreateJob(socket_url, delegate);
}
SocketStreamJob::SocketStreamJob() {}

Powered by Google App Engine
This is Rietveld 408576698