Add a serial number column to the certificate selector dialog and fix its size.

chrome/browser/ui/views/certificate_selector.cc

 // Copyright 2015 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/ui/views/certificate_selector.h"
 
 #include <stddef.h>  // For size_t.
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/guest_view/browser/guest_view_base.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+
 #include "ui/base/models/table_model.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h"
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_factory.h"
 #endif
 
 namespace chrome {
 
-const int CertificateSelector::kTableViewWidth = 400;
-const int CertificateSelector::kTableViewHeight = 100;
+const int CertificateSelector::kTableViewWidth = 500;
+const int CertificateSelector::kTableViewHeight = 150;
 
 class CertificateSelector::CertificateTableModel : public ui::TableModel {
  public:
   // |certs| and |provider_names| must have the same size.
   CertificateTableModel(const net::CertificateList& certs,
                         const std::vector<std::string>& provider_names);
 
   // ui::TableModel:
   int RowCount() override;
   base::string16 GetText(int index, int column_id) override;
   void SetObserver(ui::TableModelObserver* observer) override;
 
  private:
   struct Row {
     base::string16 subject;
     base::string16 issuer;
     base::string16 provider;
+    base::string16 serial;
   };
   std::vector<Row> rows_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateTableModel);
 };
 
+const char kHexCharLookup[0x10] = {
+    '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+};
+
+std::string BytesToHexString(const std::string& bytes) {
+  std::string result;

[Ryan Sleevi, 2016/04/29 00:30:29]

pedantry: std::string result(bytes.size() * 3, '0') ?

(Mostly, just so you've got enough space to avoid reallocations; should * 3
overflow, which it won't, because we cap serial size anyways, then at worst,
you'd just devolve into the normal growth)

[meacer, 2016/04/29 17:39:42]

Removed in favor of HexEncode.

+  for (size_t i = 0; i < bytes.size(); ++i) {
+    result.push_back(kHexCharLookup[(bytes[i] >> 4) & 0xf]);
+    result.push_back(kHexCharLookup[bytes[i] & 0xf]);
+    if (i != bytes.size() - 1)
+      result.push_back(':');
+  }
+  return result;
+}
+
 CertificateSelector::CertificateTableModel::CertificateTableModel(
     const net::CertificateList& certs,
     const std::vector<std::string>& provider_names) {
   DCHECK_EQ(certs.size(), provider_names.size());
   for (size_t i = 0; i < certs.size(); i++) {
     net::X509Certificate* cert = certs[i].get();
     Row row;
     row.subject = base::UTF8ToUTF16(cert->subject().GetDisplayName());
     row.issuer = base::UTF8ToUTF16(cert->issuer().GetDisplayName());
     row.provider = base::UTF8ToUTF16(provider_names[i]);
+    row.serial = base::UTF8ToUTF16(BytesToHexString(cert->serial_number()));

[Ryan Sleevi, 2016/04/29 00:30:29]

I leave the UI in your fully capable hands, but there's always
base::strings::HexEncode (which doesn't insert the colons). But I'm entirely
ambivalent.

[meacer, 2016/04/29 17:39:42]

I searched for combinations of (Binary,Hex,String) but forgot about HexEncode.
Using that.

     rows_.push_back(row);
   }
 }
 
 int CertificateSelector::CertificateTableModel::RowCount() {
   return rows_.size();
 }
 
 base::string16 CertificateSelector::CertificateTableModel::GetText(
     int index,
     int column_id) {
   DCHECK_GE(index, 0);
   DCHECK_LT(static_cast<size_t>(index), rows_.size());
 
   const Row& row = rows_[index];
   switch (column_id) {
     case IDS_CERT_SELECTOR_SUBJECT_COLUMN:
       return row.subject;
     case IDS_CERT_SELECTOR_ISSUER_COLUMN:
       return row.issuer;
     case IDS_CERT_SELECTOR_PROVIDER_COLUMN:
       return row.provider;
+    case IDS_CERT_SELECTOR_SERIAL_COLUMN:
+      return row.serial;
     default:
       NOTREACHED();
   }
   return base::string16();
 }
 
 void CertificateSelector::CertificateTableModel::SetObserver(
     ui::TableModelObserver* observer) {}
 
 CertificateSelector::CertificateSelector(
@@ skipping 26 matching lines @@
       const auto extension = extension_registry->GetExtensionById(
           extension_id, extensions::ExtensionRegistry::ENABLED);
       if (!extension) {
         // This extension was unloaded in the meantime. Don't show the
         // certificate.
         continue;
       }
       provider_name = extension->short_name();
       show_provider_column_ = true;
     }  // Otherwise the certificate is provided by the platform.
-
     certificates_.push_back(cert);
     provider_names.push_back(provider_name);
   }
 #else
   provider_names.assign(certificates.size(), std::string());
   certificates_ = certificates;
 #endif
-

[Ryan Sleevi, 2016/04/29 00:30:29]

Eh, I thought this helped readability, but *shrug*

[meacer, 2016/04/29 17:39:42]

Not intentional, fixed locally but added back when I patched to Windows and
patched back to Linux from there.

   model_.reset(new CertificateTableModel(certificates_, provider_names));
 }
 
 CertificateSelector::~CertificateSelector() {
   table_->SetModel(nullptr);
 }
 
 // static
 bool CertificateSelector::CanShow(content::WebContents* web_contents) {
   // GetTopLevelWebContents returns |web_contents| if it is not a guest.
@@ skipping 28 matching lines @@
 
   std::vector<ui::TableColumn> columns;
   columns.push_back(ui::TableColumn(IDS_CERT_SELECTOR_SUBJECT_COLUMN,
                                     ui::TableColumn::LEFT, -1, 0.4f));
   columns.push_back(ui::TableColumn(IDS_CERT_SELECTOR_ISSUER_COLUMN,
                                     ui::TableColumn::LEFT, -1, 0.2f));
   if (show_provider_column_) {
     columns.push_back(ui::TableColumn(IDS_CERT_SELECTOR_PROVIDER_COLUMN,
                                       ui::TableColumn::LEFT, -1, 0.4f));
   }
+  columns.push_back(ui::TableColumn(IDS_CERT_SELECTOR_SERIAL_COLUMN,
+                                    ui::TableColumn::LEFT, -1, 0.2f));
   table_ = new views::TableView(model_.get(), columns, views::TEXT_ONLY,
                                 true /* single_selection */);
   table_->SetObserver(this);
   layout->StartRow(1, kColumnSetId);
   layout->AddView(table_->CreateParentIfNecessary(), 1, 1,
                   views::GridLayout::FILL, views::GridLayout::FILL,
                   kTableViewWidth, kTableViewHeight);
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 }
 
+ui::TableModel* CertificateSelector::table_model_for_testing() const {
+  return model_.get();
+}
+
 net::X509Certificate* CertificateSelector::GetSelectedCert() const {
   const int selected = table_->FirstSelectedRow();
   if (selected < 0)  // Nothing is selected in |table_|.
     return nullptr;
   CHECK_LT(static_cast<size_t>(selected), certificates_.size());
   return certificates_[selected].get();
 }
 
 bool CertificateSelector::CanResize() const {
   return true;
@@ skipping 38 matching lines @@
 void CertificateSelector::OnSelectionChanged() {
   GetDialogClientView()->ok_button()->SetEnabled(GetSelectedCert() != nullptr);
 }
 
 void CertificateSelector::OnDoubleClick() {
   if (GetSelectedCert())
     GetDialogClientView()->AcceptWindow();
 }
 
 }  // namespace chrome