Allow specification of trusted devices by thumbprint rather thanv2.13.68

by full certificate.

2 files changed, 57 insertions, 14 deletions

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 8f0086185..f5d4b044a 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -22,6 +22,7 @@
 #include "wx_util.h"
 #include "file_dialog_wrapper.h"
 #include "download_certificate_dialog.h"
+#include "table_dialog.h"
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/exceptions.h>
@@ -37,23 +38,64 @@ using boost::optional;
 using boost::bind;
 
 static string
-column (dcp::Certificate c)
+column (TrustedDevice d)
 {
-	return c.thumbprint ();
+	return d.thumbprint ();
 }
 
-class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
+class TrustedDeviceDialog : public TableDialog
 {
 public:
-	explicit CertificateFileDialogWrapper (wxWindow* parent)
-		: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
+	explicit TrustedDeviceDialog (wxWindow* parent)
+		: TableDialog (parent, _("Trusted Device"), 3, 1, true)
 	{
+		add (_("Thumbprint"), true);
+		_thumbprint = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1)));
+		_file = add (new wxButton(this, wxID_ANY, _("Load certificate...")));
 
+		layout ();
+
+		_file->Bind (wxEVT_BUTTON, bind(&TrustedDeviceDialog::load_certificate, this));
+	}
+
+	void load_certificate ()
+	{
+		wxFileDialog* d = new wxFileDialog (this, _("Trusted Device certificate"));
+		d->ShowModal ();
+		try {
+			_certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
+			_thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
+		} catch (dcp::MiscError& e) {
+			error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what())));
+		}
+	}
+
+	void set (TrustedDevice t)
+	{
+		_certificate = t.certificate ();
+		_thumbprint->SetValue (std_to_wx(t.thumbprint()));
 	}
+
+	optional<TrustedDevice> get ()
+	{
+		string const t = wx_to_std (_thumbprint->GetValue ());
+		if (_certificate && _certificate->thumbprint() == t) {
+			return TrustedDevice (*_certificate);
+		} else if (t.length() == 28) {
+			return TrustedDevice (t);
+		}
+
+		return optional<TrustedDevice> ();
+	}
+
+private:
+	wxTextCtrl* _thumbprint;
+	wxButton* _file;
+	boost::optional<dcp::Certificate> _certificate;
 };
 
 ScreenDialog::ScreenDialog (
-	wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices
+	wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<TrustedDevice> trusted_devices
 	)
 	: wxDialog (parent, wxID_ANY, title)
 	, _recipient (recipient)
@@ -100,7 +142,7 @@ ScreenDialog::ScreenDialog (
 
 	vector<string> columns;
 	columns.push_back (wx_to_std (_("Thumbprint")));
-	_trusted_device_list = new EditableList<dcp::Certificate, CertificateFileDialogWrapper> (
+	_trusted_device_list = new EditableList<TrustedDevice, TrustedDeviceDialog> (
 		this,
 		columns,
 		bind (&ScreenDialog::trusted_devices, this),
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 9bb7d863e..913480d76 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,13 +19,14 @@
 */
 
 #include "editable_list.h"
+#include "lib/screen.h"
 #include <dcp/certificate.h>
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 
 class Progress;
-class CertificateFileDialogWrapper;
+class TrustedDeviceDialog;
 
 class ScreenDialog : public wxDialog
 {
@@ -36,13 +37,13 @@ public:
 		std::string name = "",
 		std::string notes = "",
 		boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
-		std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
+		std::vector<TrustedDevice> d = std::vector<TrustedDevice>()
 		);
 
 	std::string name () const;
 	std::string notes () const;
 	boost::optional<dcp::Certificate> recipient () const;
-	std::vector<dcp::Certificate> trusted_devices () {
+	std::vector<TrustedDevice> trusted_devices () {
 		return _trusted_devices;
 	}
 
@@ -53,7 +54,7 @@ private:
 	void setup_sensitivity ();
 	void set_recipient (boost::optional<dcp::Certificate>);
 
-	void set_trusted_devices (std::vector<dcp::Certificate> d) {
+	void set_trusted_devices (std::vector<TrustedDevice> d) {
 		_trusted_devices = d;
 	}
 
@@ -63,8 +64,8 @@ private:
 	wxStaticText* _recipient_thumbprint;
 	wxButton* _get_recipient_from_file;
 	wxButton* _download_recipient;
-	EditableList<dcp::Certificate, CertificateFileDialogWrapper>* _trusted_device_list;
+	EditableList<TrustedDevice, TrustedDeviceDialog>* _trusted_device_list;
 
 	boost::optional<dcp::Certificate> _recipient;
-	std::vector<dcp::Certificate> _trusted_devices;
+	std::vector<TrustedDevice> _trusted_devices;
 };