Fix case where a SPDY stream with an un-verified cert would kill the browser...

net/spdy/spdy_session.cc

 // Copyright (c) 2010 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/spdy/spdy_session.h"
 
 #include "base/basictypes.h"
 #include "base/linked_ptr.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 296 matching lines @@
     scoped_refptr<SpdyStream>* stream,
     const BoundNetLog& stream_net_log) {
   CHECK_NE(state_, CLOSED);
 
   *stream = NULL;
 
   // Don't allow access to secure push streams over an unauthenticated, but
   // encrypted SSL socket.
   if (is_secure_ && certificate_error_code_ != OK &&
       (url.SchemeIs("https") || url.SchemeIs("wss"))) {
-    LOG(DFATAL) << "Tried to get pushed spdy stream for secure content over an "
-                << "unauthenticated session.";
-    return certificate_error_code_;
+    LOG(ERROR) << "Tried to get pushed spdy stream for secure content over an "

[willchan no longer on Chromium, 2010/12/02 23:02:45]

Why is this ERROR instead of DFATAL?  It's a bug if this happens, so it should
still crash in debug mode, right?

CloseSessionOnError() is a good safety mechanism though.

+               << "unauthenticated session.";
+    CloseSessionOnError(static_cast<net::Error>(certificate_error_code_), true);
+    return ERR_SPDY_PROTOCOL_ERROR;
   }
 
   const std::string& path = url.PathForRequest();
 
   *stream = GetActivePushStream(path);
   if (stream->get()) {
     DCHECK(streams_pushed_and_claimed_count_ < streams_pushed_count_);
     streams_pushed_and_claimed_count_++;
     return OK;
   }
@@ skipping 74 matching lines @@
 
 int SpdySession::CreateStreamImpl(
     const GURL& url,
     RequestPriority priority,
     scoped_refptr<SpdyStream>* spdy_stream,
     const BoundNetLog& stream_net_log) {
   // Make sure that we don't try to send https/wss over an unauthenticated, but
   // encrypted SSL socket.
   if (is_secure_ && certificate_error_code_ != OK &&
       (url.SchemeIs("https") || url.SchemeIs("wss"))) {
-    LOG(DFATAL) << "Tried to create spdy stream for secure content over an "
-                << "unauthenticated session.";
-    return certificate_error_code_;
+    LOG(ERROR) << "Tried to create spdy stream for secure content over an "
+               << "unauthenticated session.";
+    CloseSessionOnError(static_cast<net::Error>(certificate_error_code_), true);
+    return ERR_SPDY_PROTOCOL_ERROR;
   }
 
   const std::string& path = url.PathForRequest();
 
   const spdy::SpdyStreamId stream_id = GetNewStreamId();
 
   *spdy_stream = new SpdyStream(this,
                                 stream_id,
                                 false,
                                 stream_net_log);
@@ skipping 932 matching lines @@
   if (it == pending_callback_map_.end())
     return;
 
   CompletionCallback* callback = it->second.callback;
   int result = it->second.result;
   pending_callback_map_.erase(it);
   callback->Run(result);
 }
 
 }  // namespace net