SSL Host info: Make sure that we can update certificate chains in

net/http/disk_cache_based_ssl_host_info.cc

 // Copyright (c) 2011 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/http/disk_cache_based_ssl_host_info.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ skipping 26 matching lines @@
     const std::string& hostname,
     const SSLConfig& ssl_config,
     CertVerifier* cert_verifier,
     HttpCache* http_cache)
     : SSLHostInfo(hostname, ssl_config, cert_verifier),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       callback_(new CallbackImpl(weak_ptr_factory_.GetWeakPtr(),
                                  &DiskCacheBasedSSLHostInfo::OnIOComplete)),
       state_(GET_BACKEND),
       ready_(false),
+      found_entry_(false),
       hostname_(hostname),
       http_cache_(http_cache),
       backend_(NULL),
       entry_(NULL),
       user_callback_(NULL) {
 }
 
 void DiskCacheBasedSSLHostInfo::Start() {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(GET_BACKEND, state_);
@@ skipping 18 matching lines @@
   DCHECK(state_ != GET_BACKEND);
 
   DCHECK(new_data_.empty());
   CHECK(ready_);
   DCHECK(user_callback_ == NULL);
   new_data_ = Serialize();
 
   if (!backend_)
     return;
 
-  state_ = CREATE;
+  state_ = CREATE_OR_OPEN;
   DoLoop(OK);
 }
 
 DiskCacheBasedSSLHostInfo::~DiskCacheBasedSSLHostInfo() {
   DCHECK(!user_callback_);
   if (entry_)
     entry_->Close();
   if (!IsCallbackPending())
     delete callback_;
 }
@@ skipping 29 matching lines @@
         break;
       case READ:
         rv = DoRead();
         break;
       case READ_COMPLETE:
         rv = DoReadComplete(rv);
         break;
       case WAIT_FOR_DATA_READY_DONE:
         rv = DoWaitForDataReadyDone();
         break;
-      case CREATE:
-        rv = DoCreate();
+      case CREATE_OR_OPEN:
+        rv = DoCreateOrOpen();
         break;
-      case CREATE_COMPLETE:
-        rv = DoCreateComplete(rv);
+      case CREATE_OR_OPEN_COMPLETE:
+        rv = DoCreateOrOpenComplete(rv);
         break;
       case WRITE:
         rv = DoWrite();
         break;
       case WRITE_COMPLETE:
         rv = DoWriteComplete(rv);
         break;
       case SET_DONE:
         rv = DoSetDone();
         break;
@@ skipping 13 matching lines @@
   } else {
     state_ = WAIT_FOR_DATA_READY_DONE;
   }
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoOpenComplete(int rv) {
   if (rv == OK) {
     entry_ = callback_->entry();
     state_ = READ;
+    found_entry_ = true;
   } else {
     state_ = WAIT_FOR_DATA_READY_DONE;
   }
 
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoReadComplete(int rv) {
   if (rv > 0)
     data_.assign(read_buffer_->data(), rv);
 
   state_ = WAIT_FOR_DATA_READY_DONE;
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoWriteComplete(int rv) {
   state_ = SET_DONE;
   return OK;
 }
 
-int DiskCacheBasedSSLHostInfo::DoCreateComplete(int rv) {
+int DiskCacheBasedSSLHostInfo::DoCreateOrOpenComplete(int rv) {
   if (rv != OK) {
     state_ = SET_DONE;
   } else {
     entry_ = callback_->entry();
     state_ = WRITE;
   }
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoGetBackend() {
@@ skipping 21 matching lines @@
 
 int DiskCacheBasedSSLHostInfo::DoWrite() {
   write_buffer_ = new IOBuffer(new_data_.size());
   memcpy(write_buffer_->data(), new_data_.data(), new_data_.size());
   state_ = WRITE_COMPLETE;
 
   return entry_->WriteData(0 /* index */, 0 /* offset */, write_buffer_,
                            new_data_.size(), callback_, true /* truncate */);
 }
 
-int DiskCacheBasedSSLHostInfo::DoCreate() {
+int DiskCacheBasedSSLHostInfo::DoCreateOrOpen() {
   DCHECK(entry_ == NULL);
-  state_ = CREATE_COMPLETE;
+  state_ = CREATE_OR_OPEN_COMPLETE;
+  if (found_entry_)
+    return backend_->OpenEntry(key(), callback_->entry_pointer(), callback_);
+
   return backend_->CreateEntry(key(), callback_->entry_pointer(), callback_);
 }
 
 int DiskCacheBasedSSLHostInfo::DoWaitForDataReadyDone() {
   DCHECK(!ready_);
   state_ = NONE;
   ready_ = true;
   // We close the entry because, if we shutdown before ::Persist is called,
   // then we might leak a cache reference, which causes a DCHECK on shutdown.
   if (entry_)
     entry_->Close();
   entry_ = NULL;
   Parse(data_);
   return OK;
 }
 
 int DiskCacheBasedSSLHostInfo::DoSetDone() {
   if (entry_)
     entry_->Close();
   entry_ = NULL;
   state_ = NONE;
   return OK;
 }
 
 bool DiskCacheBasedSSLHostInfo::IsCallbackPending() const {
   switch (state_) {
     case GET_BACKEND_COMPLETE:
     case OPEN_COMPLETE:
     case READ_COMPLETE:
-    case CREATE_COMPLETE:
+    case CREATE_OR_OPEN_COMPLETE:
     case WRITE_COMPLETE:
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace net