X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fscreen.cc;h=097ff80b8bfbc77cf6358ffdc081e66213b7332b;hp=dea513ab07f3452bbc2dad2879fce35fde4528e6;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index dea513ab0..097ff80b8 100644
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,26 +18,31 @@
 
 */
 
-#include "screen.h"
-#include "kdm_with_metadata.h"
-#include "film.h"
+
 #include "cinema.h"
+#include "config.h"
+#include "film.h"
+#include "kdm_util.h"
+#include "kdm_with_metadata.h"
+#include "screen.h"
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
-using std::string;
-using std::vector;
+
 using std::list;
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
 using namespace dcpomatic;
 
+
 Screen::Screen (cxml::ConstNodePtr node)
 	: KDMRecipient (node)
 {
-	BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children ("TrustedDevice")) {
+	for (auto i: node->node_children ("TrustedDevice")) {
 		if (boost::algorithm::starts_with(i->content(), "-----BEGIN CERTIFICATE-----")) {
 			trusted_devices.push_back (TrustedDevice(dcp::Certificate(i->content())));
 		} else {
@@ -46,20 +51,22 @@ Screen::Screen (cxml::ConstNodePtr node)
 	}
 }
 
+
 void
 Screen::as_xml (xmlpp::Element* parent) const
 {
 	KDMRecipient::as_xml (parent);
-	BOOST_FOREACH (TrustedDevice i, trusted_devices) {
+	for (auto i: trusted_devices) {
 		parent->add_child("TrustedDevice")->add_child_text(i.as_string());
 	}
 }
 
+
 vector<string>
 Screen::trusted_device_thumbprints () const
 {
 	vector<string> t;
-	BOOST_FOREACH (TrustedDevice i, trusted_devices) {
+	for (auto i: trusted_devices) {
 		t.push_back (i.thumbprint());
 	}
 	return t;
@@ -68,45 +75,47 @@ Screen::trusted_device_thumbprints () const
 
 KDMWithMetadataPtr
 kdm_for_screen (
-	shared_ptr<const Film> film,
-	boost::filesystem::path cpl,
+	std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm,
 	shared_ptr<const dcpomatic::Screen> screen,
 	boost::posix_time::ptime valid_from,
 	boost::posix_time::ptime valid_to,
 	dcp::Formulation formulation,
 	bool disable_forensic_marking_picture,
-	optional<int> disable_forensic_marking_audio
+	optional<int> disable_forensic_marking_audio,
+	vector<KDMCertificatePeriod>& period_checks
 	)
 {
 	if (!screen->recipient) {
-		return KDMWithMetadataPtr();
+		return {};
+	}
+
+	auto cinema = screen->cinema;
+	dcp::LocalTime const begin(valid_from, dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
+	dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0));
+
+	period_checks.push_back(check_kdm_and_certificate_validity_periods(screen->recipient.get(), begin, end));
+
+	auto signer = Config::instance()->signer_chain();
+	if (!signer->valid()) {
+		throw InvalidSignerError();
 	}
 
-	shared_ptr<const Cinema> cinema = screen->cinema;
-	dcp::LocalTime const begin(valid_from, cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0);
-	dcp::LocalTime const end  (valid_to,   cinema ? cinema->utc_offset_hour() : 0, cinema ? cinema->utc_offset_minute() : 0);
-
-	dcp::EncryptedKDM const kdm = film->make_kdm (
-			screen->recipient.get(),
-			screen->trusted_device_thumbprints(),
-			cpl,
-			begin,
-			end,
-			formulation,
-			disable_forensic_marking_picture,
-			disable_forensic_marking_audio
-			);
+	auto kdm = make_kdm(begin, end).encrypt(
+		signer, screen->recipient.get(), screen->trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
+		);
 
 	dcp::NameFormat::Map name_values;
 	if (cinema) {
 		name_values['c'] = cinema->name;
+	} else {
+		name_values['c'] = "";
 	}
 	name_values['s'] = screen->name;
-	name_values['f'] = film->name();
+	name_values['f'] = kdm.content_title_text();
 	name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
 	name_values['e'] = end.date() + " " + end.time_of_day(true, false);
 	name_values['i'] = kdm.cpl_id();
 
-	return KDMWithMetadataPtr(new KDMWithMetadata(name_values, cinema.get(), cinema ? cinema->emails : list<string>(), kdm));
+	return make_shared<KDMWithMetadata>(name_values, cinema.get(), cinema ? cinema->emails : vector<string>(), kdm);
 }