Respect Client Properties when reporting CDM Status

[ Merge from go/wvgerrit/14286 ]

CDM now reports status information associated with the specified security level.
Earlier information would be reported from the default security level.

b/18709693

Change-Id: I7a01e8ea9773b56951c207437ce85e567fd32b09

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -98,7 +98,8 @@ class CdmEngine {
                                    const CdmKeyResponse& key_data);
 
   // Query system information
-  virtual CdmResponseType QueryStatus(CdmQueryMap* info);
+  virtual CdmResponseType QueryStatus(SecurityLevel security_level,
+                                      CdmQueryMap* info);
 
   // Query session information
   virtual CdmResponseType QuerySessionStatus(const CdmSessionId& session_id,

libwvdrmengine/cdm/core/include/oemcrypto_adapter.h

@@ -4,11 +4,10 @@
 #define WVCDM_CORE_OEMCRYPTO_ADAPTER_H_
 
 #include "OEMCryptoCENC.h"
+#include "wv_cdm_types.h"
 
 namespace wvcdm {
 
-enum SecurityLevel { kLevelDefault, kLevel3 };
-
 // This attempts to open a session at the desired security level.
 // If one level is not available, the other will be used instead.
 OEMCryptoResult OEMCrypto_OpenSession(OEMCrypto_SESSION* session,

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -185,6 +185,7 @@ enum CdmResponseType {
   CLIENT_ID_AES_ENCRYPT_ERROR,
   CLIENT_ID_RSA_INIT_ERROR,
   CLIENT_ID_RSA_ENCRYPT_ERROR,
+  INVALID_QUERY_STATUS,
 };
 
 enum CdmKeyStatus {
@@ -206,6 +207,11 @@ enum CdmLicenseType {
   kLicenseTypeRelease
 };
 
+enum SecurityLevel {
+  kLevelDefault,
+  kLevel3
+};
+
 enum CdmSecurityLevel {
   kSecurityLevelUninitialized,
   kSecurityLevelL1,

libwvdrmengine/cdm/core/src/cdm_engine.cpp

@@ -393,9 +393,14 @@ CdmResponseType CdmEngine::RenewKey(const CdmSessionId& session_id,
   return KEY_ADDED;
 }
 
-CdmResponseType CdmEngine::QueryStatus(CdmQueryMap* key_info) {
+CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
+                                       CdmQueryMap* key_info) {
   LOGI("CdmEngine::QueryStatus");
   CryptoSession crypto_session;
+  if (security_level == kLevel3) {
+    CdmResponseType status = crypto_session.Open(kLevel3);
+    if (NO_ERROR != status) return INVALID_QUERY_STATUS;
+  }
   switch (crypto_session.GetSecurityLevel()) {
     case kSecurityLevelL1:
       (*key_info)[QUERY_KEY_SECURITY_LEVEL] = QUERY_VALUE_SECURITY_LEVEL_L1;

libwvdrmengine/cdm/include/wv_content_decryption_module.h

@@ -60,7 +60,8 @@ class WvContentDecryptionModule : public TimerHandler {
   virtual CdmResponseType RemoveKeys(const CdmSessionId& session_id);
 
   // Query system information
-  virtual CdmResponseType QueryStatus(CdmQueryMap* key_info);
+  virtual CdmResponseType QueryStatus(SecurityLevel security_level,
+                                      CdmQueryMap* key_info);
 
   // Query session information
   virtual CdmResponseType QuerySessionStatus(const CdmSessionId& session_id,

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -117,8 +117,10 @@ CdmResponseType WvContentDecryptionModule::RemoveKeys(
   return cdm_engine_->RemoveKeys(session_id);
 }
 
-CdmResponseType WvContentDecryptionModule::QueryStatus(CdmQueryMap* key_info) {
-  return cdm_engine_->QueryStatus(key_info);
+CdmResponseType WvContentDecryptionModule::QueryStatus(
+    SecurityLevel security_level,
+    CdmQueryMap* key_info) {
+  return cdm_engine_->QueryStatus(security_level, key_info);
 }
 
 CdmResponseType WvContentDecryptionModule::QuerySessionStatus(

libwvdrmengine/cdm/test/request_license_test.cpp

@@ -28,6 +28,7 @@
 using ::testing::_;
 using ::testing::AllOf;
 using ::testing::AtLeast;
+using ::testing::Contains;
 using ::testing::Each;
 using ::testing::IsEmpty;
 using ::testing::Not;
@@ -1723,7 +1724,8 @@ TEST_F(WvCdmRequestLicenseTest, QueryUnmodifiedSessionStatus) {
   // Test that the global value is returned when no properties are modifying it.
   CdmQueryMap system_query_info;
   CdmQueryMap::iterator system_itr;
-  ASSERT_EQ(wvcdm::NO_ERROR, decryptor_.QueryStatus(&system_query_info));
+  ASSERT_EQ(wvcdm::NO_ERROR,
+            decryptor_.QueryStatus(kLevelDefault, &system_query_info));
   system_itr = system_query_info.find(wvcdm::QUERY_KEY_SECURITY_LEVEL);
   ASSERT_TRUE(system_itr != system_query_info.end());
 
@@ -1790,7 +1792,8 @@ TEST_F(WvCdmRequestLicenseTest, QueryKeyStatus) {
 TEST_F(WvCdmRequestLicenseTest, QueryStatus) {
   CdmQueryMap query_info;
   CdmQueryMap::iterator itr;
-  EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.QueryStatus(&query_info));
+  EXPECT_EQ(wvcdm::NO_ERROR,
+            decryptor_.QueryStatus(kLevelDefault, &query_info));
 
   itr = query_info.find(wvcdm::QUERY_KEY_SECURITY_LEVEL);
   ASSERT_TRUE(itr != query_info.end());
@@ -1813,6 +1816,49 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatus) {
   EXPECT_EQ(16u, itr->second.size());
 }
 
+TEST_F(WvCdmRequestLicenseTest, QueryStatusL3) {
+  CdmQueryMap query_info, query_info_default;
+  CdmQueryMap::iterator itr;
+
+  EXPECT_EQ(wvcdm::NO_ERROR,
+            decryptor_.QueryStatus(kLevel3, &query_info));
+  EXPECT_EQ(wvcdm::NO_ERROR,
+            decryptor_.QueryStatus(kLevelDefault, &query_info_default));
+
+  EXPECT_THAT(query_info, Contains(Pair(wvcdm::QUERY_KEY_SECURITY_LEVEL,
+                                        wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3)));
+
+  itr = query_info.find(wvcdm::QUERY_KEY_DEVICE_ID);
+  ASSERT_TRUE(itr != query_info.end());
+  EXPECT_GT(itr->second.size(), 0u);
+
+  itr = query_info.find(wvcdm::QUERY_KEY_SYSTEM_ID);
+  ASSERT_TRUE(itr != query_info.end());
+  std::istringstream ss(itr->second);
+  uint32_t system_id;
+  EXPECT_TRUE(ss >> system_id);
+  EXPECT_TRUE(ss.eof());
+
+  itr = query_info.find(wvcdm::QUERY_KEY_PROVISIONING_ID);
+  ASSERT_TRUE(itr != query_info.end());
+  EXPECT_EQ(16u, itr->second.size());
+
+  itr = query_info_default.find(wvcdm::QUERY_KEY_SECURITY_LEVEL);
+  ASSERT_TRUE(itr != query_info_default.end());
+  EXPECT_EQ(2u, itr->second.size());
+  EXPECT_EQ(wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3.at(0), itr->second.at(0));
+
+  if (wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3.compare(itr->second) != 0) {
+    itr = query_info_default.find(wvcdm::QUERY_KEY_SYSTEM_ID);
+    ASSERT_TRUE(itr != query_info_default.end());
+    std::istringstream ss(itr->second);
+    uint32_t default_system_id;
+    EXPECT_TRUE(ss >> system_id);
+    EXPECT_TRUE(ss.eof());
+    EXPECT_NE(system_id, default_system_id);
+  }
+}
+
 TEST_F(WvCdmRequestLicenseTest, QueryKeyControlInfo) {
   Unprovision();
   Provision(kLevelDefault);
@@ -1848,7 +1894,8 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) {
 
   CdmQueryMap query_info;
   CdmQueryMap::iterator itr;
-  EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.QueryStatus(&query_info));
+  EXPECT_EQ(wvcdm::NO_ERROR,
+            decryptor_.QueryStatus(kLevelDefault, &query_info));
   itr = query_info.find(wvcdm::QUERY_KEY_SECURITY_LEVEL);
   ASSERT_TRUE(itr != query_info.end());
   EXPECT_EQ(2u, itr->second.size());