Bv2.1 8.7: CPLs with encrypted content must be signed.

diff --git a/src/verify.cc b/src/verify.cc
index 58e777fb49942d58abc65fd96ad379667a0adc27..3f15668fcf88b9a591778b011be73d3c7237c74c 100644 (file)
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -1300,6 +1300,15 @@ dcp::verify (
                                }
 
                                check_extension_metadata (cpl, notes);
+
+                               if (cpl->encrypted()) {
+                                       cxml::Document doc ("CompositionPlaylist");
+                                       DCP_ASSERT (cpl->file());
+                                       doc.read_file (cpl->file().get());
+                                       if (!doc.optional_node_child("Signature")) {
+                                               notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::CPL_WITH_ENCRYPTED_CONTENT_NOT_SIGNED, cpl->file().get()});
+                                       }
+                               }
                        }
                }
 
@@ -1441,6 +1450,8 @@ dcp::note_to_string (dcp::VerificationNote note)
                return "The CPL metadata must contain <ExtensionMetadata>";
        case dcp::VerificationNote::INVALID_EXTENSION_METADATA:
                return String::compose("The <ExtensionMetadata> is malformed in some way: %1", note.note().get());
+       case dcp::VerificationNote::CPL_WITH_ENCRYPTED_CONTENT_NOT_SIGNED:
+               return String::compose("The CPL %1, which has encrypted content, is not signed", note.file()->filename());
        }
 
        return "";

diff --git a/src/verify.h b/src/verify.h
index 60100435adacb73b0df022e65d69f7b2072ab955..833efa72e88d96a6f3f0493d5b4277fededf9b10 100644 (file)
--- a/src/verify.h
+++ b/src/verify.h
@@ -173,6 +173,8 @@ public:
                MISSING_EXTENSION_METADATA,
                /** <ExtensionMetadata> must have a particular form Bv2.1_8.6.3 */
                INVALID_EXTENSION_METADATA,
+               /** CPLs containing encrypted content must be signed Bv2.1_8.7 */
+               CPL_WITH_ENCRYPTED_CONTENT_NOT_SIGNED
        };
 
        VerificationNote (Type type, Code code)

diff --git a/test/verify_test.cc b/test/verify_test.cc
index 34f95aadcca6ff19cc8b6ed525681c887cd77c60..3d30797e8207f1b1fd1261dde41ee1e6974f4b6f 100644 (file)
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -2358,3 +2358,30 @@ BOOST_AUTO_TEST_CASE (verify_cpl_extension_metadata9)
 }
 
 
+
+BOOST_AUTO_TEST_CASE (verify_encrypted_cpl_is_signed)
+{
+       boost::filesystem::path dir = "build/test/verify_encrypted_cpl_is_signed";
+       prepare_directory (dir);
+       for (auto i: boost::filesystem::directory_iterator("test/ref/DCP/encryption_test")) {
+               boost::filesystem::copy_file (i.path(), dir / i.path().filename());
+       }
+
+       {
+               Editor e (dir / "cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml");
+               e.delete_lines ("<dsig:Signature", "</dsig:Signature>");
+       }
+
+       check_verify_result (
+               {dir},
+               {
+                       { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::CPL_HASH_INCORRECT },
+                       { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISSING_FFEC_IN_FEATURE },
+                       { dcp::VerificationNote::VERIFY_ERROR, dcp::VerificationNote::MISSING_FFMC_IN_FEATURE },
+                       { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_FFOC },
+                       { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_LFOC },
+                       { dcp::VerificationNote::VERIFY_WARNING, dcp::VerificationNote::MISSING_CPL_METADATA },
+                       { dcp::VerificationNote::VERIFY_BV21_ERROR, dcp::VerificationNote::CPL_WITH_ENCRYPTED_CONTENT_NOT_SIGNED }
+               });
+}
+