Use 'pssh' data to determine key_id properly

media/cdm/cenc_utils_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cdm/cenc_utils.h"
 
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
@@ skipping 40 matching lines @@
     box->push_back('p');
     box->push_back('s');
     box->push_back('s');
     box->push_back('h');
     // Add version.
     box->push_back(version);
     // Add flags.
     box->push_back(0);
     box->push_back(0);
     box->push_back(0);
     // Add Clear Key SystemID.

[ddorwin, 2015/06/04 19:57:17]

s/CK/Common/

[jrummell, 2015/06/15 22:22:10]

Done in rebase (https://codereview.chromium.org/1149023002/).

     box->push_back(0x10);
     box->push_back(0x77);
     box->push_back(0xEF);
     box->push_back(0xEC);
     box->push_back(0xC0);
     box->push_back(0xB2);
     box->push_back(0x4D);
     box->push_back(0x02);
     box->push_back(0xAC);
     box->push_back(0xE3);
@@ skipping 92 matching lines @@
  private:
   std::vector<uint8_t> key1_;
   std::vector<uint8_t> key2_;
   std::vector<uint8_t> key3_;
   std::vector<uint8_t> key4_;
 };
 
 TEST_F(CencUtilsTest, EmptyPSSH) {
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(std::vector<uint8_t>()));
-  EXPECT_TRUE(GetKeyIdsForCommonSystemId(std::vector<uint8_t>(), &key_ids));
-  EXPECT_EQ(0u, key_ids.size());
+  EXPECT_FALSE(GetKeyIdsForCommonSystemId(std::vector<uint8_t>(), &key_ids));
 }
 
 TEST_F(CencUtilsTest, PSSHVersion0) {
   std::vector<uint8_t> box = MakePSSHBox(0);
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box));
-  EXPECT_TRUE(GetKeyIdsForCommonSystemId(box, &key_ids));
-  EXPECT_EQ(0u, key_ids.size());
+  EXPECT_FALSE(GetKeyIdsForCommonSystemId(box, &key_ids));
 }
 
 TEST_F(CencUtilsTest, PSSHVersion1WithNoKeys) {
   std::vector<uint8_t> box = MakePSSHBox(1);
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box));
-  EXPECT_TRUE(GetKeyIdsForCommonSystemId(box, &key_ids));
-  EXPECT_EQ(0u, key_ids.size());
+  EXPECT_FALSE(GetKeyIdsForCommonSystemId(box, &key_ids));
 }
 
 TEST_F(CencUtilsTest, PSSHVersion1WithOneKey) {
   std::vector<uint8_t> box = MakePSSHBox(1, Key1());
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box));
   EXPECT_TRUE(GetKeyIdsForCommonSystemId(box, &key_ids));
   EXPECT_EQ(1u, key_ids.size());
   EXPECT_EQ(key_ids[0], Key1());
 }
@@ skipping 16 matching lines @@
   for (const auto& value : box1)
     box0.push_back(value);
 
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box0));
   EXPECT_TRUE(GetKeyIdsForCommonSystemId(box0, &key_ids));
   EXPECT_EQ(1u, key_ids.size());
   EXPECT_EQ(key_ids[0], Key1());
 }
 
 TEST_F(CencUtilsTest, PSSHVersion1Plus0) {

[ddorwin, 2015/06/04 19:57:17]

There should be a test for Version2 then Version1 - the keys from v1 should be
used.

[jrummell, 2015/06/15 22:22:10]

Done in rebase (https://codereview.chromium.org/1149023002/).

   std::vector<uint8_t> box0 = MakePSSHBox(0);
   std::vector<uint8_t> box1 = MakePSSHBox(1, Key1());
 
   // Concatentate box0 into box1.
   for (const auto& value : box0)
     box1.push_back(value);
 
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box1));
   EXPECT_TRUE(GetKeyIdsForCommonSystemId(box1, &key_ids));
@@ skipping 12 matching lines @@
   // Concatentate box2 into box.
   for (const auto& value : box2)
     box.push_back(value);
 
   KeyIdList key_ids;
   EXPECT_TRUE(ValidatePsshInput(box));
   EXPECT_TRUE(GetKeyIdsForCommonSystemId(box, &key_ids));
   EXPECT_EQ(4u, key_ids.size());
   EXPECT_EQ(key_ids[0], Key1());
   EXPECT_EQ(key_ids[1], Key2());
   EXPECT_EQ(key_ids[2], Key3());

[ddorwin, 2015/06/04 19:57:17]

Does the code pull key IDs out of all boxes with the Common SystemID? It should
only use the first matching box. If there is a bug, just add a TODO and fix it
in a separate CL.

[jrummell, 2015/06/15 22:22:10]

Done.

   EXPECT_EQ(key_ids[3], Key4());
 }
 
 TEST_F(CencUtilsTest, InvalidPSSH) {

[ddorwin, 2015/06/04 19:57:17]

The test name should describe *how* it is invalid.

[jrummell, 2015/06/15 22:22:10]

Done.

   std::vector<uint8_t> box = MakePSSHBox(1, Key1(), Key2());
   KeyIdList key_ids;
   for (uint32 i = 1; i < box.size(); ++i) {
     // Modify size of data passed to be less than real size.
     std::vector<uint8_t> truncated(&box[0], &box[0] + i);
     EXPECT_FALSE(ValidatePsshInput(truncated));
     EXPECT_FALSE(GetKeyIdsForCommonSystemId(truncated, &key_ids));
     // Modify starting point.
     std::vector<uint8_t> changed_offset(&box[i], &box[i] + box.size() - i);
     EXPECT_FALSE(ValidatePsshInput(changed_offset));
     EXPECT_FALSE(GetKeyIdsForCommonSystemId(changed_offset, &key_ids));
   }
 }
 
 TEST_F(CencUtilsTest, InvalidSystemID) {

[ddorwin, 2015/06/04 19:57:17]

s/Invalid/Unrecognized/

[jrummell, 2015/06/15 22:22:09]

Done.

   std::vector<uint8_t> box = MakePSSHBox(1, Key1(), Key2());
 
   // Modify the System ID.
   ++box[20];
 
   KeyIdList key_ids;
-  EXPECT_TRUE(GetKeyIdsForCommonSystemId(box, &key_ids));
-  EXPECT_EQ(0u, key_ids.size());
+  EXPECT_FALSE(GetKeyIdsForCommonSystemId(box, &key_ids));
 }
 
 TEST_F(CencUtilsTest, InvalidFlags) {
   std::vector<uint8_t> box = MakePSSHBox(1, Key1(), Key2());
 
   // Modify flags.
   box[10] = 3;
 
   KeyIdList key_ids;
-  // TODO(jrummell): This should fail as the 'pssh' box is skipped.
-  EXPECT_TRUE(GetKeyIdsForCommonSystemId(box, &key_ids));
-  EXPECT_EQ(0u, key_ids.size());
+  EXPECT_FALSE(GetKeyIdsForCommonSystemId(box, &key_ids));
 }
 
 TEST_F(CencUtilsTest, LongSize) {
   const uint8_t data[] = {
       0x00, 0x00, 0x00, 0x01,                          // size = 1
       0x70, 0x73, 0x73, 0x68,                          // 'pssh'
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c,  // longsize
       0x01,                                            // version
       0x00, 0x00, 0x00,                                // flags
       0x10, 0x77, 0xEF, 0xEC, 0xC0, 0xB2, 0x4D, 0x02,  // SystemID
       0xAC, 0xE3, 0x3C, 0x1E, 0x52, 0xE2, 0xFB, 0x4B,
       0x00, 0x00, 0x00, 0x02,                          // key count
       0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03,  // key1
       0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03,
       0x7E, 0x57, 0x1D, 0x04, 0x7E, 0x57, 0x1D, 0x04,  // key2
       0x7E, 0x57, 0x1D, 0x04, 0x7E, 0x57, 0x1D, 0x04,
       0x00, 0x00, 0x00, 0x00  // datasize
   };
 
   KeyIdList key_ids;
   EXPECT_TRUE(
       ValidatePsshInput(std::vector<uint8_t>(data, data + arraysize(data))));
   EXPECT_TRUE(GetKeyIdsForCommonSystemId(
       std::vector<uint8_t>(data, data + arraysize(data)), &key_ids));
   EXPECT_EQ(2u, key_ids.size());
 }
 
 TEST_F(CencUtilsTest, NoSize) {

[ddorwin, 2015/06/04 19:57:17]

SizeIsZero (there is a size)

[jrummell, 2015/06/15 22:22:09]

Done.

   const uint8_t data[] = {
       0x00, 0x00, 0x00, 0x00,                          // size = 0
       0x70, 0x73, 0x73, 0x68,                          // 'pssh'
       0x01,                                            // version
       0x00, 0x00, 0x00,                                // flags
       0x10, 0x77, 0xEF, 0xEC, 0xC0, 0xB2, 0x4D, 0x02,  // SystemID
       0xAC, 0xE3, 0x3C, 0x1E, 0x52, 0xE2, 0xFB, 0x4B,
       0x00, 0x00, 0x00, 0x02,                          // key count
       0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03,  // key1
       0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03,
       0x7E, 0x57, 0x1D, 0x04, 0x7E, 0x57, 0x1D, 0x04,  // key2
       0x7E, 0x57, 0x1D, 0x04, 0x7E, 0x57, 0x1D, 0x04,
       0x00, 0x00, 0x00, 0x00  // datasize
   };
 
   KeyIdList key_ids;
   EXPECT_TRUE(
       ValidatePsshInput(std::vector<uint8_t>(data, data + arraysize(data))));

[ddorwin, 2015/06/04 19:57:17]

Is size 0 valid?

[jrummell, 2015/06/15 22:22:10]

Yes. It means the box extends to the end of the data. Could be used by somebody
that creates a 'pssh' box to pass as data (like reading from a manifest) to
simplify creation (no need to count bytes).

   EXPECT_TRUE(GetKeyIdsForCommonSystemId(
       std::vector<uint8_t>(data, data + arraysize(data)), &key_ids));
   EXPECT_EQ(2u, key_ids.size());
 }
 
 TEST_F(CencUtilsTest, HugeSize) {
   const uint8_t data[] = {
       0x00, 0x00, 0x00, 0x01,                          // size = 1
       0x70, 0x73, 0x73, 0x68,                          // 'pssh'
       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  // longsize = big
       0x01,                                            // version
       0x00, 0x00, 0x00,                                // flags
       0x10, 0x77, 0xEF, 0xEC, 0xC0, 0xB2, 0x4D, 0x02,  // SystemID
       0xAC, 0xE3, 0x3C, 0x1E, 0x52, 0xE2, 0xFB, 0x4B,
       0x00, 0x00, 0x00, 0x02,                          // key count
       0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03,  // key1
       0x7E, 0x57, 0x1D, 0x03, 0x7E, 0x57, 0x1D, 0x03,
       0x7E, 0x57, 0x1D, 0x04, 0x7E, 0x57, 0x1D, 0x04,  // key2
       0x7E, 0x57, 0x1D, 0x04, 0x7E, 0x57, 0x1D, 0x04,
       0x00, 0x00, 0x00, 0x00  // datasize
   };
 
   KeyIdList key_ids;
   EXPECT_FALSE(

[ddorwin, 2015/06/04 19:57:17]

Explain why it fails.

[jrummell, 2015/06/15 22:22:10]

Done.

       ValidatePsshInput(std::vector<uint8_t>(data, data + arraysize(data))));
   EXPECT_FALSE(GetKeyIdsForCommonSystemId(
       std::vector<uint8_t>(data, data + arraysize(data)), &key_ids));
 }
 
 }  // namespace media