Warn/error on making KDMs using recipient certs whose validity periods

lie outside those of the KDMs (#2423).

3 files changed, 93 insertions, 2 deletions

diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index dda30f688..994217a14 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -98,6 +98,8 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	auto const from_string = from.date() + " " + from.time_of_day(true, false);
 	auto const until_string = until.date() + " " + until.time_of_day(true, false);
 
+	std::vector<KDMCertificatePeriod> period_checks;
+
 	auto cpl = cpls.front().cpl_file;
 	auto kdm = kdm_for_screen (
 			film,
@@ -107,7 +109,8 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 			boost::posix_time::time_from_string(until_string),
 			dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 			false,
-			optional<int>()
+			optional<int>(),
+			period_checks
 			);
 
 	write_files (
@@ -162,6 +165,7 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 	auto const cpl = cpls.front().cpl_file;
 	auto const cpl_id = cpls.front().cpl_id;
 
+	std::vector<KDMCertificatePeriod> period_checks;
 	list<KDMWithMetadataPtr> kdms;
 	for (auto i: screens) {
 		auto kdm = kdm_for_screen (
@@ -172,7 +176,8 @@ BOOST_AUTO_TEST_CASE (directory_kdm_naming_test, * boost::unit_test::depends_on(
 				boost::posix_time::time_from_string(until_string),
 				dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 				false,
-				optional<int>()
+				optional<int>(),
+				period_checks
 				);
 
 		kdms.push_back (kdm);
diff --git a/test/kdm_util_test.cc b/test/kdm_util_test.cc
new file mode 100644
index 000000000..27b98230d
--- /dev/null
+++ b/test/kdm_util_test.cc
@@ -0,0 +1,85 @@
+/*
+    Copyright (C) 2023 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "lib/kdm_util.h"
+#include <dcp/certificate.h>
+#include <dcp/util.h>
+#include <boost/test/unit_test.hpp>
+
+
+BOOST_AUTO_TEST_CASE(check_kdm_and_certificate_validity_periods_good)
+{
+	auto const result = check_kdm_and_certificate_validity_periods(
+		dcp::Certificate(dcp::file_to_string("test/data/cert.pem")),
+		dcp::LocalTime("2023-01-03T10:30:00"),
+		dcp::LocalTime("2050-10-20T14:00:00")
+		);
+
+	BOOST_CHECK(result == KDMCertificatePeriod::KDM_WITHIN_CERTIFICATE);
+}
+
+
+BOOST_AUTO_TEST_CASE(check_kdm_and_certificate_validity_periods_overlap_start)
+{
+	auto const result = check_kdm_and_certificate_validity_periods(
+		dcp::Certificate(dcp::file_to_string("test/data/cert.pem")),
+		dcp::LocalTime("2011-01-03T10:30:00"),
+		dcp::LocalTime("2050-10-20T14:00:00")
+		);
+
+	BOOST_CHECK(result == KDMCertificatePeriod::KDM_OVERLAPS_CERTIFICATE);
+}
+
+
+BOOST_AUTO_TEST_CASE(check_kdm_and_certificate_validity_periods_overlap_end)
+{
+	auto const result = check_kdm_and_certificate_validity_periods(
+		dcp::Certificate(dcp::file_to_string("test/data/cert.pem")),
+		dcp::LocalTime("2033-01-03T10:30:00"),
+		dcp::LocalTime("2095-10-20T14:00:00")
+		);
+
+	BOOST_CHECK(result == KDMCertificatePeriod::KDM_OVERLAPS_CERTIFICATE);
+}
+
+
+BOOST_AUTO_TEST_CASE(check_kdm_and_certificate_validity_periods_overlap_start_and_end)
+{
+	auto const result = check_kdm_and_certificate_validity_periods(
+		dcp::Certificate(dcp::file_to_string("test/data/cert.pem")),
+		dcp::LocalTime("2011-01-03T10:30:00"),
+		dcp::LocalTime("2095-10-20T14:00:00")
+		);
+
+	BOOST_CHECK(result == KDMCertificatePeriod::KDM_OVERLAPS_CERTIFICATE);
+}
+
+
+BOOST_AUTO_TEST_CASE(check_kdm_and_certificate_validity_periods_outside)
+{
+	auto const result = check_kdm_and_certificate_validity_periods(
+		dcp::Certificate(dcp::file_to_string("test/data/cert.pem")),
+		dcp::LocalTime("2011-01-03T10:30:00"),
+		dcp::LocalTime("2012-10-20T14:00:00")
+		);
+
+	BOOST_CHECK(result == KDMCertificatePeriod::KDM_OUTSIDE_CERTIFICATE);
+}
diff --git a/test/wscript b/test/wscript
index 5807d94ea..5e06ed5e2 100644
--- a/test/wscript
+++ b/test/wscript
@@ -108,6 +108,7 @@ def build(bld):
                  job_manager_test.cc
                  kdm_cli_test.cc
                  kdm_naming_test.cc
+                 kdm_util_test.cc
                  low_bitrate_test.cc
                  markers_test.cc
                  no_use_video_test.cc