Add TLS-SRP (RFC 5054) support

chrome/browser/ssl/ssl_manager.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 "chrome/browser/ssl/ssl_manager.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/net/url_request_tracking.h"
@@ skipping 43 matching lines @@
   NotificationService::current()->Notify(
       NotificationType::SSL_INTERNAL_STATE_CHANGED,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 }
 
 // static
 std::string SSLManager::SerializeSecurityInfo(int cert_id,
                                               int cert_status,
                                               int security_bits,
-                                              int ssl_connection_status) {
+                                              int ssl_connection_status,
+                                              string16 tls_username) {
   Pickle pickle;
   pickle.WriteInt(cert_id);
   pickle.WriteInt(cert_status);
   pickle.WriteInt(security_bits);
   pickle.WriteInt(ssl_connection_status);
+  pickle.WriteString16(tls_username);
   return std::string(static_cast<const char*>(pickle.data()), pickle.size());
 }
 
 // static
 bool SSLManager::DeserializeSecurityInfo(const std::string& state,
                                          int* cert_id,
                                          int* cert_status,
                                          int* security_bits,
-                                         int* ssl_connection_status) {
-  DCHECK(cert_id && cert_status && security_bits && ssl_connection_status);
+                                         int* ssl_connection_status,
+                                         string16* tls_username) {
+  DCHECK(cert_id && cert_status && security_bits && ssl_connection_status &&
+         tls_username);
   if (state.empty()) {
     // No SSL used.
     *cert_id = 0;
     // The following are not applicable and are set to the default values.
     *cert_status = 0;
     *security_bits = -1;
     *ssl_connection_status = 0;
+    tls_username->clear();
     return false;
   }
 
   Pickle pickle(state.data(), static_cast<int>(state.size()));
   void * iter = NULL;
   return pickle.ReadInt(&iter, cert_id) &&
          pickle.ReadInt(&iter, cert_status) &&
          pickle.ReadInt(&iter, security_bits) &&
-         pickle.ReadInt(&iter, ssl_connection_status);
+         pickle.ReadInt(&iter, ssl_connection_status) &&
+         pickle.ReadString16(&iter, tls_username);
 }
 
 // static
 string16 SSLManager::GetEVCertName(const net::X509Certificate& cert) {
   // EV are required to have an organization name and country.
   if (cert.subject().organization_names.empty() ||
       cert.subject().country_name.empty()) {
     NOTREACHED();
     return string16();
   }
@@ skipping 31 matching lines @@
   NavigationController::LoadCommittedDetails* details =
       Details<NavigationController::LoadCommittedDetails>(in_details).ptr();
 
   NavigationEntry* entry = controller_->GetActiveEntry();
 
   if (details->is_main_frame) {
     if (entry) {
       // Decode the security details.
       int ssl_cert_id, ssl_cert_status, ssl_security_bits,
           ssl_connection_status;
+      string16 tls_username;
       DeserializeSecurityInfo(details->serialized_security_info,
                               &ssl_cert_id,
                               &ssl_cert_status,
                               &ssl_security_bits,
-                              &ssl_connection_status);
+                              &ssl_connection_status,
+                              &tls_username);
 
       // We may not have an entry if this is a navigation to an initial blank
       // page. Reset the SSL information and add the new data we have.
       entry->ssl() = NavigationEntry::SSLStatus();
       entry->ssl().set_cert_id(ssl_cert_id);
       entry->ssl().set_cert_status(ssl_cert_status);
       entry->ssl().set_security_bits(ssl_security_bits);
       entry->ssl().set_connection_status(ssl_connection_status);
+      entry->ssl().set_tls_username(tls_username);
     }
   }
 
   UpdateEntry(entry);
 }
 
 void SSLManager::DidRunInsecureContent(const std::string& security_origin) {
   policy()->DidRunInsecureContent(controller_->GetActiveEntry(),
                                   security_origin);
 }
@@ skipping 41 matching lines @@
   // caches sub-resources.
   // This resource must have been loaded with no filtering because filtered
   // resouces aren't cachable.
   scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo(
       details->url(),
       ResourceType::SUB_RESOURCE,
       details->frame_origin(),
       details->main_frame_origin(),
       details->pid(),
       details->ssl_cert_id(),
-      details->ssl_cert_status()));
+      details->ssl_cert_status(),
+      details->tls_username()));
 
   // Simulate loading this resource through the usual path.
   policy()->OnRequestStarted(info.get());
 }
 
 void SSLManager::DidStartResourceResponse(ResourceRequestDetails* details) {
   scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo(
       details->url(),
       details->resource_type(),
       details->frame_origin(),
       details->main_frame_origin(),
       details->origin_child_id(),
       details->ssl_cert_id(),
-      details->ssl_cert_status()));
+      details->ssl_cert_status(),
+      details->tls_username()));
 
   // Notify our policy that we started a resource request.  Ideally, the
   // policy should have the ability to cancel the request, but we can't do
   // that yet.
   policy()->OnRequestStarted(info.get());
 }
 
 void SSLManager::DidReceiveResourceRedirect(ResourceRedirectDetails* details) {
   // TODO(abarth): Make sure our redirect behavior is correct.  If we ever see a
   //               non-HTTPS resource in the redirect chain, we want to trigger
@@ skipping 16 matching lines @@
 
   policy()->UpdateEntry(entry, controller_->tab_contents());
 
   if (!entry->ssl().Equals(original_ssl_status)) {
     NotificationService::current()->Notify(
         NotificationType::SSL_VISIBLE_STATE_CHANGED,
         Source<NavigationController>(controller_),
         NotificationService::NoDetails());
   }
 }