From: Carl Hetherington <cth@carlh.net>
Date: Sat, 7 Jul 2018 18:35:42 +0000 (+0100)
Subject: Give better errors when incorrect KDMs are used (#1326).
X-Git-Tag: v2.13.35~10
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5c9e39df078aab9f03ae186d0758d4d710f90bab;ds=sidebyside

Give better errors when incorrect KDMs are used (#1326).
---

diff --git a/ChangeLog b/ChangeLog
index ddeac7e5c..eb7df83d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-07  Carl Hetherington  <cth@carlh.net>
+
+	* Give better errors when incorrect KDMs are used (#1326).
+
 2018-07-06  Carl Hetherington  <cth@carlh.net>
 
 	* Add option to enable/disable KDM forensic marking.
diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 7e6c66c6c..28e5c4fd2 100644
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,9 +23,13 @@
 #include "dcp_content.h"
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
+#include <dcp/exceptions.h>
 #include <boost/foreach.hpp>
 
+#include "i18n.h"
+
 using std::list;
+using std::string;
 using boost::shared_ptr;
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
@@ -54,7 +58,24 @@ DCP::cpls () const
 
 	if (_dcp_content->kdm ()) {
 		BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
-			i->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
+			try {
+				i->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
+			} catch (dcp::KDMDecryptionError& e) {
+				/* Flesh out the error a bit */
+				string const kdm_subject_name = _dcp_content->kdm()->recipient_x509_subject_name();
+				bool on_chain = false;
+				shared_ptr<const dcp::CertificateChain> dc = Config::instance()->decryption_chain();
+				BOOST_FOREACH (dcp::Certificate i, dc->root_to_leaf()) {
+					if (i.subject() == kdm_subject_name) {
+						on_chain = true;
+					}
+				}
+				if (!on_chain) {
+					throw KDMError (_("KDM was not made for DCP-o-matic's decryption certificate."), e.what());
+				} else if (on_chain && kdm_subject_name != dc->leaf().subject()) {
+					throw KDMError (_("KDM was made for DCP-o-matic but not for its leaf certificate."), e.what());
+				}
+			}
 		}
 	}
 
diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc
index 7edad20b1..57b06ed61 100644
--- a/src/lib/emailer.cc
+++ b/src/lib/emailer.cc
@@ -219,7 +219,7 @@ Emailer::send (string server, int port, string user, string password)
 
 	CURLcode const r = curl_easy_perform (curl);
 	if (r != CURLE_OK) {
-		throw KDMError (String::compose (_("Failed to send email (%1)"), curl_easy_strerror (r)));
+		throw KDMError (_("Failed to send email"), curl_easy_strerror (r));
 	}
 
 	curl_slist_free_all (recipients);
diff --git a/src/lib/exceptions.cc b/src/lib/exceptions.cc
index 43a8f3b86..481d2e89d 100644
--- a/src/lib/exceptions.cc
+++ b/src/lib/exceptions.cc
@@ -89,4 +89,14 @@ ProgrammingError::ProgrammingError (string file, int line, string message)
 
 KDMAsContentError::KDMAsContentError ()
 	: runtime_error (_("This file is a KDM.  KDMs should be added to DCP content by right-clicking the content and choosing \"Add KDM\"."))
-{}
+{
+
+}
+
+KDMError::KDMError (string s, string d)
+	: runtime_error (String::compose ("%1 (%2)", s, d))
+	, _summary (s)
+	, _detail (d)
+{
+
+}
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 5efb045b7..7220af35f 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -192,9 +192,19 @@ public:
 class KDMError : public std::runtime_error
 {
 public:
-	explicit KDMError (std::string s)
-		: std::runtime_error (s)
-	{}
+	KDMError (std::string s, std::string d);
+
+	std::string summary () const {
+		return _summary;
+	}
+
+	std::string detail () const {
+		return _detail;
+	}
+
+private:
+	std::string _summary;
+	std::string _detail;
 };
 
 /** @class PixelFormatError
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 65e2567cc..06416d1fe 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -180,6 +180,12 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (KDMError& e) {
+
+		set_error (e.summary(), e.detail());
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (std::exception& e) {
 
 		set_error (
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 2a9183134..36187e00f 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -35,6 +35,7 @@
 #include "lib/dcp_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
+#include "lib/config.h"
 #include <dcp/cpl.h>
 #include <dcp/exceptions.h>
 #include <wx/wx.h>
@@ -145,6 +146,8 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 				/* The DCP is probably missing */
 			} catch (dcp::KDMDecryptionError) {
 				/* We have an incorrect KDM */
+			} catch (KDMError) {
+				/* We have an incorrect KDM */
 			}
 		} else {
 			_kdm->Enable (false);
@@ -377,7 +380,7 @@ ContentMenu::kdm ()
 		try {
 			dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
 		} catch (exception& e) {
-			error_dialog (_parent, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what()));
+			error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
 			d->Destroy ();
 			return;
 		}