Add connection details to the page info dialog.

chrome/browser/page_info_model.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/page_info_model.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "net/base/cert_status_flags.h"
+#include "net/base/ssl_connection_status_flags.h"
+#include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/x509_certificate.h"
 
 namespace {
   // Returns a name that can be used to represent the issuer.  It tries in this
   // order CN, O and OU and returns the first non-empty one found.
   std::string GetIssuerName(const net::X509Certificate::Principal& issuer) {
     if (!issuer.common_name.empty())
       return issuer.common_name;
     if (!issuer.organization_names.empty())
       return issuer.organization_names[0];
@@ skipping 96 matching lines @@
         IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
         subject_name));
   } else if (ssl.security_bits() < 80) {
     state = false;
     description.assign(l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT,
         subject_name));
   } else {
     description.assign(l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
-        subject_name,
-        IntToString16(ssl.security_bits())));
+        subject_name));
     if (ssl.displayed_insecure_content() || ssl.ran_insecure_content()) {
       state = false;
       description.assign(l10n_util::GetStringFUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK,
           description,
           l10n_util::GetStringUTF16(ssl.ran_insecure_content() ?
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR :
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING)));
     }
   }
+
+  uint16_t cipher_suite =

[wtc, 2010/07/16 20:07:10]

Question: are we supposed to use uint16_t instead of uint16
in new code?

Would be nice to provide a macro or inline function for the
shift and mask operation.

[agl, 2010/07/18 17:03:49]

I haven't heard so. I tend to use _t because it's standard everywhere, but I've
changed this to the Chromium specific uint16 etc.
Done.

+    ((ssl.connection_status() >> net::SSL_CONNECTION_CIPHERSUITE_SHIFT) &
+     net::SSL_CONNECTION_CIPHERSUITE_MASK);
+  if (ssl.security_bits() > 0 && cipher_suite) {
+    uint8_t compression_id =
+      ((ssl.connection_status() >> net::SSL_CONNECTION_COMPRESSION_SHIFT) &
+       net::SSL_CONNECTION_COMPRESSION_MASK);
+    bool did_fallback = ssl.connection_status() &
+                        net::SSL_CONNECTION_SSL3_FALLBACK;
+    bool no_renegotiation = ssl.connection_status() &
+                            net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION;
+    // For now, only SSLv3 fallback will trigger a warning icon here.
+    state = !did_fallback;
+    const char *key_exchange, *cipher, *mac, *compression;
+    net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, cipher_suite);
+    net::SSLCompressionToString(&compression, compression_id);
+
+    description += ASCIIToUTF16("\n\n");

[wtc, 2010/07/16 20:07:10]

Can we add "\n\n" here?  Are there some languages that
break lines in a different way?  Just wondering.

[agl, 2010/07/18 17:03:49]

I wondered about that also, but I believe that we're doing it anyway when
building the dialog; the translated strings are just packed into a vbox.

+    description += l10n_util::GetStringFUTF16(
+        IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS,
+        ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange),
+        ASCIIToUTF16(compression));
+
+    if (did_fallback) {
+      description += ASCIIToUTF16("\n\n");
+      description += l10n_util::GetStringUTF16(
+          IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE);
+    }
+    if (no_renegotiation) {
+      description += ASCIIToUTF16("\n\n");
+      description += l10n_util::GetStringUTF16(
+          IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE);
+    }
+  }
+
   sections_.push_back(SectionInfo(
       state,
       l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_CONNECTION_TITLE),
       head_line,
       description));
 
   // Request the number of visits.
   HistoryService* history = profile->GetHistoryService(
       Profile::EXPLICIT_ACCESS);
   if (show_history && history) {
@@ skipping 47 matching lines @@
             IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
             WideToUTF16(base::TimeFormatShortDate(first_visit)))));
   }
   observer_->ModelChanged();
 }
 
 // static
 void PageInfoModel::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kPageInfoWindowPlacement);
 }